diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4552fba55..3794b9482 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,8 +86,8 @@ setup:containers:frontend: &setup-container
     IMAGE_TYPE: frontend
   before_script: &container-before
     - IMAGE_VERSION=`cat ${IMAGE_TYPE}-image-version`
-    - IMAGE_TAG=${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
-    - REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/${IMAGE_TYPE}/${CI_COMMIT_REF_SLUG}:${IMAGE_VERSION}
+    - IMAGE_TAG=${CI_COMMIT_REF_SLUG}/${IMAGE_TYPE}:${IMAGE_VERSION}
+    - REGISTRY_DESTINATION=${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG}/${IMAGE_TYPE}:${IMAGE_VERSION}
   script:
     - curl --request GET --header "PRIVATE-TOKEN:${REGISTRY_AUTH_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/registry/repositories?tags=true" > .gitlab-ci/.container-registry-contents.json
     - cat .gitlab-ci/.container-registry-contents.json
diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml
index b8c7b8fbc..e951ba3b6 100644
--- a/.gitlab-ci/backend.yml
+++ b/.gitlab-ci/backend.yml
@@ -22,7 +22,7 @@ stages:
 
 default:
   image:
-    name: ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION}
+    name: ${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG}/backend:${BACKEND_IMAGE_VERSION}
     entrypoint: [""]
     docker:
       platform: x86_64
diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml
index da450d2a3..ec9af20f8 100644
--- a/.gitlab-ci/frontend.yml
+++ b/.gitlab-ci/frontend.yml
@@ -21,7 +21,7 @@ stages:
 
 default:
   image:
-    name: ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
+    name: ${CI_REGISTRY_IMAGE}/${CI_COMMIT_REF_SLUG}/frontend:${FRONTEND_IMAGE_VERSION}
     entrypoint: [""]
     docker:
       platform: x86_64