diff --git a/template/stacks/ref-implementation/external-secrets.yaml b/template/stacks/core/external-secrets.yaml
similarity index 88%
rename from template/stacks/ref-implementation/external-secrets.yaml
rename to template/stacks/core/external-secrets.yaml
index 37e8004..b69e3f7 100644
--- a/template/stacks/ref-implementation/external-secrets.yaml
+++ b/template/stacks/core/external-secrets.yaml
@@ -14,7 +14,7 @@ spec:
   source:
     repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
     targetRevision: HEAD
-    path: "stacks/ref-implementation/external-secrets/manifests"
+    path: "stacks/core/external-secrets/manifests"
   project: default
   syncPolicy:
     automated:
diff --git a/template/stacks/ref-implementation/external-secrets/generate-manifests.sh b/template/stacks/core/external-secrets/generate-manifests.sh
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/generate-manifests.sh
rename to template/stacks/core/external-secrets/generate-manifests.sh
diff --git a/template/stacks/ref-implementation/external-secrets/manifests/install.yaml b/template/stacks/core/external-secrets/manifests/install.yaml
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/manifests/install.yaml
rename to template/stacks/core/external-secrets/manifests/install.yaml
diff --git a/template/stacks/ref-implementation/external-secrets/values.yaml b/template/stacks/core/external-secrets/values.yaml
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/values.yaml
rename to template/stacks/core/external-secrets/values.yaml
diff --git a/template/stacks/ref-implementation/keycloak.yaml b/template/stacks/core/keycloak.yaml
similarity index 84%
rename from template/stacks/ref-implementation/keycloak.yaml
rename to template/stacks/core/keycloak.yaml
index 93d8db7..6045086 100644
--- a/template/stacks/ref-implementation/keycloak.yaml
+++ b/template/stacks/core/keycloak.yaml
@@ -4,7 +4,7 @@ metadata:
   name: keycloak
   namespace: argocd
   labels:
-    example: ref-implementation
+    example: core
   finalizers:
     - resources-finalizer.argocd.argoproj.io
 spec:
@@ -14,7 +14,7 @@ spec:
   source:
     repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
     targetRevision: HEAD
-    path: "stacks/ref-implementation/keycloak/manifests"
+    path: "stacks/core/keycloak/manifests"
   project: default
   syncPolicy:
     automated:
diff --git a/template/stacks/ref-implementation/keycloak/manifests/install.yaml b/template/stacks/core/keycloak/manifests/install.yaml
similarity index 100%
rename from template/stacks/ref-implementation/keycloak/manifests/install.yaml
rename to template/stacks/core/keycloak/manifests/install.yaml
diff --git a/template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml b/template/stacks/core/keycloak/manifests/keycloak-config.yaml
similarity index 100%
rename from template/stacks/ref-implementation/keycloak/manifests/keycloak-config.yaml
rename to template/stacks/core/keycloak/manifests/keycloak-config.yaml
diff --git a/template/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml b/template/stacks/core/keycloak/manifests/secret-gen.yaml
similarity index 100%
rename from template/stacks/ref-implementation/keycloak/manifests/secret-gen.yaml
rename to template/stacks/core/keycloak/manifests/secret-gen.yaml
diff --git a/template/stacks/ref-implementation/external-secrets-openbao.yaml b/template/stacks/ref-implementation/external-secrets-openbao.yaml
new file mode 100644
index 0000000..1545b06
--- /dev/null
+++ b/template/stacks/ref-implementation/external-secrets-openbao.yaml
@@ -0,0 +1,23 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: external-secrets-openbao
+  namespace: argocd
+  labels:
+    env: dev
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  destination:
+    namespace: external-secrets
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: https://{{{ .Env.DOMAIN_GITEA }}}/giteaAdmin/edfbuilder
+    targetRevision: HEAD
+    path: "stacks/ref-implementation/external-secrets-openbao/manifests"
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/template/stacks/ref-implementation/external-secrets/manifests/role.yaml b/template/stacks/ref-implementation/external-secrets-openbao/manifests/role.yaml
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/manifests/role.yaml
rename to template/stacks/ref-implementation/external-secrets-openbao/manifests/role.yaml
diff --git a/template/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml b/template/stacks/ref-implementation/external-secrets-openbao/manifests/rolebinding.yaml
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/manifests/rolebinding.yaml
rename to template/stacks/ref-implementation/external-secrets-openbao/manifests/rolebinding.yaml
diff --git a/template/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml b/template/stacks/ref-implementation/external-secrets-openbao/manifests/secret-store.yaml
similarity index 100%
rename from template/stacks/ref-implementation/external-secrets/manifests/secret-store.yaml
rename to template/stacks/ref-implementation/external-secrets-openbao/manifests/secret-store.yaml