diff --git a/cert-cluster-issuer/cluster-issuer.yaml b/argocd-nginx/base/argocd-cert-issuer.yaml
similarity index 83%
rename from cert-cluster-issuer/cluster-issuer.yaml
rename to argocd-nginx/base/argocd-cert-issuer.yaml
index 8b2776d..8605828 100644
--- a/cert-cluster-issuer/cluster-issuer.yaml
+++ b/argocd-nginx/base/argocd-cert-issuer.yaml
@@ -1,7 +1,7 @@
 apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
+kind: Issuer
 metadata:
-  name: letsencrypt
+  name: lets-encrypt
   namespace: kube-system
 spec:
   acme:
@@ -12,9 +12,9 @@ spec:
     server: https://acme-v02.api.letsencrypt.org/directory
     privateKeySecretRef:
       # Secret resource that will be used to store the account's private key.
-      name: letsencrypt-account-key
+      name: argocd-letsencrypt-account-key
     # Add a single challenge solver, HTTP01 using nginx
     solvers:
     - http01:
         ingress:
-          class: public
+          IngressClassName: nginx
diff --git a/argocd-nginx/base/argocd-certificate.yaml b/argocd-nginx/base/argocd-certificate.yaml
deleted file mode 100644
index f4d04bd..0000000
--- a/argocd-nginx/base/argocd-certificate.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: tls-secret
-  namespace: argocd
-spec:
-  # Secret names are always required.
-  secretName: tls-secret
-
-  # At least one of commonName (possibly through literalSubject), dnsNames, uris, emailAddresses, ipAddresses or otherNames is required.
-  dnsNames:
-    - argocd-test.streams.sunet.se
-
-  # Issuer references are always required.
-  issuerRef:
-    name: letsencrypt
-    # We can reference ClusterIssuers by changing the kind here.
-    # The default value is Issuer (i.e. a locally namespaced Issuer)
-    kind: ClusterIssuer
diff --git a/argocd-nginx/base/argocd-ingress.yaml b/argocd-nginx/base/argocd-ingress.yaml
index 56a38f4..e33dcca 100644
--- a/argocd-nginx/base/argocd-ingress.yaml
+++ b/argocd-nginx/base/argocd-ingress.yaml
@@ -4,7 +4,7 @@ metadata:
   name: argocd-ingress
   namespace: argocd
   annotations:
-    cert-manager.io/cluster-issuer: "letsencrypt"
+    cert-manager.io/issuer: "lets-encrypt"
     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"
@@ -18,7 +18,7 @@ spec:
   tls:
     - hosts:
         - argocd-test.streams.sunet.se 
-      secretName: tls-secret
+      secretName: argocd-tls-secret
   rules:
   - host: argocd-test.streams.sunet.se
     http:
diff --git a/argocd-nginx/base/kustomization.yaml b/argocd-nginx/base/kustomization.yaml
index 55767f8..a5d0656 100644
--- a/argocd-nginx/base/kustomization.yaml
+++ b/argocd-nginx/base/kustomization.yaml
@@ -1,3 +1,3 @@
 resources:
   - argocd-ingress.yaml
-  - argocd-certificate.yaml
+  - argocd-cert-issuer.yaml