diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg
index 83e04b34..ebe0a22b 100644
--- a/master-docker-nonstandard/master.cfg
+++ b/master-docker-nonstandard/master.cfg
@@ -1347,7 +1347,15 @@ f_bintar.addStep(
             "sh",
             "-c",
             util.Interpolate(
-                'cmake . -DWITH_READLINE=1 -DCURSES_NEED_NCURSES=1 -DBUILD_CONFIG=mysql_release -DCMAKE_C_FLAGS="%(kw:gnutls_no_signal)s" -DCMAKE_CXX_FLAGS="%(kw:gnutls_no_signal)s" -DWITH_SSL=bundled -DPLATFORM=linux-systemd && make -j%(kw:jobs)s package',
+                """source /opt/rh/devtoolset-9/enable && cmake . \\
+                    -DWITH_READLINE=1 \\
+                    -DCURSES_NEED_NCURSES=1 \\
+                    -DBUILD_CONFIG=mysql_release \\
+                    -DCMAKE_C_COMPILER_LAUNCHER=ccache \\
+                    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \\
+                    -DWITH_SSL=bundled \\
+                    -DPLATFORM=linux-systemd \\
+                    && make -j%(kw:jobs)s package""",
                 perf_schema=util.Property("perf_schema", default="YES"),
                 build_type=util.Property("build_type", default="RelWithDebInfo"),
                 jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
@@ -1355,7 +1363,6 @@ f_bintar.addStep(
                 cxx_compiler=util.Property("cxx_compiler", default="g++"),
                 additional_args=util.Property("additional_args", default=""),
                 create_package=util.Property("create_package", default="package"),
-                gnutls_no_signal=util.Property("gnutls_no_signal", default=" "),
             ),
         ],
         env={
@@ -1703,7 +1710,6 @@ c["builders"].append(
         nextBuild=nextBuild,
         canStartBuild=canStartBuild,
         locks=getLocks,
-        properties={"gnutls_no_signal": "-DGNUTLS_NO_SIGNAL=0"},
         factory=f_bintar,
     )
 )