diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 969f0d0..2dee2da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,31 @@
-job1:
+stages:
+  - build
+  - deploy-prod
+
+variables:
+  DOCKER_HOST: tcp://docker:2376
+  DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_TLS_VERIFY: 1
+  DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
+  DOCKER_DRIVER: overlay2
+
+image: buildtool/build-tools:0.0.23
+services:
+  - docker:19.03.12-dind
+
+build:
   stage: build
-  image: docker
-  services:
-    - docker:dind
   script:
-    - docker version
-    - docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
-    - docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
-    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
-    - docker push $CI_REGISTRY_IMAGE:latest
+    - build
+    - push
+
+deploy-to-prod:
+  stage: deploy-prod
+  when: on_success
+  script:
+    - echo Deploy to PROD.
+    - deploy prod
+  environment:
+    name: prod
+  only:
+    - master
diff --git a/deployment_files/deploy.yaml b/k8s/deploy.yaml
similarity index 97%
rename from deployment_files/deploy.yaml
rename to k8s/deploy.yaml
index a76dfad..45d5743 100644
--- a/deployment_files/deploy.yaml
+++ b/k8s/deploy.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: lingonpaj-site
diff --git a/deployment_files/ingress-local.yaml b/k8s/ingress-local.yaml
similarity index 89%
rename from deployment_files/ingress-local.yaml
rename to k8s/ingress-local.yaml
index aa841b1..aef5d3d 100644
--- a/deployment_files/ingress-local.yaml
+++ b/k8s/ingress-local.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: lingonpaj-site-ingress
diff --git a/deployment_files/ingress-prod.yaml b/k8s/ingress-prod.yaml
similarity index 67%
rename from deployment_files/ingress-prod.yaml
rename to k8s/ingress-prod.yaml
index c44a7a6..78afb93 100644
--- a/deployment_files/ingress-prod.yaml
+++ b/k8s/ingress-prod.yaml
@@ -1,11 +1,10 @@
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: lingonpaj-site-ingress
   annotations:
     kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/enable-cors: "true"
-    ingress.kubernetes.io/force-ssl-redirect: "false"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
 spec:
   rules:
   - host: "lingonpaj.com"