diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddd30fdb9c98510b4cd2a150bfe18f324ef03581..302b81818b70212c4c99f62c9795636ed1c94c59 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ stages:
 lint:
   stage: lint
   image:
-    name: $CI_REGISTRY/fit-connect/baseimage:latest
+    name: $CI_REGISTRY/fit-connect/images/baseimage:latest
   before_script:
     - yarn
     - yarn bundle
@@ -30,7 +30,7 @@ lint:
 
 build:
   stage: build
-  image: $CI_REGISTRY/fit-connect/baseimage:latest
+  image: $CI_REGISTRY/fit-connect/images/baseimage:latest
   before_script:
     - yarn
   script:
@@ -43,7 +43,7 @@ build:
 
 upload:latest:
   stage: upload
-  image: $CI_REGISTRY/fit-connect/baseimage:latest
+  image: $CI_REGISTRY/fit-connect/images/baseimage:latest
   rules:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   before_script:
@@ -54,7 +54,7 @@ upload:latest:
 
 upload:release:
   stage: upload
-  image: $CI_REGISTRY/fit-connect/baseimage:latest
+  image: $CI_REGISTRY/fit-connect/images/baseimage:latest
   rules:
     - if: $CI_COMMIT_TAG
   before_script:
@@ -65,7 +65,7 @@ upload:release:
 
 test:
   stage: test
-  image: $CI_REGISTRY/fit-connect/baseimage:latest
+  image: $CI_REGISTRY/fit-connect/images/baseimage:latest
   before_script:
     - yarn
     - yarn bundle
@@ -74,7 +74,7 @@ test:
 
 test-failing:
   stage: test
-  image: $CI_REGISTRY/fit-connect/baseimage:latest
+  image: $CI_REGISTRY/fit-connect/images/baseimage:latest
   before_script:
     - yarn
     - yarn bundle