diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22475db..fd3ffe2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ image: buildtool/build-tools:${BUILDTOOLS_VERSION}
 build:
   stage: build
   services:
-    - docker:19.03-dind
+    - docker:dind
   script:
   - build
   - push
diff --git a/k8s/ingress-prod.yaml b/k8s/ingress-prod.yaml
index af2152d..445a4f8 100644
--- a/k8s/ingress-prod.yaml
+++ b/k8s/ingress-prod.yaml
@@ -3,14 +3,22 @@ kind: Ingress
 metadata:
   name: dancefinder-app-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
-    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: "dancefinder.unbound.se"
-    http:
-      paths:
-      - path: /
-        backend:
-          serviceName: dancefinder-app
-          servicePort: 80
+    - host: "dancefinder.unbound.se"
+      http:
+        paths:
+          - path: /*
+            backend:
+              serviceName: ssl-redirect
+              servicePort: use-annotation
+          - path: /
+            backend:
+              serviceName: dancefinder-app
+              servicePort: 80