diff --git a/apps/whoami/ingress.yaml b/apps/whoami/ingress.yaml
index 182f79f..69f2767 100644
--- a/apps/whoami/ingress.yaml
+++ b/apps/whoami/ingress.yaml
@@ -4,14 +4,14 @@ metadata:
   name: whoami
   namespace: whoami
   annotations:
-    cert-manager.io/issuer: "le-example-http"
+    cert-manager.io/issuer: "le-whoami-http"
 spec:
   tls:
     - hosts:
-        - whoami.ratatoskr.myddns.rocks
+        - cert.stonegarden.dev
       secretName: tls-whoami-ingress-http
   rules:
-    - host: whoami.ratatoskr.myddns.rocks
+    - host: cert.stonegarden.dev
       http:
         paths:
           - path: /
@@ -20,4 +20,4 @@ spec:
               service:
                 name: whoami
                 port:
-                  name: web
\ No newline at end of file
+                  number: 80
\ No newline at end of file
diff --git a/infra/cert-manager/issuer.yaml b/apps/whoami/issuer.yaml
similarity index 64%
rename from infra/cert-manager/issuer.yaml
rename to apps/whoami/issuer.yaml
index 957eb14..541cba6 100644
--- a/infra/cert-manager/issuer.yaml
+++ b/apps/whoami/issuer.yaml
@@ -1,16 +1,15 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: le-example-http
+  name: le-whoami-http
   namespace: whoami
 spec:
   acme:
     email: veghag@gmail.com
-    # We use the staging server here for testing to avoid hitting
-    server: https://acme-staging-v02.api.letsencrypt.org/directory
+    server: https://acme-v02.api.letsencrypt.org/directory
     privateKeySecretRef:
       # if not existing, it will register a new account and stores it
-      name: example-issuer-account-key
+      name: whoami-issuer-account-key
     solvers:
       - http01:
           # The ingressClass used to create the necessary ingress routes
diff --git a/apps/whoami/kustomization.yaml b/apps/whoami/kustomization.yaml
index 99956ab..f4ad632 100644
--- a/apps/whoami/kustomization.yaml
+++ b/apps/whoami/kustomization.yaml
@@ -3,6 +3,7 @@ kind: Kustomization
 namespace: whoami
 
 resources:
+  - issuer.yaml
   - ingress.yaml
   - ingress-route.yaml
   - traefik-forward-auth
diff --git a/infra/cert-manager/kustomization.yaml b/infra/cert-manager/kustomization.yaml
index 91c94b6..caae527 100644
--- a/infra/cert-manager/kustomization.yaml
+++ b/infra/cert-manager/kustomization.yaml
@@ -1,7 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: cert-manager
 
 resources:
-  - https://github.com/cert-manager/cert-manager/releases/download/v1.11.0/cert-manager.yaml
-  - issuer.yaml
\ No newline at end of file
+  - https://github.com/cert-manager/cert-manager/releases/download/v1.11.0/cert-manager.yaml
\ No newline at end of file