diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a4e9ef..ba4cf0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,7 +83,7 @@ nomadimage:
       alias: docker
   needs: []
   script:
-    - cd nomad
+    - cd ci
     - docker login -u $DOCKER_REGISTRY_USER -p $DOCKER_REGISTRY_PASSWORD $DOCKER_REGISTRY
     - docker pull $DOCKER_REGISTRY/library/debian:buster-slim
     - docker tag $DOCKER_REGISTRY/library/debian:buster-slim debian:buster-slim
@@ -102,15 +102,15 @@ nomadimage:
     - job: nomadimage
   script:
     # Only replace set env vars
-    - envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < nomad/api.tpl.nomad > nomad/api.nomad
+    - envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < ci/api.tpl.nomad > ci/api.nomad
     # Make sure to set NOMAD_ADDR, NOMAD_SKIP_VERIFY and NOMAD_TOKEN env vars in CI settings appropriately
-    - nomad validate nomad/api.nomad
+    - nomad validate ci/api.nomad
     # nomad plan returns 1 if allocation is created or destroyed which is what we want here
-    - nomad plan     nomad/api.nomad || [ $? == 1 ]
-    - nomad-run-and-wait nomad/api.nomad
+    - nomad plan     ci/api.nomad || [ $? == 1 ]
+    - nomad-run-and-wait ci/api.nomad
   artifacts:
     paths:
-      - nomad/api.nomad
+      - ci/api.nomad
     expire_in: 1 month
     expose_as: api-nomad
 
diff --git a/nomad/Dockerfile b/ci/Dockerfile
similarity index 100%
rename from nomad/Dockerfile
rename to ci/Dockerfile
diff --git a/nomad/api.tpl.nomad b/ci/api.tpl.nomad
similarity index 100%
rename from nomad/api.tpl.nomad
rename to ci/api.tpl.nomad
diff --git a/nomad/nomad-run-and-wait b/ci/nomad-run-and-wait
similarity index 100%
rename from nomad/nomad-run-and-wait
rename to ci/nomad-run-and-wait