diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml
index 0b8395a29..9dadf2375 100644
--- a/.gitlab-ci/backend.yml
+++ b/.gitlab-ci/backend.yml
@@ -44,6 +44,15 @@ container:
         - docker/backend/Dockerfile
   interruptible: false
 
+container-manual:
+  stage: container
+  image: ${IMAGE_BUILDER}
+  script:
+    - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} docker/backend/Dockerfile
+    - buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION}
+  rules:
+    - when: manual
+  interruptible: false
 
 compile:
   stage: compile
diff --git a/.gitlab-ci/frontend.yml b/.gitlab-ci/frontend.yml
index 364213f1f..d37c0283d 100644
--- a/.gitlab-ci/frontend.yml
+++ b/.gitlab-ci/frontend.yml
@@ -42,6 +42,15 @@ container:
   rules:
     - changes:
         - docker/frontend/Dockerfile
+  interruptible: false
+
+container-manual:
+  stage: container
+  image: ${IMAGE_BUILDER}
+  script:
+    - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} docker/frontend/Dockerfile
+    - buildah push --creds "${CI_REGISTRY_USER}:${CI_JOB_TOKEN}" frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} ${CI_REGISTRY_IMAGE}/frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION}
+  rules:
     - when: manual
   interruptible: false