diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19b1997..1c3b628 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,9 @@ variables:
   PIP_CACHE_DIR: $CI_PROJECT_DIR/.cache/pip
   DOCKER_HOST: tcp://docker:2375
   DOCKER_TLS_CERTDIR: ""
+  DEBUG: 1
   LS_LOG: trace
+  # CI_DEBUG_TRACE: "true"
 
 services:
   - name: docker:20.10.16-dind
@@ -35,11 +37,12 @@ default:
     - echo "${dind_ip} localhost.localstack.cloud " >> /etc/hosts
     - localstack start -d
     - localstack wait -t 30
+    - curl "$AWS_ENDPOINT_URL/_localstack/health"
     - (test -f ./ls-state-pod.zip && localstack state import ./ls-state-pod.zip) || true
   after_script:
     - docker ps | tee docker_ps.log
     - docker inspect localstack-main | tee docker_inspect.log
-    - curl ${AWS_ENDPOINT_URL}:4566/_localstack/diagnose | tee ls_diagnose.log
+    - (curl "$AWS_ENDPOINT_URL/_localstack/diagnose" | tee ls_diagnose.log) || true
     - localstack logs | tee ls_runlogs.log
   cache:
     paths:
@@ -53,6 +56,7 @@ deploy:
   stage: deploy
   script:
     - ./bin/deploy.sh
+    - curl "$AWS_ENDPOINT_URL/_localstack/health"
     - localstack state export ./ls-state-pod.zip
 
 test: