diff --git a/.gitlab-ci.yml b/conduit-backend/.gitlab-ci.yml
similarity index 69%
rename from .gitlab-ci.yml
rename to conduit-backend/.gitlab-ci.yml
index 78a8f16e3f84a86e38fd468649582d38e8cefedd..2193daf3e5ffabc54c72311718870c68b3d8acfd 100644
--- a/.gitlab-ci.yml
+++ b/conduit-backend/.gitlab-ci.yml
@@ -19,12 +19,6 @@ build:
     - 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:
diff --git a/deployment.yaml b/conduit-backend/deployment.yaml
similarity index 79%
rename from deployment.yaml
rename to conduit-backend/deployment.yaml
index d0464d80d920d079f40a4cee9c43941bc721ad64..b519c1020af0b31ff4524f85d027aa07884ae4be 100644
--- a/deployment.yaml
+++ b/conduit-backend/deployment.yaml
@@ -24,7 +24,3 @@ spec:
       - image: gitlab.labranet.jamk.fi:4567/conduitmiau/kubetest:backend
         imagePullPolicy: Always
         name: backend
-    
-      - image: gitlab.labranet.jamk.fi:4567/conduitmiau/kubetest:front
-        imagePullPolicy: Always
-        name: front
diff --git a/service.yaml b/conduit-backend/service.yaml
similarity index 100%
rename from service.yaml
rename to conduit-backend/service.yaml
diff --git a/conduit-front/.gitlab-ci.yml b/conduit-front/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..303e1c254275a600ccae1d689759a5809d71428f
--- /dev/null
+++ b/conduit-front/.gitlab-ci.yml
@@ -0,0 +1,36 @@
+stages:
+  - build
+  - deploy
+
+build:
+  stage: build
+  
+  when: manual 
+
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
+ 
+  script:
+
+# 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
diff --git a/conduit-front/deployment.yaml b/conduit-front/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2b05bf9d9ad0657b255c97b4a04c3385692263bb
--- /dev/null
+++ b/conduit-front/deployment.yaml
@@ -0,0 +1,26 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels:
+    app: default
+  name: default
+  namespace: default
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: default
+  strategy:
+    rollingUpdate:
+      maxSurge: 25%
+      maxUnavailable: 25%
+    type: RollingUpdate
+  template:
+    metadata:
+      labels:
+        app: default
+    spec:
+      containers:
+      - image: gitlab.labranet.jamk.fi:4567/conduitmiau/kubetest:front
+        imagePullPolicy: Always
+        name: front
diff --git a/conduit-front/service.yaml b/conduit-front/service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6582c63acff1e51d56ad3036110f301d6011743a
--- /dev/null
+++ b/conduit-front/service.yaml
@@ -0,0 +1,13 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: default
+  namespace: default
+spec:
+  type: LoadBalancer
+  ports:
+    - nodePort: 30149
+      port: 80
+      targetPort: 4100
+  selector:
+    app: default