diff --git a/template/edfbuilder.yaml b/template/edfbuilder.yaml
index 6afc8c2..563ea88 100644
--- a/template/edfbuilder.yaml
+++ b/template/edfbuilder.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: registry
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/core.yaml b/template/registry/core.yaml
index aef343d..f082770 100644
--- a/template/registry/core.yaml
+++ b/template/registry/core.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/core
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/local-backup.yaml b/template/registry/local-backup.yaml
index 5540134..6c70853 100644
--- a/template/registry/local-backup.yaml
+++ b/template/registry/local-backup.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/local-backup
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/monitoring.yaml b/template/registry/monitoring.yaml
index 88b1af3..eecdb23 100644
--- a/template/registry/monitoring.yaml
+++ b/template/registry/monitoring.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/monitoring
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/ref-implementation.yaml b/template/registry/ref-implementation.yaml
index 82bbeaf..b837d39 100644
--- a/template/registry/ref-implementation.yaml
+++ b/template/registry/ref-implementation.yaml
@@ -13,7 +13,7 @@ spec:
     namespace: argocd
   source:
     path: stacks/ref-implementation
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
+    repoURL: "https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}"
     targetRevision: HEAD
   project: default
   syncPolicy:
diff --git a/template/registry/second-cluster.yaml b/template/registry/second-cluster.yaml
deleted file mode 100644
index 6ff1357..0000000
--- a/template/registry/second-cluster.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: second-cluster
-  namespace: argocd
-  labels:
-    env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  destination:
-    name: in-cluster
-    namespace: argocd
-  source:
-    path: stacks/second-cluster
-    repoURL: 'https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder'
-    targetRevision: HEAD
-  project: default
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
diff --git a/template/stacks/core/argocd-sso.yaml b/template/stacks/core/argocd-sso.yaml
index 7ae15bc..4c840fd 100644
--- a/template/stacks/core/argocd-sso.yaml
+++ b/template/stacks/core/argocd-sso.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/core/argocd-sso"
   destination:
@@ -26,4 +26,4 @@ spec:
       backoff:
         duration: 15s
         factor: 1
-        maxDuration: 15s
\ No newline at end of file
+        maxDuration: 15s
diff --git a/template/stacks/core/argocd.yaml b/template/stacks/core/argocd.yaml
index 201951f..20d4038 100644
--- a/template/stacks/core/argocd.yaml
+++ b/template/stacks/core/argocd.yaml
@@ -25,6 +25,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/argocd/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/core/forgejo-runner.yaml b/template/stacks/core/forgejo-runner.yaml
index edff667..860bc43 100644
--- a/template/stacks/core/forgejo-runner.yaml
+++ b/template/stacks/core/forgejo-runner.yaml
@@ -17,6 +17,6 @@ spec:
   destination:
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/core/forgejo-runner"
diff --git a/template/stacks/core/forgejo-sso.yaml b/template/stacks/core/forgejo-sso.yaml
index 6402b41..7b25906 100644
--- a/template/stacks/core/forgejo-sso.yaml
+++ b/template/stacks/core/forgejo-sso.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/core/forgejo-sso"
   destination:
@@ -26,4 +26,4 @@ spec:
       backoff:
         duration: 15s
         factor: 1
-        maxDuration: 15s
\ No newline at end of file
+        maxDuration: 15s
diff --git a/template/stacks/core/forgejo.yaml b/template/stacks/core/forgejo.yaml
index a89d576..965bb4a 100644
--- a/template/stacks/core/forgejo.yaml
+++ b/template/stacks/core/forgejo.yaml
@@ -22,6 +22,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/forgejo/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/core/ingress-apps.yaml b/template/stacks/core/ingress-apps.yaml
index ec156c5..3c8136d 100644
--- a/template/stacks/core/ingress-apps.yaml
+++ b/template/stacks/core/ingress-apps.yaml
@@ -11,7 +11,7 @@ spec:
   destination:
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/core/ingress-apps"
   project: default
diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/core/ingress-nginx.yaml
index 2517368..8a5575b 100644
--- a/template/stacks/core/ingress-nginx.yaml
+++ b/template/stacks/core/ingress-nginx.yaml
@@ -22,6 +22,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/core/ingress-nginx/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/local-backup/minio.yaml b/template/stacks/local-backup/minio.yaml
index 7de20cd..da749f4 100644
--- a/template/stacks/local-backup/minio.yaml
+++ b/template/stacks/local-backup/minio.yaml
@@ -10,17 +10,17 @@ metadata:
 spec:
   project: default
   sources:
-    - repoURL: 'https://charts.min.io'
+    - repoURL: "https://charts.min.io"
       targetRevision: 5.0.15
       helm:
         releaseName: minio
         valueFiles:
           - $values/stacks/local-backup/minio/helm/values.yaml
       chart: minio
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       path: "stacks/local-backup/minio/manifests"
   destination:
diff --git a/template/stacks/local-backup/velero.yaml b/template/stacks/local-backup/velero.yaml
index e668cf6..9e8a851 100644
--- a/template/stacks/local-backup/velero.yaml
+++ b/template/stacks/local-backup/velero.yaml
@@ -10,14 +10,14 @@ metadata:
 spec:
   project: default
   sources:
-    - repoURL: 'https://vmware-tanzu.github.io/helm-charts'
+    - repoURL: "https://vmware-tanzu.github.io/helm-charts"
       targetRevision: 8.0.0
       helm:
         releaseName: velero
         valueFiles:
           - $values/stacks/local-backup/velero/helm/values.yaml
       chart: velero
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
   destination:
diff --git a/template/stacks/monitoring/grafana-dashboards.yaml b/template/stacks/monitoring/grafana-dashboards.yaml
index 186f692..2044df8 100644
--- a/template/stacks/monitoring/grafana-dashboards.yaml
+++ b/template/stacks/monitoring/grafana-dashboards.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/monitoring/kube-prometheus/dashboards"
   destination:
@@ -22,4 +22,4 @@ spec:
     automated:
       selfHeal: true
     retry:
-      limit: -1
\ No newline at end of file
+      limit: -1
diff --git a/template/stacks/monitoring/kube-prometheus-sso.yaml b/template/stacks/monitoring/kube-prometheus-sso.yaml
index 0e6e43a..6442bf9 100644
--- a/template/stacks/monitoring/kube-prometheus-sso.yaml
+++ b/template/stacks/monitoring/kube-prometheus-sso.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/monitoring/kube-prometheus-sso"
   destination:
diff --git a/template/stacks/monitoring/kube-prometheus.yaml b/template/stacks/monitoring/kube-prometheus.yaml
index 7bcf3ca..fa29b86 100644
--- a/template/stacks/monitoring/kube-prometheus.yaml
+++ b/template/stacks/monitoring/kube-prometheus.yaml
@@ -14,7 +14,7 @@ spec:
       selfHeal: true
     syncOptions:
       - CreateNamespace=true
-      - ServerSideApply=true  # do not copy metdata, since (because of its large size) it can lead to sync failure
+      - ServerSideApply=true # do not copy metdata, since (because of its large size) it can lead to sync failure
     retry:
       limit: -1
       backoff:
@@ -31,6 +31,6 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/monitoring/kube-prometheus/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
diff --git a/template/stacks/monitoring/loki.yaml b/template/stacks/monitoring/loki.yaml
index a2f0238..cc38f26 100644
--- a/template/stacks/monitoring/loki.yaml
+++ b/template/stacks/monitoring/loki.yaml
@@ -19,16 +19,15 @@ spec:
     namespace: monitoring
   sources:
     - repoURL: https://github.com/grafana/helm-charts
-      path:     charts/loki-distributed         
-      targetRevision: HEAD      
+      path: charts/loki-distributed
+      targetRevision: HEAD
       helm:
         valueFiles:
           - $values/stacks/monitoring/loki/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
 
     ## consider using the following version, if it works again
     #- repoURL: https://github.com/grafana/loki
-    #  path: production/helm/loki        
-
+    #  path: production/helm/loki
diff --git a/template/stacks/ref-implementation/argo-workflows.yaml b/template/stacks/ref-implementation/argo-workflows.yaml
index ef23482..f95dba1 100644
--- a/template/stacks/ref-implementation/argo-workflows.yaml
+++ b/template/stacks/ref-implementation/argo-workflows.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/argo-workflows/manifests/dev"
   destination:
diff --git a/template/stacks/ref-implementation/backstage-templates.yaml b/template/stacks/ref-implementation/backstage-templates.yaml
index 2749418..68dcdbd 100644
--- a/template/stacks/ref-implementation/backstage-templates.yaml
+++ b/template/stacks/ref-implementation/backstage-templates.yaml
@@ -10,11 +10,11 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/backstage-templates/entities"
     directory:
-      exclude: 'catalog-info.yaml'
+      exclude: "catalog-info.yaml"
   destination:
     server: "https://kubernetes.default.svc"
     namespace: backstage
diff --git a/template/stacks/ref-implementation/backstage.yaml b/template/stacks/ref-implementation/backstage.yaml
index 01932dc..c5759f6 100644
--- a/template/stacks/ref-implementation/backstage.yaml
+++ b/template/stacks/ref-implementation/backstage.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/backstage/manifests"
   destination:
diff --git a/template/stacks/ref-implementation/backstage/manifests/install.yaml b/template/stacks/ref-implementation/backstage/manifests/install.yaml
index c86f6fa..e49b0a6 100644
--- a/template/stacks/ref-implementation/backstage/manifests/install.yaml
+++ b/template/stacks/ref-implementation/backstage/manifests/install.yaml
@@ -167,7 +167,7 @@ data:
       locations:
         # Examples from a public GitHub repository.
         - type: url
-          target: https://{{{ .Env.DOMAIN_GITEA }}}:443/giteaAdmin/edfbuilder/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
+          target: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}:443/{{{ .Env.CLIENT_REPO_ORG_NAME }}}/raw/branch/main/stacks/ref-implementation/backstage-templates/entities/catalog-info.yaml
           rules:
             - allow: [Component, System, API, Resource, Location, Template, User, Group]
     kubernetes:
diff --git a/template/stacks/ref-implementation/external-secrets.yaml b/template/stacks/ref-implementation/external-secrets.yaml
index 37e8004..8ecf800 100644
--- a/template/stacks/ref-implementation/external-secrets.yaml
+++ b/template/stacks/ref-implementation/external-secrets.yaml
@@ -12,7 +12,7 @@ spec:
     namespace: external-secrets
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/external-secrets/manifests"
   project: default
diff --git a/template/stacks/ref-implementation/fibonacci-app.yaml b/template/stacks/ref-implementation/fibonacci-app.yaml
index 91b7b2f..acdfefe 100644
--- a/template/stacks/ref-implementation/fibonacci-app.yaml
+++ b/template/stacks/ref-implementation/fibonacci-app.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/fibonacci-app"
   destination:
diff --git a/template/stacks/ref-implementation/keycloak.yaml b/template/stacks/ref-implementation/keycloak.yaml
index 93d8db7..91f3ade 100644
--- a/template/stacks/ref-implementation/keycloak.yaml
+++ b/template/stacks/ref-implementation/keycloak.yaml
@@ -12,7 +12,7 @@ spec:
     namespace: keycloak
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/keycloak/manifests"
   project: default
diff --git a/template/stacks/ref-implementation/mailhog.yaml b/template/stacks/ref-implementation/mailhog.yaml
index 6fd77df..f5673dc 100644
--- a/template/stacks/ref-implementation/mailhog.yaml
+++ b/template/stacks/ref-implementation/mailhog.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
     targetRevision: HEAD
     path: "stacks/ref-implementation/mailhog"
   destination:
diff --git a/template/stacks/ref-implementation/openbao.yaml b/template/stacks/ref-implementation/openbao.yaml
index ffc2923..9edfeea 100644
--- a/template/stacks/ref-implementation/openbao.yaml
+++ b/template/stacks/ref-implementation/openbao.yaml
@@ -11,7 +11,7 @@ spec:
   project: default
   syncPolicy:
     automated:
-     selfHeal: false
+      selfHeal: false
     syncOptions:
       - CreateNamespace=true
   destination:
@@ -24,11 +24,11 @@ spec:
       helm:
         valueFiles:
           - $values/stacks/ref-implementation/openbao/values.yaml
-    - repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    - repoURL: https://{{{ .Env.CLIENT_REPO_DOMAIN }}}/{{{ .Env.CLIENT_REPO_ORG_NAME }}}
       targetRevision: HEAD
       ref: values
   ignoreDifferences:
-  - group: admissionregistration.k8s.io
-    kind: MutatingWebhookConfiguration
-    jqPathExpressions:
-    - .webhooks[]?.clientConfig.caBundle
+    - group: admissionregistration.k8s.io
+      kind: MutatingWebhookConfiguration
+      jqPathExpressions:
+        - .webhooks[]?.clientConfig.caBundle
diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
deleted file mode 100644
index 26a70eb..0000000
--- a/template/stacks/second-cluster/create-new-cluster-guestbook.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: create-new-cluster-guestbook
-  namespace: argocd
-  labels:
-    env: dev
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  syncPolicy:
-    automated:
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-  destination:
-    name: in-cluster
-    namespace: crossplane-system
-  source:
-    path: stacks/second-cluster/create-new-cluster-guestbook
-    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
-    targetRevision: HEAD
diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook/argocluster.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook/argocluster.yaml
deleted file mode 100644
index 22aa6be..0000000
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/argocluster.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: cluster.argocd.crossplane.io/v1alpha1
-kind: Cluster
-metadata:
-  name: argo-app-test
-  labels:
-    purpose: dev
-spec:
-  forProvider:
-    config:
-      kubeconfigSecretRef:
-        key: kubeconfig
-        namespace: crossplane-system
-        name: argo-app-test-kubeconf
-    name: argo-app-test-cluster
-  providerConfigRef:
-    name: argocd-provider
diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook/guestbook.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook/guestbook.yaml
deleted file mode 100644
index ed9881c..0000000
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/guestbook.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: argo-second-cluster-demo
-  namespace: argocd
-spec:
-  destination:
-    namespace: guestbook
-    name: argo-app-test-cluster
-  project: default
-  source:
-    path: guestbook
-    repoURL: https://github.com/argoproj/argocd-example-apps.git
-    targetRevision: HEAD
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-    - CreateNamespace=true
-    retry:
-      limit: -1
-      backoff:
-        duration: 5s 
-        factor: 2 
-        maxDuration: 1m
diff --git a/template/stacks/second-cluster/create-new-cluster-guestbook/kindcluster.yaml b/template/stacks/second-cluster/create-new-cluster-guestbook/kindcluster.yaml
deleted file mode 100644
index 3abe324..0000000
--- a/template/stacks/second-cluster/create-new-cluster-guestbook/kindcluster.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: container.kind.crossplane.io/v1alpha1
-kind: KindCluster
-metadata:
-  name: argo-app-test
-spec:
-  forProvider:
-    kindConfig: |
-      kind: Cluster
-      apiVersion: kind.x-k8s.io/v1alpha4
-      nodes:
-      - role: control-plane
-        kubeadmConfigPatches:
-        - |
-          kind: InitConfiguration
-          nodeRegistration:
-            kubeletExtraArgs:
-              node-labels: "ingress-ready=true"
-      # TODO: RIRE used maybe for velero backup
-      #  extraMounts:
-      #    - hostPath: /tmp/backup # replace with your own path
-      #      containerPath: /backup
-  providerConfigRef:
-    name: kind-provider
-  writeConnectionSecretToRef:
-    namespace: crossplane-system
-    name: argo-app-test-kubeconf