diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94c2735c4..f27edbee7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ setup:containers:frontend: &containers-frontend
   image: ${IMAGE_BUILDER}
   script:
     - FRONTEND_IMAGE_VERSION=`cat frontend-image-version`
-    - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --build-context ./ --file docker/frontend/Dockerfile
+    - buildah bud -t frontend/${CI_COMMIT_REF_SLUG}:${FRONTEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:${CI_PROJECT_DIR} --file 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:
     - changes:
@@ -93,7 +93,7 @@ setup:containers:backend: &containers-backend
   image: ${IMAGE_BUILDER}
   script:
     - BACKEND_IMAGE_VERSION=`cat backend-image-version`
-    - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --build-context fradrive=./ --file docker/backend/Dockerfile
+    - buildah bud -t backend/${CI_COMMIT_REF_SLUG}:${BACKEND_IMAGE_VERSION} --build-arg PROJECT_DIR=${CI_PROJECT_DIR} --volume ${CI_PROJECT_DIR}:${CI_PROJECT_DIR} --file 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:
     - changes:
diff --git a/.gitlab-ci/backend.yml b/.gitlab-ci/backend.yml
index cf316f21e..c32e45975 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}
-    entrypoint: [""]
+    # entrypoint: [""]
     docker:
       platform: x86_64
   artifacts: