diff --git a/.circleci/run_test.sh b/.circleci/run_test.sh
index 50a004e6f..633fb60be 100755
--- a/.circleci/run_test.sh
+++ b/.circleci/run_test.sh
@@ -5,6 +5,7 @@ set -e
 
 function stop_and_cleanup() {
   EXIT_CODE=$?
+  docker-compose stop -t 1
   docker-compose logs --no-color --tail="all" > /tmp/docker_nodes.log 2>&1
   docker-compose run --rm test python ./utils/send_results.py --build-id=${CIRCLE_BUILD_NUM} --build-url=${CIRCLE_BUILD_URL} --git-branch=${CIRCLE_BRANCH} --exit-code=${EXIT_CODE}
   docker-compose down
diff --git a/docker-compose.yml b/docker-compose.yml
index 971288b1b..b97744e66 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,11 +17,15 @@ services:
     command: bash -c "make test"
 
   middleware-node-a:
+    stop_grace_period: 1s
+    stop_signal: SIGABRT
     image: docker.pkg.github.com/anytypeio/go-anytype-middleware/server:${TAG}
     environment:
       ANYTYPE_GRPC_ADDR: "0.0.0.0:31007"
 
   middleware-node-b:
+    stop_grace_period: 1s
+    stop_signal: SIGABRT
     image: docker.pkg.github.com/anytypeio/go-anytype-middleware/server:${TAG}
     environment:
       ANYTYPE_GRPC_ADDR: "0.0.0.0:41007"