diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c14730f49874da70e19e74b00cfdc3da008270bb..2d21e198090be7b04a45ad8a3edf1213160c2e1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,7 @@
 #  - template: DAST.gitlab-ci.yml
 
 stages:
-#  - build backend
-  - build frontend
+  - build
 #  - test
 #  - deploy mongodb
 #  - deploy backend
@@ -22,8 +21,8 @@ stages:
 #  DAST_AUTH_PASSWORD: “DAST”
 #  SAST_GOSEC_LEVEL: 2
 
-#build backend:
-#  stage: build backend
+build backend:
+  stage: build
   
 #  when: manual 
 
@@ -35,18 +34,18 @@ stages:
 
   #Build Backend
    
-#    - echo "Building Backend"
-#    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-#    - /kaniko/executor 
-#      --context git://gitlab.labranet.jamk.fi/conduitmiau/conduit-backend/
-#      --dockerfile Dockerfile
-#      --destination $CI_REGISTRY_IMAGE:backend-$CI_COMMIT_SHORT_SHA
+    - echo "Building Backend"
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+    - /kaniko/executor 
+      --context git://gitlab.labranet.jamk.fi/conduitmiau/conduit-backend/
+      --dockerfile Dockerfile
+      --destination $CI_REGISTRY_IMAGE:backend-$CI_COMMIT_SHORT_SHA
       
 
 
 
 build frontend:
-  stage: build frontend
+  stage: build
   
 #  when: manual 
 
@@ -61,7 +60,7 @@ build frontend:
     - echo "Building Frontend"
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor
-      --context $CI_PROJECT_DIR
+      --context $CI_PROJECT_DIR/conduit-front
       --dockerfile $CI_PROJECT_DIR/conduit-front/Dockerfile
       --destination $CI_REGISTRY_IMAGE:front-$CI_COMMIT_SHORT_SHA