diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d1b98511..6c54a2a3f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ build:
   image: ${DOCKER_PROXY}/maven:latest
   stage: build
   script:
-    - cd z-distr
     - mvn clean package -DskipTests -Pdistributive
   artifacts:
     name: "$CI_COMMIT_REF_NAME"
diff --git a/clr_test/run_test_docker_containers.py b/clr_test/run_test_docker_containers.py
index 5b232a939..ebdb10464 100644
--- a/clr_test/run_test_docker_containers.py
+++ b/clr_test/run_test_docker_containers.py
@@ -17,13 +17,7 @@ def run_docker(folder_name):
     subprocess.call('docker compose up -d', shell=True)
     time.sleep(3)
     subprocess.call('scp -P 2233 -r ../clearing-docker-compose root@localhost:/root/clr_test', shell=True)
-    subprocess.call('ssh root@localhost -p 2233', shell=True)
-    subprocess.call('cd clr_test', shell=True)
-    subprocess.call('docker compose pull', shell=True)
-    subprocess.call('docker compose build', shell=True)
-    subprocess.call('date --set "2020-01-01 00:00:00"', shell=True)
-    subprocess.call('docker compose up', shell=True)
-    subprocess.call('exit', shell=True)
+    subprocess.call('ssh root@localhost -p 2222 -t \'cd clr_test; docker compose pull; docker compose build; date --set "2020-01-01 00:00:00"; docker compose up --abort-on-container-exit --exit-code-from clearing_system\'', shell=True)
     subprocess.call("scp -P 2233 -r root@localhost:/root/clr_test/mnt/testFiles {RESULT_FILES_DIR}", shell=True)
     os.remove(f"{QEMU_ALPINE_DIR}/mounted/data.qcow2")
     os.chdir("..")