diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml
index f6e2bd5ed..134b2cf87 100644
--- a/.gitlab-ci/backend.yml
+++ b/.gitlab-ci/backend.yml
@@ -20,6 +20,18 @@ stages:
   - lint
   - test
 
+default:
+  image:
+    name: ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION}
+    entrypoint: [""]
+    docker:
+      platform: x86_64
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
+    expire_in: "1 day"
+  retry: 2
+  interruptible: true
+
 
 container:
   stage: container
@@ -69,4 +81,4 @@ test:
   script:
     - *load-backend-image
     - make -- --docker-run-backend-test FRADRIVE_SERVICE=backend CONTAINER_RUNNER=podman-compose
-  cache: *backend-cache
\ No newline at end of file
+  cache: *backend-cache
diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml
index 0890947e1..64a142da9 100644
--- a/.gitlab-ci/frontend.yml
+++ b/.gitlab-ci/frontend.yml
@@ -20,6 +20,18 @@ stages:
   - lint
   - test
 
+default:
+  image:
+    name: ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
+    entrypoint: [""]
+    docker:
+      platform: x86_64
+  artifacts:
+    name: "${CI_JOB_NAME}-${CI_COMMIT_SHORT_SHA}"
+    expire_in: "1 day"
+  retry: 2
+  interruptible: true
+
 
 container:
   stage: container