diff --git a/.history/ref-implementation/backstage-templates/entities/catalog-info_20241111145551.yaml b/.history/ref-implementation/backstage-templates/entities/catalog-info_20241111145551.yaml
new file mode 100644
index 0000000..f49a7bb
--- /dev/null
+++ b/.history/ref-implementation/backstage-templates/entities/catalog-info_20241111145551.yaml
@@ -0,0 +1,19 @@
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: basic-example-templates
+  description: A collection of example templates
+spec:
+  targets:
+    - ./basic/template.yaml
+    - ./argo-workflows/template.yaml
+    - ./app-with-bucket/template.yaml
+---
+apiVersion: backstage.io/v1alpha1
+kind: Location
+metadata:
+  name: basic-organization
+  description: Basic organization data
+spec:
+  targets:
+    - ./organization/guests.yaml
diff --git a/.history/ref-implementation/openbao_20241111150421.yaml b/.history/ref-implementation/openbao_20241111150421.yaml
new file mode 100644
index 0000000..ecce75a
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241111150421.yaml
@@ -0,0 +1,21 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+  labels:
+    example: dev
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: cnoe://openbao/manifests
+    targetRevision: HEAD
+    path: "."
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241111150423.yaml b/.history/ref-implementation/openbao_20241111150423.yaml
new file mode 100644
index 0000000..8a632d4
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241111150423.yaml
@@ -0,0 +1,21 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+  labels:
+    env: dev
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: cnoe://openbao/manifests
+    targetRevision: HEAD
+    path: "."
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103833.yaml b/.history/ref-implementation/openbao_20241112103833.yaml
new file mode 100644
index 0000000..d06ab5e
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103833.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: cnoe://openbao/manifests
+    targetRevision: HEAD
+    path: "."
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103904.yaml b/.history/ref-implementation/openbao_20241112103904.yaml
new file mode 100644
index 0000000..8bcfa6f
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103904.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: HEAD
+    path: "."
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103909.yaml b/.history/ref-implementation/openbao_20241112103909.yaml
new file mode 100644
index 0000000..997633d
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103909.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: main
+    path: "."
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103930.yaml b/.history/ref-implementation/openbao_20241112103930.yaml
new file mode 100644
index 0000000..8d19f61
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103930.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: main
+    path: "openbao"
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103938.yaml b/.history/ref-implementation/openbao_20241112103938.yaml
new file mode 100644
index 0000000..76b59a3
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103938.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: main
+    path: "openbao"
+
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/.history/ref-implementation/openbao_20241112103940.yaml b/.history/ref-implementation/openbao_20241112103940.yaml
new file mode 100644
index 0000000..8d19f61
--- /dev/null
+++ b/.history/ref-implementation/openbao_20241112103940.yaml
@@ -0,0 +1,19 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: openbao
+  namespace: argocd
+spec:
+  destination:
+    namespace: openbao
+    server: "https://kubernetes.default.svc"
+  source:
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: main
+    path: "openbao"
+  project: default
+  syncPolicy:
+    automated:
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
diff --git a/ref-implementation/backstage-templates/entities/basic/template2.yaml b/ref-implementation/backstage-templates/entities/basic/template2.yaml
deleted file mode 100644
index f75743b..0000000
--- a/ref-implementation/backstage-templates/entities/basic/template2.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-apiVersion: scaffolder.backstage.io/v1beta3
-kind: Template
-metadata:
-  description: Creates a Basic Kubernetes Deployment
-  name: basic
-  title: Create a Basic Deployment
-spec:
-  owner: guests
-  type: service
-  parameters:
-    - title: Configuration Options
-      required:
-        - name
-      properties:
-        name:
-          type: string
-          description: name of this application
-        
-  steps:
-    - id: template
-      name: Generating component
-      action: fetch:template
-      input:
-        url: ./skeleton
-        values:
-          name: ${{parameters.name}}
-
-    - id: publish
-      name: Publishing to a gitea git repository
-      action: publish:gitea
-      input:
-        description: This is an example app
-        # Hard coded value for this demo purposes only.
-        repoUrl: cnoe.localtest.me:8443/gitea?repo=${{parameters.name}}
-        defaultBranch: main
-    - id: create-argocd-app
-      name: Create ArgoCD App
-      action: cnoe:create-argocd-app
-      input:
-        appName: ${{parameters.name}}
-        appNamespace: ${{parameters.name}}
-        argoInstance: in-cluster
-        projectName: default
-        # necessary until we generate our own cert
-        repoUrl: https://cnoe.localtest.me:8443/gitea/giteaAdmin/${{parameters.name}}
-        path: "manifests"
-    - id: register
-      name: Register
-      action: catalog:register
-      input:
-        repoContentsUrl: ${{ steps['publish'].output.repoContentsUrl }}
-        catalogInfoPath: 'catalog-info.yaml'
-
-  output:
-    links:
-      - title: Open in catalog
-        icon: catalog
-        entityRef: ${{ steps['register'].output.entityRef }}
diff --git a/ref-implementation/backstage-templates/entities/catalog-info.yaml b/ref-implementation/backstage-templates/entities/catalog-info.yaml
index 3bf5a42..f49a7bb 100644
--- a/ref-implementation/backstage-templates/entities/catalog-info.yaml
+++ b/ref-implementation/backstage-templates/entities/catalog-info.yaml
@@ -6,7 +6,6 @@ metadata:
 spec:
   targets:
     - ./basic/template.yaml
-    - ./basic/template2.yaml
     - ./argo-workflows/template.yaml
     - ./app-with-bucket/template.yaml
 ---
diff --git a/ref-implementation/openbao.yaml b/ref-implementation/openbao.yaml
index 8a632d4..8d19f61 100644
--- a/ref-implementation/openbao.yaml
+++ b/ref-implementation/openbao.yaml
@@ -3,16 +3,14 @@ kind: Application
 metadata:
   name: openbao
   namespace: argocd
-  labels:
-    env: dev
 spec:
   destination:
     namespace: openbao
     server: "https://kubernetes.default.svc"
   source:
-    repoURL: cnoe://openbao/manifests
-    targetRevision: HEAD
-    path: "."
+    repoURL: 'https://github.com/openbao/openbao.git'
+    targetRevision: main
+    path: "openbao"
   project: default
   syncPolicy:
     automated: