diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e72834c..7408e9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,17 +25,26 @@ services:
 default:
   before_script: &default_before_scripts
     - apk update
-    - apk add --no-cache gcc musl-dev linux-headers bash zip jq curl py3-psutil python3
+    - apk add --no-cache gcc musl-dev linux-headers bash zip jq curl py3-psutil python3 bind-tools
     - python3 -m ensurepip
     - python3 -m pip install --no-cache --upgrade pip setuptools
     - mkdir -p $PIP_CACHE_DIR
     - python3 -m pip install localstack awscli awscli-local
     - docker pull localstack/localstack-pro:latest
-    - dind_ip="$(getent hosts docker | cut -d' ' -f1)"
-    - echo "${dind_ip} localhost.localstack.cloud " >> /etc/hosts
+    - dind_ip="$(getent ahostsv4 docker | cut -d' ' -f1 | head -n1)"
+    - echo -e "${dind_ip}\tlocalhost.localstack.cloud\n" >> /etc/hosts
     - localstack start -d
-    - localstack wait -t 30
+    - localstack wait -t 90
     - (test -f ./ls-state-pod.zip && localstack state import ./ls-state-pod.zip) || true
+    - localstack logs
+    - docker ps
+    - getent ahostsv4 docker
+    - cat /etc/hosts
+    - getent ahostsv4 localhost.localstack.cloud
+    - curl http://docker:4566/_localstack/health
+    - curl http://docker:4566/_localstack/diagnose
+    - curl -v http://localhost.localstack.cloud:4566/_localstack/health
+    - curl -v http://localhost.localstack.cloud:4566/_localstack/diagnose
   cache:
     paths:
       - $CI_PROJECT_DIR/.cache/pip
@@ -57,7 +66,6 @@ deploy:
   script:
     - ./bin/deploy.sh
     - localstack state export ./ls-state-pod.zip
-    - localstack logs
 
 test:
   stage: test