diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1180dc01f3045081069a7ad9fe222ec2531fe5e7..e6a0afddd5111e5a3c9de3bfaeeaf72d942bab2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,18 @@
 stages:
   - build
   - push
-  - deploy
 
 variables:
-  DOCKER_DRIVER: overlay2
-  CLIENT_IMAGE: $CI_REGISTRY_IMAGE/client:$CI_COMMIT_SHORT_SHA
-  NEO4J_IMAGE: $CI_REGISTRY_IMAGE/neo4j:$CI_COMMIT_SHORT_SHA
+  CLIENT_IMAGE: $DOCKER_REGISTRY/$DOCKER_REPO_NAMESPACE/client:$CI_COMMIT_SHORT_SHA
+  NEO4J_IMAGE: $DOCKER_REGISTRY/$DOCKER_REPO_NAMESPACE/neo4j:$CI_COMMIT_SHORT_SHA
 
 .default-docker-job:
   image: docker:24.0
   services:
     - docker:24.0-dind
   before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+    - docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" $DOCKER_REGISTRY
 
-# Build both images
 build_client:
   extends: .default-docker-job
   stage: build
@@ -28,7 +25,6 @@ build_neo4j:
   script:
     - docker build -t $NEO4J_IMAGE ./neo4j
 
-# Push both images
 push_client:
   extends: .default-docker-job
   stage: push
@@ -42,18 +38,3 @@ push_neo4j:
   script:
     - docker push $NEO4J_IMAGE
   needs: [build_neo4j]
-
-# Optional deployment (e.g., via kubectl or Helm)
-# deploy:
-#   stage: deploy
-#   image:
-#     name: bitnami/kubectl:latest
-#     entrypoint: [""]
-#   script:
-#     - echo "$KUBECONFIG" > kubeconfig.yaml
-#     - export KUBECONFIG=$CI_PROJECT_DIR/kubeconfig.yaml
-#     - kubectl set image deployment/client client-container=$CLIENT_IMAGE --namespace=mon-namespace
-#     - kubectl set image deployment/neo4j neo4j-container=$NEO4J_IMAGE --namespace=mon-namespace
-#   only:
-#     - main
-#   needs: [push_client, push_neo4j]