diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1a948b3..5551e78 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
 
 image: buildtool/build-tools:${BUILDTOOLS_VERSION}
 services:
-  - docker:19.03.12-dind
+  - docker:dind
 
 build:
   stage: build
diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml
index bc42b07..371666e 100644
--- a/k8s/ingress-prod.yaml
+++ b/k8s/ingress-prod.yaml
@@ -3,21 +3,33 @@ kind: Ingress
 metadata:
   name: unbound-site-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    ingress.kubernetes.io/enable-cors: "true"
+    kubernetes.io/ingress.class: "alb"
+    alb.ingress.kubernetes.io/group.name: "unbound"
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80},{"HTTPS": 443}]'
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: instance
+    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
 spec:
   rules:
-  - host: "unbound.se"
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: unbound-site
-          servicePort: 80
-  - host: "www.unbound.se"
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: unbound-site
-          servicePort: 80
+    - host: "unbound.se"
+      http:
+        paths:
+          - path: /*
+            backend:
+              serviceName: ssl-redirect
+              servicePort: use-annotation
+          - path: /
+            backend:
+              serviceName: unbound-site
+              servicePort: 80
+    - host: "www.unbound.se"
+      http:
+        paths:
+          - path: /*
+            backend:
+              serviceName: ssl-redirect
+              servicePort: use-annotation
+          - path: /
+            backend:
+              serviceName: unbound-site
+              servicePort: 80