diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index 03c140d8a83..ee291e5b04d 100755
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -53,10 +53,11 @@ handle SIGBUS stop print
 handle SIGABRT stop print
 continue
 thread apply all backtrace
-continue
+detach
+quit
 " > script.gdb
 
-    gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" &
+    gdb -batch -command script.gdb -p "$(cat /var/run/clickhouse-server/clickhouse-server.pid)" >> /test_output/gdb.log &
 }
 
 configure
diff --git a/docker/test/stress/stress b/docker/test/stress/stress
index 666fd4cce50..c62692f8683 100755
--- a/docker/test/stress/stress
+++ b/docker/test/stress/stress
@@ -85,6 +85,8 @@ if __name__ == "__main__":
 
     logging.info("All processes finished")
     if args.hung_check:
+        logging.info("Will terminate gdb (if any)")
+        res = call("killall -TERM gdb", shell=True, stderr=STDOUT)
         logging.info("Checking if some queries hung")
         cmd = "{} {} {}".format(args.test_cmd, "--hung-check", "00001_select_1")
         res = call(cmd, shell=True, stderr=STDOUT)
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index fc460a5584c..63df919de22 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -719,7 +719,7 @@ void DDLWorker::processTask(DDLTask & task)
             String dummy;
             if (zookeeper->tryGet(active_node_path, dummy, nullptr, eph_node_disappeared))
             {
-                constexpr int timeout_ms = 5000;
+                constexpr int timeout_ms = 30 * 1000;
                 if (!eph_node_disappeared->tryWait(timeout_ms))
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Ephemeral node {} still exists, "
                                     "probably it's owned by someone else", active_node_path);