diff --git a/conduit-front/.gitlab-ci.yml b/.gitlab-ci.yml
similarity index 67%
rename from conduit-front/.gitlab-ci.yml
rename to .gitlab-ci.yml
index 303e1c254275a600ccae1d689759a5809d71428f..78a8f16e3f84a86e38fd468649582d38e8cefedd 100644
--- a/conduit-front/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,13 @@ build:
  
   script:
 
-# Build Frontend
+  # 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
diff --git a/conduit-backend/.gitlab-ci.yml b/conduit-backend/.gitlab-ci.yml
deleted file mode 100644
index 29e2d98ea8083aafce8acdcd23d920b7583eb03c..0000000000000000000000000000000000000000
--- a/conduit-backend/.gitlab-ci.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-stages:
-  - build
-  - deploy
-
-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 --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:backend
-  
-deploy:
-
-#    tags:
-#      - examplee
-
-    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
deleted file mode 100644
index 2b05bf9d9ad0657b255c97b4a04c3385692263bb..0000000000000000000000000000000000000000
--- a/conduit-front/deployment.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-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
deleted file mode 100644
index 6582c63acff1e51d56ad3036110f301d6011743a..0000000000000000000000000000000000000000
--- a/conduit-front/service.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: default
-  namespace: default
-spec:
-  type: LoadBalancer
-  ports:
-    - nodePort: 30149
-      port: 80
-      targetPort: 4100
-  selector:
-    app: default
diff --git a/conduit-backend/deployment.yaml b/deployment.yaml
similarity index 79%
rename from conduit-backend/deployment.yaml
rename to deployment.yaml
index b519c1020af0b31ff4524f85d027aa07884ae4be..d0464d80d920d079f40a4cee9c43941bc721ad64 100644
--- a/conduit-backend/deployment.yaml
+++ b/deployment.yaml
@@ -24,3 +24,7 @@ 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/conduit-backend/service.yaml b/service.yaml
similarity index 100%
rename from conduit-backend/service.yaml
rename to service.yaml