diff --git a/argocd-nginx/overlays/test/argocd-ingress.yaml b/argocd-nginx/overlays/test/argocd-ingress.yaml
index 30a1277..56a38f4 100644
--- a/argocd-nginx/overlays/test/argocd-ingress.yaml
+++ b/argocd-nginx/overlays/test/argocd-ingress.yaml
@@ -5,6 +5,9 @@ metadata:
   namespace: argocd
   annotations:
     cert-manager.io/cluster-issuer: "letsencrypt"
+    acme.cert-manager.io/http01-ingress-class: nginx
+    acme.cert-manager.io/http01-edit-in-place: "false"
+    nginx.ingress.kubernetes.io/from-to-www-redirect: "false"
 spec:
   defaultBackend:
     service:
@@ -20,13 +23,6 @@ spec:
   - host: argocd-test.streams.sunet.se
     http:
       paths:
-      - path: /.well-known/acme-challenge
-        pathType: Prefix
-        backend:
-          service:
-            name: acme-solver
-            port:
-              number: 80
       - path: /
         pathType: Prefix
         backend:
diff --git a/cert-cluster-issuer/cluster-issuer.yaml b/cert-cluster-issuer/cluster-issuer.yaml
index 312667c..8b2776d 100644
--- a/cert-cluster-issuer/cluster-issuer.yaml
+++ b/cert-cluster-issuer/cluster-issuer.yaml
@@ -17,5 +17,4 @@ spec:
     solvers:
     - http01:
         ingress:
-          serviceType: ClusterIP
-          name: acme-solver
+          class: public