diff --git a/apps/README.md b/apps/README.md
index 570f0160..7a09da93 100644
--- a/apps/README.md
+++ b/apps/README.md
@@ -6,6 +6,21 @@ App Helmfile templates.
 
 ## SERVICES
 
+<details><summary>RANCHER</summary>
+
+```bash
+# EXAMPLE APPLY
+export RANCHER_PASSWORD=<REPLACE-ME>
+
+helmfile apply -f \
+git::https://github.com/stuttgart-things/helm.git@apps/apps/homerun-base-stack.yaml.gotmpl \
+--state-values-set issuerName=cluster-issuer-approle \
+--state-values-set domain=demo-infra.sthings-vsphere.labul.sva.de \ --state-values-set bootstrapPassword={{ env "RANCHER_PASSWORD" | default "hall01234R@ncher" }} \
+--state-values-set cacerts=LS0tLS1CRUdJTiBDRV#..
+```
+
+</details>
+
 <details><summary>HOMERUN-BASE-STACK</summary>
 
 ```bash
@@ -16,7 +31,7 @@ export genericPitcherToken=<GENERIC-TOKEN>
 
 helmfile apply -f \
 git::https://github.com/stuttgart-things/helm.git@apps/apps/homerun-base-stack.yaml.gotmpl \
---state-values-set redisStackStorageClass=openebs-hostpath\
+--state-values-set redisStackStorageClass=openebs-hostpath \
 --state-values-set genericPitcherDomain=demo-infra.example.com
 ```
 
diff --git a/apps/rancher.yaml b/apps/rancher.yaml.gotmpl
similarity index 60%
rename from apps/rancher.yaml
rename to apps/rancher.yaml.gotmpl
index a7a1a840..8cab1550 100644
--- a/apps/rancher.yaml
+++ b/apps/rancher.yaml.gotmpl
@@ -1,11 +1,25 @@
 ---
+environments:
+  default:
+    values:
+      - namespace: cattle-system
+      - version: 2.13.0
+      - hostname: rancher-things
+      - domain: example.com
+      - issuerKind: ClusterIssuer
+      - issuerName: vault-approle
+      - cacerts: ""
+      - bootstrapPassword: "Adminpassword!123"
+      - ingressClass: nginx
+      - privateCA: true
+---
 releases:
   - name: rancher-configuration
     disableValidationOnInstall: true
     installed: true
     namespace: {{ .Values.namespace }}
     chart: stuttgart-things/sthings-cluster
-    version: 0.3.10
+    version: 0.3.15
     values:
       - "values/rancher-config.values.yaml.gotmpl"
 
@@ -14,7 +28,7 @@ releases:
     installed: true
     namespace: {{ .Values.namespace }}
     chart: rancher-stable/rancher
-    version: 2.8.3
+    version: {{ .Values.version }}
     needs:
       - cattle-system/rancher-configuration
     values:
@@ -22,7 +36,7 @@ releases:
 
 repositories:
   - name: stuttgart-things
-    url: eu.gcr.io/stuttgart-things
+    url: ghcr.io/stuttgart-things
     oci: true
   - name: rancher-stable
     url: https://releases.rancher.com/server-charts/latest
diff --git a/apps/values/rancher-config.values.yaml.gotmpl b/apps/values/rancher-config.values.yaml.gotmpl
index 6ba05ba9..35b18855 100644
--- a/apps/values/rancher-config.values.yaml.gotmpl
+++ b/apps/values/rancher-config.values.yaml.gotmpl
@@ -11,8 +11,8 @@ customresources:
       dnsNames:
         - {{ .Values.hostname }}.{{ .Values.domain }}
       issuerRef:
-        name: cluster-issuer-approle
-        kind: ClusterIssuer
+        name: {{ .Values.issuerName }}
+        kind: {{ .Values.issuerKind }}
       secretName: {{ .Values.hostname }}-tls
 
 secrets:
diff --git a/apps/values/rancher-things.values.yaml.gotmpl b/apps/values/rancher-things.values.yaml.gotmpl
index c30df0f1..f7bc08cb 100644
--- a/apps/values/rancher-things.values.yaml.gotmpl
+++ b/apps/values/rancher-things.values.yaml.gotmpl
@@ -6,10 +6,11 @@ global:
 
 bootstrapPassword: {{ .Values.bootstrapPassword }}
 hostname: {{ .Values.hostname }}.{{ .Values.domain }}
-privateCA: true
+privateCA: {{ .Values.privateCA }}
+
 ingress:
   enabled: true
-  ingressClassName: nginx
+  ingressClassName: {{ .Values.ingressClass }}
   servicePort: 80
   tls:
     source: secret
diff --git a/cicd/README.md b/cicd/README.md
index 0376b2df..2659bc90 100644
--- a/cicd/README.md
+++ b/cicd/README.md
@@ -64,7 +64,7 @@ helmfile apply -f argocd.yaml # APPLY HELMFILE
 ### ARGOCD w/o VAULT PLUGIN + CERT CREATION OUTSIDE CERT-MANAGER
 
 ```bash
-helmfile apply -f /home/sthings/projects/apps/helm/cicd/argocd.yaml.gotmpl \
+helmfile apply -f git::https://github.com/stuttgart-things/helm.git@cicd/argocd.yaml.gotmpl \
 --state-values-set namespace=argocd \
 --state-values-set issuerName=cluster-issuer-approle \
 --state-values-set issuerKind=clusterIssuer \