diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4bbc1d..2dee2da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,14 +3,18 @@ stages:
   - deploy-prod
 
 variables:
-  DOCKER_HOST: tcp://docker:2375/
+  DOCKER_HOST: tcp://docker:2376
+  DOCKER_TLS_CERTDIR: "/certs"
+  DOCKER_TLS_VERIFY: 1
+  DOCKER_CERT_PATH: "$DOCKER_TLS_CERTDIR/client"
+  DOCKER_DRIVER: overlay2
 
-image: registry.gitlab.com/sparetimecoders/build-tools
+image: buildtool/build-tools:0.0.23
+services:
+  - docker:19.03.12-dind
 
 build:
   stage: build
-  services:
-    - docker:dind
   script:
     - build
     - push
@@ -20,7 +24,6 @@ deploy-to-prod:
   when: on_success
   script:
     - echo Deploy to PROD.
-    - kubectl config get-contexts
     - deploy prod
   environment:
     name: prod
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 d8fa35d..3594299 100644
--- a/deployment_files/deploy.yaml
+++ b/k8s/deploy.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: unbound-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 be589c8..573194c 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: unbound-site-ingress
diff --git a/deployment_files/ingress-prod.yaml b/k8s/ingress-prod.yaml
similarity index 84%
rename from deployment_files/ingress-prod.yaml
rename to k8s/ingress-prod.yaml
index 06a4e2e..bc42b07 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: unbound-site-ingress
   annotations:
     kubernetes.io/ingress.class: "nginx"
     ingress.kubernetes.io/enable-cors: "true"
-    ingress.kubernetes.io/force-ssl-redirect: "true"
 spec:
   rules:
   - host: "unbound.se"