diff --git a/helm/cluster_setup/Chart.yaml b/helm/cluster_setup/Chart.yaml
new file mode 100644
index 0000000..9f28d1f
--- /dev/null
+++ b/helm/cluster_setup/Chart.yaml
@@ -0,0 +1,18 @@
+apiVersion: v2
+name: cluster_setup
+version: 0.1.0
+type: application
+description: "Initial cluster setup"
+maintainers:
+  - name: Jim Martens
+    url: https://2martens.de
+annotations:
+  artifacthub.io/changes: |
+    - kind: added
+      description: Added cluster roles and bindings to access logs and shell from kubectl
+    - kind: added
+      description: Added cluster issuer for lets encrypt
+  artifacthub.io/signKey: |
+    fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8
+    url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc
+  artifacthub.io/prerelease: true
\ No newline at end of file
diff --git a/k8s/certificate-issuer.yaml b/helm/cluster_setup/templates/certificate-issuer.yaml
similarity index 87%
rename from k8s/certificate-issuer.yaml
rename to helm/cluster_setup/templates/certificate-issuer.yaml
index 89641e7..b03cf39 100644
--- a/k8s/certificate-issuer.yaml
+++ b/helm/cluster_setup/templates/certificate-issuer.yaml
@@ -4,7 +4,7 @@ metadata:
   name: lets-encrypt
 spec:
   acme:
-    email: admin@2martens.de
+    email: {{ .Values.email }}
     server: https://acme-v02.api.letsencrypt.org/directory
     privateKeySecretRef:
       # Secret resource that will be used to store the account's private key.
diff --git a/k8s/log-access-cluster-role-binding.yaml b/helm/cluster_setup/templates/log-access-cluster-role-binding.yaml
similarity index 100%
rename from k8s/log-access-cluster-role-binding.yaml
rename to helm/cluster_setup/templates/log-access-cluster-role-binding.yaml
diff --git a/k8s/log-access-cluster-role.yaml b/helm/cluster_setup/templates/log-access-cluster-role.yaml
similarity index 100%
rename from k8s/log-access-cluster-role.yaml
rename to helm/cluster_setup/templates/log-access-cluster-role.yaml
diff --git a/k8s/shell-access-cluster-role-binding.yaml b/helm/cluster_setup/templates/shell-access-cluster-role-binding.yaml
similarity index 100%
rename from k8s/shell-access-cluster-role-binding.yaml
rename to helm/cluster_setup/templates/shell-access-cluster-role-binding.yaml
diff --git a/k8s/shell-access-cluster-role.yaml b/helm/cluster_setup/templates/shell-access-cluster-role.yaml
similarity index 100%
rename from k8s/shell-access-cluster-role.yaml
rename to helm/cluster_setup/templates/shell-access-cluster-role.yaml
diff --git a/helm/cluster_setup/values.yaml b/helm/cluster_setup/values.yaml
new file mode 100644
index 0000000..fd81778
--- /dev/null
+++ b/helm/cluster_setup/values.yaml
@@ -0,0 +1 @@
+email: admin@2martens.de
\ No newline at end of file