diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7b633c687d05ed362744e5ff379be9de565ea1a..0c7bdc35f0d2c7011c635f954b6fdea0cf62b964 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,42 @@
-# This file is a template, and might need editing before it works on your project.
-# This template moved to Jobs/Secret-Detection.gitlab-ci.yml in GitLab 14.0
-# Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/292977
+stages:
+  - build
+  - deploy
 
-include:
-  template: Jobs/Secret-Detection.gitlab-ci.yml
+build:
+  stage: build
+  
+  when: manual 
+
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+ 
+  script:
+
+#  # Build Backend
+#   
+#    - echo "Building Backend"
+#    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+#    - /kaniko/executor --context $CI_PROJECT_DIR/conduit-backend --dockerfile $CI_PROJECT_DIR/conduit-backend/Dockerfile --destination $CI_REGISTRY_IMAGE:backend
+  
+  # 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/conduit-front --dockerfile $CI_PROJECT_DIR/conduit-front/Dockerfile --destination $CI_REGISTRY_IMAGE:front
+
+deploy:
+
+#    tags:
+#      - example
+
+    stage: deploy
+
+    when: manual
+
+    script: echo "Deploying"
+    image: bitnami/kubectl:latest
+    script:
+         - kubectl apply -f service.yaml
+         - kubectl apply -f deployment.yaml
+         - kubectl -n default rollout restart deployment default