diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e29dd89..3b6ed60e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,8 +14,8 @@ variables:
   DOCKER_TLS_CERTDIR: ""
   VERSION: "0.1"
   DISTRO: ubuntu:22.04
-  CI_DEBUG_TRACE: "true"
-  GIT_FETCH_TIMEOUT: 300
+  # CI_DEBUG_TRACE: "true"
+  # GIT_FETCH_TIMEOUT: 300
 
 services:
   - name: docker:dind
diff --git a/ci/build/.build.yml b/ci/build/.build.yml
index 78adef1b..060ab574 100644
--- a/ci/build/.build.yml
+++ b/ci/build/.build.yml
@@ -8,7 +8,6 @@
   image: docker:latest
   services:
     - name: docker:dind
-      # NOTE: The alias is key to resolving the DNS issue.
       alias: docker
   before_script:
     # - echo $CI_JOB_TOKEN | docker login -u gitlab-ci-token --password-stdin $CI_REGISTRY;
@@ -22,7 +21,7 @@
   script:
     - cat .devcontainer/Dockerfile > Dockerfile_base
     # Build the image
-    # - unset DOCKER_HOST
+    - unset DOCKER_HOST  # see https://forums.docker.com/t/error-error-during-connect-get-http-docker-2375-ping-dial-tcp-lookup-docker-on-10-10-15-22-server-misbehaving/138383/9
     - docker build -t $CI_REGISTRY_IMAGE:$TAGGING -f Dockerfile_base .
     - docker push $CI_REGISTRY_IMAGE:$TAGGING
 
diff --git a/ci/test/.test.yml b/ci/test/.test.yml
index d9f4dc9b..e4a1fb1f 100644
--- a/ci/test/.test.yml
+++ b/ci/test/.test.yml
@@ -4,6 +4,7 @@
   image: "${CI_REGISTRY_IMAGE}:latest"
   services:
     - name: docker:dind
+      alias: docker
 
 .run_test: &run_test
   <<: *use_base_container