diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7c56582e..be82ffcc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,17 +9,31 @@ stages:
   - ctf-super-hard      # "Super hard" CTF challenges coming out of PentestPerf
 
 variables:
-  DOCKER_HOST: tcp://docker:2375
+  DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_HOST: tcp://docker:2376
   DOCKER_DRIVER: overlay2
-  DOCKER_TLS_CERTDIR: ""
+  GIT_STRATEGY: clone
+  GIT_DEPTH: "20"
   VERSION: "0.1"
   DISTRO: ubuntu:22.04
 
+services:
+  - name: docker:dind
+    command: ["--tls=true", "--tlsverify=false"]
+    entrypoint: ["sh", "-c", "dockerd-entrypoint.sh && sleep 5"]
+
 include:
   - project: 'aliasrobotics/alias_research/cai'
     ref: main
     file:
-      - 'ci/build/.build.yml'                # build
-      #- 'ci/setup/.setup.yml'               # setup
-      - 'ci/test/.test.yml'                  # test
-      #- 'ci/ctfs/.ctf.yml'                  # ctf
+      - 'ci/build/.build.yml'
+      - 'ci/test/.test.yml'
+
+before_script:
+  - |
+    for i in $(seq 1 30); do
+      docker info && break
+      echo "Waiting for Docker to start..."
+      sleep 1
+    done
+    docker info