diff --git a/k8s/README.md b/k8s/README.md
index c5c6d55..8f60c7b 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -13,7 +13,7 @@ k create ns flux
 k create ns cert-manager
 k create ns nginx-ingress
 k create ns infrapuzzle
-
+k create ns kuard
 ```
 
 ## [helm-operator](https://github.com/fluxcd/helm-operator/blob/master/chart/helm-operator/README.md)
@@ -47,3 +47,11 @@ $ kubectl apply -f cert-manager/cert-manager.yaml
 $ kubectl apply -f cert-manager/staging-issuer.yaml
 $ kubectl apply -f cert-manager/production-issuer.yaml
 ```
+
+To test all this you may use the kuaard demo project:
+
+```sh
+$ kubectl apply -f kuard
+# checkout: https://kuard.haumdaucher.de
+$ kubectl delete -f kuard
+```
diff --git a/k8s/cert-manager/production-issuer.yaml b/k8s/cert-manager/production-issuer.yaml
index 6466ea0..b24229e 100644
--- a/k8s/cert-manager/production-issuer.yaml
+++ b/k8s/cert-manager/production-issuer.yaml
@@ -1,5 +1,5 @@
    apiVersion: cert-manager.io/v1alpha2
-   kind: Issuer
+   kind: ClusterIssuer
    metadata:
      name: letsencrypt-prod
      namespace: cert-manager
diff --git a/k8s/cert-manager/staging-issuer.yaml b/k8s/cert-manager/staging-issuer.yaml
index 4eb535b..40d167e 100644
--- a/k8s/cert-manager/staging-issuer.yaml
+++ b/k8s/cert-manager/staging-issuer.yaml
@@ -1,5 +1,5 @@
    apiVersion: cert-manager.io/v1alpha2
-   kind: Issuer
+   kind: ClusterIssuer
    metadata:
      name: letsencrypt-staging
      namespace: cert-manager
diff --git a/k8s/default/deployment.yaml b/k8s/kuard/deployment.yaml
similarity index 94%
rename from k8s/default/deployment.yaml
rename to k8s/kuard/deployment.yaml
index f97bc72..46388cc 100644
--- a/k8s/default/deployment.yaml
+++ b/k8s/kuard/deployment.yaml
@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kuard
-  namespace: default
+  namespace: kuard
 spec:
   selector:
     matchLabels:
diff --git a/k8s/default/ingress.yaml b/k8s/kuard/ingress.yaml
similarity index 83%
rename from k8s/default/ingress.yaml
rename to k8s/kuard/ingress.yaml
index 143706f..a64d479 100644
--- a/k8s/default/ingress.yaml
+++ b/k8s/kuard/ingress.yaml
@@ -2,10 +2,10 @@ apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
   name: kuard
-  namespace: default
+  namespace: kuard
   annotations:
     kubernetes.io/ingress.class: "nginx"    
-    cert-manager.io/issuer: "letsencrypt-staging"
+    cert-manager.io/cluster-issuer: "letsencrypt-prod"
 
 spec:
   tls:
diff --git a/k8s/default/service.yaml b/k8s/kuard/service.yaml
similarity index 87%
rename from k8s/default/service.yaml
rename to k8s/kuard/service.yaml
index f110b09..37f0991 100644
--- a/k8s/default/service.yaml
+++ b/k8s/kuard/service.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: kuard
-  namespace: default
+  namespace: kuard
 spec:
   ports:
   - port: 80