diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 50f0f830d3e89142c1895c32e86e579ebf643553..971901874217090a5af770c73415b56c10349703 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,12 +48,10 @@ build_client:
   services:
     - docker:19.03.12-dind
   before_script: 
-    - echo $CI_REGISTRY
-    - echo $CI_REGISTRY_USER
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   variables: 
-    CLIENT_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:$CI_COMMIT_TAG
-    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/client:latest
+    CLIENT_IMAGE_TAG: $CI_REGISTRY/devops-project/app:client$CI_COMMIT_TAG
+    CLIENT_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app:clientlatest
   script:
     - cd app/client
     - docker build -t $CLIENT_IMAGE_TAG .
@@ -72,15 +70,13 @@ build_server:
   services:
     - docker:19.03.12-dind
   before_script: 
-    - echo $CI_REGISTRY
-    - echo $CI_REGISTRY_USER
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   variables: 
-    SERVER_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:$CI_COMMIT_TAG
-    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app/server:latest
+    SERVER_IMAGE_TAG: $CI_REGISTRY_IMAGE/devops-project/app:server$CI_COMMIT_TAG
+    SERVER_RELEASE_IMAGE_TAG: $CI_REGISTRY/devops-project/app:serverlatest
   script:
     - cd app/server
     - docker build -t $SERVER_IMAGE_TAG .
     - docker tag $SERVER_IMAGE_TAG $SERVER_RELEASE_IMAGE_TAG
-    - docker image push $SERVER_IMAGE_TAG
-    - docker image push $SERVER_RELEASE_IMAGE_TAG
+    - docker push $SERVER_IMAGE_TAG
+    - docker push $SERVER_RELEASE_IMAGE_TAG
diff --git a/TODOS.md b/TODOS.md
index f9cfb9c5e298c927a9cd389b550ba5cf97708062..dfef18cbf8dfd8922fc663ccc62573ffca092b48 100644
--- a/TODOS.md
+++ b/TODOS.md
@@ -12,8 +12,8 @@
   - [x] client helm chart
   - [ ] server/backend chart with mongodb dependency
     - [x] backend image running
-    - [ ] mongodb pvc setup working
-    - [ ] connect backend <-> mongodb
+    - [x] mongodb pvc setup working
+    - [x] connect backend <-> mongodb
     - [ ] working replicaCount increase
   - [ ] Document test setup in minikube for testing the helm charts?