diff --git a/app-of-apps/application-dev.yaml b/app-of-apps/application-dev.yaml
new file mode 100644
index 0000000..ac0ebad
--- /dev/null
+++ b/app-of-apps/application-dev.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: test-jan22-app
+  namespace: ai-rhdh
+  finalizers: ["resources-finalizer.argocd.argoproj.io"] 
+spec:
+  project: default
+  source:
+    path: ./components/test-jan22/overlays/development
+    repoURL: https://github.com/jdubrick-ai/test-jan22-gitops.git
+    targetRevision: main
+  destination:
+    namespace: rhdh-app
+    server: https://kubernetes.default.svc
+  syncPolicy:
+    managedNamespaceMetadata:
+      labels: 
+        argocd.argoproj.io/managed-by: ai-rhdh
+    automated: 
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - PruneLast=true
diff --git a/app-of-apps/kustomization.yaml b/app-of-apps/kustomization.yaml
new file mode 100644
index 0000000..3c7144e
--- /dev/null
+++ b/app-of-apps/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:         
+  rhtap/gitops: test-jan22 
+  janus-idp.io/tekton: test-jan22
+  backstage.io/kubernetes-id: test-jan22
+  backstage.io/kubernetes-namespace: rhdh-app 
+  app.kubernetes.io/part-of: test-jan22
+resources: 
+- application-dev.yaml
\ No newline at end of file
diff --git a/application.yaml b/application.yaml
new file mode 100644
index 0000000..ce8b80f
--- /dev/null
+++ b/application.yaml
@@ -0,0 +1,25 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: test-jan22
+  namespace: ai-rhdh
+  finalizers: ["resources-finalizer.argocd.argoproj.io"] 
+spec:
+  project: default
+  source:
+    path: ./app-of-apps
+    repoURL: https://github.com/jdubrick-ai/test-jan22-gitops.git
+    targetRevision: main
+  destination:
+    namespace: rhdh-app
+    server: https://kubernetes.default.svc
+  syncPolicy:
+    managedNamespaceMetadata:
+      labels: 
+        argocd.argoproj.io/managed-by: ai-rhdh
+    automated: 
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+      - PruneLast=true
diff --git a/catalog-info.yaml b/catalog-info.yaml
new file mode 100644
index 0000000..e5cd243
--- /dev/null
+++ b/catalog-info.yaml
@@ -0,0 +1,22 @@
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: test-jan22-gitops
+  description: This is GitOps manifest for test-jan22   
+  links:
+    - url: https://www.redhat.com/en/solutions/trusted-software-supply-chain
+      title: Trusted Secure Supply Chain 
+      icon: dashboard
+      type: admin-dashboard
+  annotations:
+    # ArgoCD apps from this template used rhtap-gitops as the grouping
+    argocd/app-selector: rhtap/gitops=test-jan22
+    janus-idp.io/tekton: test-jan22 
+    backstage.io/kubernetes-id: test-jan22 
+    backstage.io/techdocs-ref: dir:. 
+spec:
+  type: gitops
+  owner: user:guest 
+  lifecycle: experimental
+  dependsOn:
+    - component:test-jan22  
diff --git a/components/test-jan22/base/database-config.yaml b/components/test-jan22/base/database-config.yaml
new file mode 100644
index 0000000..429abd0
--- /dev/null
+++ b/components/test-jan22/base/database-config.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-jan22-database-config
+data:
+  VECTORDB_HOST: "test-jan22-database"
+  VECTORDB_PORT: ""
diff --git a/components/test-jan22/base/deployment-database.yaml b/components/test-jan22/base/deployment-database.yaml
new file mode 100644
index 0000000..bf98fa0
--- /dev/null
+++ b/components/test-jan22/base/deployment-database.yaml
@@ -0,0 +1,38 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels: 
+    app.kubernetes.io/instance: test-jan22-database
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22-database
+    app.kubernetes.io/part-of: test-jan22  
+  name: test-jan22-database
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance: test-jan22-database
+  template:
+    metadata: 
+      labels:
+        app.kubernetes.io/instance: test-jan22-database
+    spec:
+      containers:
+      - image: 
+        name: database
+        args: [
+            "--workers",
+            "1", 
+            "--host", 
+            "0.0.0.0",
+            "--port",
+            "",
+            "--proxy-headers", 
+            "--log-config", 
+            "chromadb/log_config.yml", 
+            "--timeout-keep-alive", 
+            "30"]
+        ports:
+        - containerPort: 
+        securityContext:
+          runAsNonRoot: true
diff --git a/components/test-jan22/base/deployment-model-server.yaml b/components/test-jan22/base/deployment-model-server.yaml
new file mode 100644
index 0000000..07f2480
--- /dev/null
+++ b/components/test-jan22/base/deployment-model-server.yaml
@@ -0,0 +1,48 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  labels: 
+    app.kubernetes.io/instance: test-jan22-model-server
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name:  test-jan22-model-server
+    app.kubernetes.io/part-of: test-jan22  
+  name: test-jan22-model-server
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance:  test-jan22-model-server 
+  template:
+    metadata: 
+      labels:
+        app.kubernetes.io/instance:  test-jan22-model-server
+    spec:
+      initContainers:
+      - name: model-file
+        image: quay.io/redhat-ai-dev/mistral-7b-code-16k-qlora:latest
+        command: ['/usr/bin/install', '/model/model.file', '/shared/']
+        volumeMounts:
+        - name: model-file
+          mountPath: /shared
+      containers:
+      - env:
+        - name: HOST
+          value: "0.0.0.0"
+        - name: PORT
+          value: "8001"
+        - name: MODEL_PATH
+          value: /model/model.file
+        - name: CHAT_FORMAT
+          value: openchat
+        image: quay.io/ai-lab/llamacpp_python:latest
+        volumeMounts:
+        - name: model-file
+          mountPath: /model
+        name: app-model-service
+        ports:
+        - containerPort: 8001
+        securityContext:
+          runAsNonRoot: true
+      volumes:
+      - name: model-file
+        emptyDir: {}
diff --git a/components/test-jan22/base/deployment.yaml b/components/test-jan22/base/deployment.yaml
new file mode 100644
index 0000000..f25a42d
--- /dev/null
+++ b/components/test-jan22/base/deployment.yaml
@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  annotations:  
+    tad.gitops.set/image: ".spec.template.spec.containers[0].image"
+    tad.gitops.get/image: ".spec.template.spec.containers[0].image"
+    tad.gitops.set/replicas: ".spec.replicas"
+    tad.gitops.get/replicas: ".spec.replicas" 
+  labels: 
+    app.kubernetes.io/instance: test-jan22
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name:  test-jan22
+    app.kubernetes.io/part-of: test-jan22  
+  name: test-jan22
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/instance:  test-jan22 
+  template:
+    metadata: 
+      labels:
+        app.kubernetes.io/instance:  test-jan22
+    spec:
+      containers:
+      - image:  quay.io/redhat-ai-dev/ai-template-bootstrap-app:latest
+        name: app-inference
+        envFrom:
+        - configMapRef:
+            name: test-jan22-model-config
+        ports:
+        - containerPort: 8501
+        securityContext:
+          runAsNonRoot: true
diff --git a/components/test-jan22/base/initialize-namespace.yaml b/components/test-jan22/base/initialize-namespace.yaml
new file mode 100644
index 0000000..0e55871
--- /dev/null
+++ b/components/test-jan22/base/initialize-namespace.yaml
@@ -0,0 +1,42 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: initialize-namespace-test-jan22-gitops
+spec:  
+  template:         
+    metadata:
+      name: initialize-namespace-test-jan22-gitops
+    spec:  
+      serviceAccountName: pipeline
+      containers:
+      - name: initialize-namespace
+        image: quay.io/redhat-ai-dev/utils:latest
+        command:
+        - /bin/bash
+        - -c
+        - |
+          NS=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace) 
+          echo "Initialize RHDH Namespace: $NS"  
+          cat <<CONFIGURE_PIPELINE | oc create -f - 
+          apiVersion: tekton.dev/v1
+          kind: PipelineRun
+          metadata:
+            generateName: dev-namespace-setup-
+            namespace: $NS 
+          spec:
+            pipelineSpec:
+              tasks:
+                - name: configure-namespace
+                  taskRef:
+                    kind: Task
+                    params:
+                      - name: kind
+                        value: task
+                      - name: name
+                        value: dev-namespace-setup
+                      - name: namespace
+                        value: ai-rhdh
+                    resolver: cluster 
+          CONFIGURE_PIPELINE
+          
+      restartPolicy: Never
\ No newline at end of file
diff --git a/components/test-jan22/base/kustomization.yaml b/components/test-jan22/base/kustomization.yaml
new file mode 100644
index 0000000..944899e
--- /dev/null
+++ b/components/test-jan22/base/kustomization.yaml
@@ -0,0 +1,16 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonLabels:         
+  argocd/app-name: test-jan22
+  janus-idp.io/tekton: test-jan22
+  backstage.io/kubernetes-id: test-jan22
+  backstage.io/kubernetes-namespace: rhdh-app 
+  app.kubernetes.io/part-of: test-jan22
+resources: 
+- initialize-namespace.yaml
+- deployment-model-server.yaml
+- service-model-server.yaml
+- deployment.yaml
+- route.yaml
+- service.yaml
+- model-config.yaml
diff --git a/components/test-jan22/base/model-config.yaml b/components/test-jan22/base/model-config.yaml
new file mode 100644
index 0000000..cfe2e5f
--- /dev/null
+++ b/components/test-jan22/base/model-config.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: test-jan22-model-config
+data:
+  MODEL_ENDPOINT: "http://test-jan22-model-server:8001"
\ No newline at end of file
diff --git a/components/test-jan22/base/pvc.yaml b/components/test-jan22/base/pvc.yaml
new file mode 100644
index 0000000..2135d89
--- /dev/null
+++ b/components/test-jan22/base/pvc.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  labels: 
+    app.kubernetes.io/instance: test-jan22
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22 
+  name: test-jan22
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  resources:
+    requests:
+      storage: 100Gi
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/create-imagestream.yaml b/components/test-jan22/base/rhoai/create-imagestream.yaml
new file mode 100644
index 0000000..78751be
--- /dev/null
+++ b/components/test-jan22/base/rhoai/create-imagestream.yaml
@@ -0,0 +1,54 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: create-imagestream-test-jan22-gitops
+spec:  
+  template:         
+    metadata:
+      name: create-imagestream-test-jan22-gitops
+    spec:  
+      serviceAccountName: test-jan22-dsp-job
+      containers:
+      - name: create-imagestream
+        image: quay.io/redhat-ai-dev/utils:latest
+
+        command:
+        - /bin/bash
+        - -c
+        - |
+          # Check for image stream and create it not present
+          echo "Checking if the image stream exist"
+          if ! oc get is custom-sqlite3-odh-minimal-notebook-container -n redhat-ods-applications >/dev/null 2>&1 ; then
+            echo "The image stream does not exist, a new image stream will be created"
+            cat <<EOF | oc apply -f -
+            kind: ImageStream
+            apiVersion: image.openshift.io/v1
+            metadata:
+              annotations:
+                opendatahub.io/notebook-image-name: custom-sqlite3-odh-minimal-notebook-container
+                opendatahub.io/notebook-image-url: 'quay.io/redhat-ai-dev/odh-minimal-notebook-container:v2-2024a-20240523-sqlite3'
+              name: custom-sqlite3-odh-minimal-notebook-container
+              namespace: redhat-ods-applications
+              labels:
+                opendatahub.io/dashboard: 'true'
+                opendatahub.io/notebook-image: 'true'
+            spec:
+              lookupPolicy:
+                local: true
+              tags:
+                - name: v2-2024a-20240523-sqlite3
+                  annotations:
+                    openshift.io/imported-from: 'quay.io/redhat-ai-dev/odh-minimal-notebook-container:v2-2024a-20240523-sqlite3'
+                  from:
+                    kind: DockerImage
+                    name: 'quay.io/redhat-ai-dev/odh-minimal-notebook-container:v2-2024a-20240523-sqlite3'
+                  generation: 2
+                  importPolicy:
+                    importMode: Legacy
+                  referencePolicy:
+                    type: Source
+          EOF
+          else
+            echo "Image stream is already present, skipping create"
+          fi
+      restartPolicy: Never
diff --git a/components/test-jan22/base/rhoai/dsp-clone-job.yaml b/components/test-jan22/base/rhoai/dsp-clone-job.yaml
new file mode 100644
index 0000000..85fc7c0
--- /dev/null
+++ b/components/test-jan22/base/rhoai/dsp-clone-job.yaml
@@ -0,0 +1,21 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: dsp-clone-job-test-jan22-gitops
+spec:  
+  template:         
+    metadata:
+      name: dsp-clone-job-test-jan22-gitops
+    spec:  
+      serviceAccountName: test-jan22-dsp-job
+      containers:
+      - name: initialize-dsp
+        image: quay.io/redhat-ai-dev/utils:latest
+        command:
+        - /bin/bash
+        - -c
+        - |
+          NS=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+          oc wait -l statefulset=test-jan22-notebook --for=condition=ready pod --timeout=300s
+          oc exec  StatefulSet/test-jan22-notebook -- git clone https://github.com/jdubrick-ai/test-jan22
+      restartPolicy: Never
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/dsp-job-rb.yaml b/components/test-jan22/base/rhoai/dsp-job-rb.yaml
new file mode 100644
index 0000000..5e98ebe
--- /dev/null
+++ b/components/test-jan22/base/rhoai/dsp-job-rb.yaml
@@ -0,0 +1,12 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: test-jan22-dsp-job-rolebinding
+subjects:
+  - kind: ServiceAccount
+    name: test-jan22-dsp-job
+    namespace: rhdh-app
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: test-jan22-dsp-job-role
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/dsp-job-role.yaml b/components/test-jan22/base/rhoai/dsp-job-role.yaml
new file mode 100644
index 0000000..bd39d28
--- /dev/null
+++ b/components/test-jan22/base/rhoai/dsp-job-role.yaml
@@ -0,0 +1,80 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: test-jan22-dsp-job-role
+  annotations:
+rules:
+  - verbs:
+      - get
+      - list
+      - watch
+      - patch
+      - update
+    apiGroups:
+      - ""
+    resources:
+      - namespaces
+  # The following roles are needed to ensure the dsp clone job can execute commands in the RHOAI workbench
+  - verbs:
+      - get
+      - list
+      - watch
+    apiGroups:
+      - "apps"
+    resources:
+      - statefulsets
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list"]
+  - apiGroups: [""]
+    resources: ["pods/exec"]
+    verbs: ["get", "create"]
+  # The following roles ensure that the DSP job can set ownerreferences on notebook CRs
+  - verbs:
+      - get
+      - list
+      - watch
+      - delete
+      - update
+      - patch
+      - create
+    apiGroups:
+      - "kubeflow.org"
+    resources:
+      - notebooks
+  - verbs:
+      - get
+      - list
+      - delete
+      - create
+      - watch
+      - update
+      - patch
+    apiGroups:
+      - ""
+    resources:
+      - serviceaccounts
+  - verbs:
+      - get
+      - create
+      - list
+      - delete
+      - update
+      - watch
+      - patch
+    apiGroups:
+      - ""
+    resources:
+      - persistentvolumeclaims
+  - verbs:
+      - get
+      - create
+      - list
+      - delete
+      - update
+      - watch
+      - patch
+    apiGroups:
+      - "batch"
+    resources:
+      - jobs
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/dsp-job-sa.yaml b/components/test-jan22/base/rhoai/dsp-job-sa.yaml
new file mode 100644
index 0000000..28508d7
--- /dev/null
+++ b/components/test-jan22/base/rhoai/dsp-job-sa.yaml
@@ -0,0 +1,4 @@
+kind: ServiceAccount
+apiVersion: v1
+metadata:
+  name: test-jan22-dsp-job
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/imagestream-job-rb.yaml b/components/test-jan22/base/rhoai/imagestream-job-rb.yaml
new file mode 100644
index 0000000..9c3ce1f
--- /dev/null
+++ b/components/test-jan22/base/rhoai/imagestream-job-rb.yaml
@@ -0,0 +1,13 @@
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: test-jan22-imagestream-job-rolebinding
+  namespace: redhat-ods-applications
+subjects:
+  - kind: ServiceAccount
+    name: test-jan22-dsp-job
+    namespace: rhdh-app
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: test-jan22-imagestream-job-role
diff --git a/components/test-jan22/base/rhoai/imagestream-job-role.yaml b/components/test-jan22/base/rhoai/imagestream-job-role.yaml
new file mode 100644
index 0000000..78cff1d
--- /dev/null
+++ b/components/test-jan22/base/rhoai/imagestream-job-role.yaml
@@ -0,0 +1,14 @@
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1
+metadata:
+  name: test-jan22-imagestream-job-role
+  namespace: redhat-ods-applications
+rules:
+  - verbs:
+      - get
+      - create
+      - list
+    apiGroups:
+      - "image.openshift.io"
+    resources:
+      - imagestreams
diff --git a/components/test-jan22/base/rhoai/initialize-dsp.yaml b/components/test-jan22/base/rhoai/initialize-dsp.yaml
new file mode 100644
index 0000000..9b05df6
--- /dev/null
+++ b/components/test-jan22/base/rhoai/initialize-dsp.yaml
@@ -0,0 +1,149 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: initialize-dsp-test-jan22-gitops
+spec:  
+  template:         
+    metadata:
+      name: initialize-dsp-test-jan22-gitops
+    spec:  
+      serviceAccountName: test-jan22-dsp-job
+      containers:
+      - name: initialize-dsp
+        image: quay.io/redhat-ai-dev/utils:latest
+
+        command:
+        - /bin/bash
+        - -c
+        - |
+          # Wait for the Image Stream creation job to finish
+          echo "Wait for the Image Stream job"
+          oc wait --for=condition=complete job/create-imagestream-test-jan22-gitops
+          echo "Done"
+          
+          # Wait for the Namespace initialize job to finish
+          echo "Wait for the Namespace job"
+          oc wait --for=condition=complete job/initialize-namespace-test-jan22-gitops
+          echo "Done"
+
+          # Label the namespace as a DataScienceProject
+          NS=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
+          oc label ns $NS opendatahub.io/dashboard=true --overwrite
+
+          # Retrieve the UID for the notebook SA, and mark the notebook as owned by it for garbage collection purposes
+          SA_UID=$(oc get sa test-jan22-dsp-job -o json | jq -r .metadata.uid)
+          echo "$SA_UID"
+          cat <<EOF | oc apply -f -
+          apiVersion: kubeflow.org/v1
+          kind: Notebook
+          metadata:
+            annotations:
+              notebooks.opendatahub.io/inject-oauth: 'true'
+              opendatahub.io/image-display-name: Minimal Python
+              opendatahub.io/accelerator-name: ''
+              openshift.io/description: ''
+              openshift.io/display-name: test-jan22-notebook
+              notebooks.opendatahub.io/last-image-selection: 's2i-minimal-notebook:2024.1'
+              notebooks.opendatahub.io/last-size-selection: Small
+            name: test-jan22-notebook
+            namespace: rhdh-app
+            ownerReferences:
+              - apiVersion: v1
+                kind: ServiceAccount
+                name: test-jan22-dsp-job
+                uid: $SA_UID
+            labels:
+              app: test-jan22-notebook
+              opendatahub.io/dashboard: 'true'
+              opendatahub.io/odh-managed: 'true'
+          spec:
+            template:
+              spec:
+                affinity: {}
+                containers:
+                  - resources:
+                      limits:
+                        cpu: '2'
+                        memory: 8Gi
+                      requests:
+                        cpu: '1'
+                        memory: 8Gi
+                    readinessProbe:
+                      failureThreshold: 3
+                      httpGet:
+                        path: /notebook/rhdh-app/test-jan22-notebook/api
+                        port: notebook-port
+                        scheme: HTTP
+                      initialDelaySeconds: 10
+                      periodSeconds: 5
+                      successThreshold: 1
+                      timeoutSeconds: 1
+                    name: test-jan22-notebook
+                    livenessProbe:
+                      failureThreshold: 3
+                      httpGet:
+                        path: /notebook/rhdh-app/test-jan22-notebook/api
+                        port: notebook-port
+                        scheme: HTTP
+                      initialDelaySeconds: 10
+                      periodSeconds: 5
+                      successThreshold: 1
+                      timeoutSeconds: 1
+                    env:
+                      - name: NOTEBOOK_ARGS
+                        value: |-
+                          --ServerApp.port=8888
+                                            --ServerApp.token=''
+                                            --ServerApp.password=''
+                                            --ServerApp.base_url=/notebook/rhdh-app/test-jan22-notebook
+                                            --ServerApp.quit_button=False
+                      - name: JUPYTER_IMAGE
+                        value: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/custom-sqlite3-odh-minimal-notebook-container:v2-2024a-20240523-sqlite3'
+                    envFrom:
+                    - configMapRef:
+                        name: test-jan22-model-config
+                    ports:
+                      - containerPort: 8888
+                        name: notebook-port
+                        protocol: TCP
+                    imagePullPolicy: Always
+                    volumeMounts:
+                      - mountPath: /opt/app-root/src
+                        name: test-jan22-notebook
+                      - mountPath: /dev/shm
+                        name: shm
+                    image: 'image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/custom-sqlite3-odh-minimal-notebook-container:v2-2024a-20240523-sqlite3'
+                    workingDir: /opt/app-root/src
+                enableServiceLinks: false
+                serviceAccountName: test-jan22-notebook
+                volumes:
+                  - name: test-jan22-notebook
+                    persistentVolumeClaim:
+                      claimName: test-jan22-notebook-rhoai
+                  - emptyDir:
+                      medium: Memory
+                    name: shm
+          ---
+          kind: PersistentVolumeClaim
+          apiVersion: v1
+          metadata:
+            annotations:
+              openshift.io/display-name: test-jan22-notebook-rhoai
+            name: test-jan22-notebook-rhoai
+            ownerReferences:
+              - apiVersion: v1
+                kind: ServiceAccount
+                name: test-jan22-dsp-job
+                uid: $SA_UID
+            labels:
+              opendatahub.io/dashboard: 'true'
+          spec:
+            accessModes:
+              - ReadWriteOnce
+            resources:
+              requests:
+                storage: 20Gi
+            volumeMode: Filesystem
+          EOF
+          
+      restartPolicy: Never
\ No newline at end of file
diff --git a/components/test-jan22/base/rhoai/kustomization.yaml b/components/test-jan22/base/rhoai/kustomization.yaml
new file mode 100644
index 0000000..3762557
--- /dev/null
+++ b/components/test-jan22/base/rhoai/kustomization.yaml
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- dsp-job-role.yaml
+- dsp-job-rb.yaml
+- dsp-job-sa.yaml
+- initialize-dsp.yaml
+- dsp-clone-job.yaml
+- imagestream-job-role.yaml
+- imagestream-job-rb.yaml
+- create-imagestream.yaml
diff --git a/components/test-jan22/base/route.yaml b/components/test-jan22/base/route.yaml
new file mode 100644
index 0000000..29e2de9
--- /dev/null
+++ b/components/test-jan22/base/route.yaml
@@ -0,0 +1,19 @@
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata: 
+  labels: 
+    app.kubernetes.io/instance: test-jan22
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22 
+  name: test-jan22
+spec:
+  port:
+    targetPort: 8501
+  tls:
+    insecureEdgeTerminationPolicy: Redirect
+    termination: edge
+  to:
+    kind: Service
+    name: test-jan22 
+    weight: 100 
+  wildcardPolicy: None
diff --git a/components/test-jan22/base/service-database.yaml b/components/test-jan22/base/service-database.yaml
new file mode 100644
index 0000000..dd1ba1f
--- /dev/null
+++ b/components/test-jan22/base/service-database.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata: 
+  labels: 
+    app.kubernetes.io/instance: test-jan22-database
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22-database 
+  name: test-jan22-database
+spec:
+  ports:
+  - port: 
+    protocol: TCP
+    targetPort: 
+  selector:
+    app.kubernetes.io/instance: test-jan22-database 
diff --git a/components/test-jan22/base/service-model-server.yaml b/components/test-jan22/base/service-model-server.yaml
new file mode 100644
index 0000000..480fd65
--- /dev/null
+++ b/components/test-jan22/base/service-model-server.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata: 
+  labels: 
+    app.kubernetes.io/instance: test-jan22-model-server
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22-model-server
+  name: test-jan22-model-server
+spec:
+  ports:
+  - port: 8001
+    protocol: TCP
+    targetPort: 8001
+  selector:
+    app.kubernetes.io/instance: test-jan22-model-server
diff --git a/components/test-jan22/base/service.yaml b/components/test-jan22/base/service.yaml
new file mode 100644
index 0000000..cfc7d8d
--- /dev/null
+++ b/components/test-jan22/base/service.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata: 
+  labels: 
+    app.kubernetes.io/instance: test-jan22
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: test-jan22 
+  name: test-jan22
+spec:
+  ports:
+  - port: 8501
+    protocol: TCP
+    targetPort: 8501
+  selector:
+    app.kubernetes.io/instance: test-jan22 
diff --git a/components/test-jan22/edit/get/image b/components/test-jan22/edit/get/image
new file mode 100644
index 0000000..26edcf7
--- /dev/null
+++ b/components/test-jan22/edit/get/image
@@ -0,0 +1,16 @@
+
+COMPONENTS_ROOT=$1  
+GETTER='.metadata.annotations.["tad.gitops.get/image"]'
+
+FILES="$COMPONENTS_ROOT/base/deployment.yaml  $COMPONENTS_ROOT/overlays/development/deployment-patch.yaml"
+for file in $FILES 
+do
+    KEY=$(yq "$GETTER" $file)
+    if [  "$KEY" == "null" ]
+    then     
+        echo "$GETTER missing in $file"
+    else   
+        VALUE=$(yq e "$KEY" $file) 
+        echo "$VALUE image in $file"
+    fi
+done
\ No newline at end of file
diff --git a/components/test-jan22/edit/get/replicas b/components/test-jan22/edit/get/replicas
new file mode 100644
index 0000000..bdcd71d
--- /dev/null
+++ b/components/test-jan22/edit/get/replicas
@@ -0,0 +1,16 @@
+
+COMPONENTS_ROOT=$1  
+GETTER='.metadata.annotations.["tad.gitops.get/replicas"]'
+
+FILES="$COMPONENTS_ROOT/base/deployment.yaml  $COMPONENTS_ROOT/overlays/development/deployment-patch.yaml"
+for file in $FILES 
+do
+    KEY=$(yq "$GETTER" $file)
+    if [  "$KEY" == "null" ]
+    then     
+        echo "$GETTER missing in $file"
+    else   
+        VALUE=$(yq e "$KEY" $file) 
+        echo "$VALUE replicas in $file"
+    fi
+done
\ No newline at end of file
diff --git a/components/test-jan22/edit/set/image b/components/test-jan22/edit/set/image
new file mode 100644
index 0000000..e6d6476
--- /dev/null
+++ b/components/test-jan22/edit/set/image
@@ -0,0 +1,17 @@
+
+COMPONENTS_ROOT=$1
+VALUE=${2:-error}   
+SETTER='.metadata.annotations.["tad.gitops.set/image"]'
+
+FILES="$COMPONENTS_ROOT/base/deployment.yaml $COMPONENTS_ROOT/overlays/development/deployment-patch.yaml"
+for file in $FILES 
+do
+    KEY=$(yq "$SETTER" $file)
+    if [  "$KEY" == "null" ]
+    then     
+        echo "$SETTER missing in $file"
+    else  
+        echo "Using $KEY to set image in $file" 
+        yq -i e "$KEY=\"$VALUE\""  $file
+    fi
+done
\ No newline at end of file
diff --git a/components/test-jan22/edit/set/replicas b/components/test-jan22/edit/set/replicas
new file mode 100644
index 0000000..9c73702
--- /dev/null
+++ b/components/test-jan22/edit/set/replicas
@@ -0,0 +1,17 @@
+
+COMPONENTS_ROOT=$1
+VALUE=${2:-error}   
+SETTER='.metadata.annotations.["tad.gitops.set/replicas"]'
+
+FILES="$COMPONENTS_ROOT/base/deployment.yaml  $COMPONENTS_ROOT/overlays/development/deployment-patch.yaml"
+for file in $FILES 
+do
+    KEY=$(yq "$SETTER" $file)
+    if [  "$KEY" == "null" ]
+    then     
+        echo "$SETTER missing in $file"
+    else  
+        echo "Using $KEY to set replicas in $file"
+        yq -i e "$KEY=$VALUE"  $file
+    fi
+done
\ No newline at end of file
diff --git a/components/test-jan22/overlays/development/deployment-patch.yaml b/components/test-jan22/overlays/development/deployment-patch.yaml
new file mode 100644
index 0000000..6b5278d
--- /dev/null
+++ b/components/test-jan22/overlays/development/deployment-patch.yaml
@@ -0,0 +1,16 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:   
+  annotations:  
+    tad.gitops.set/image: ".spec.template.spec.containers[0].image"
+    tad.gitops.get/image: ".spec.template.spec.containers[0].image"
+    tad.gitops.set/replicas: ".spec.replicas"
+    tad.gitops.get/replicas: ".spec.replicas" 
+  name: test-jan22
+spec:
+  replicas: 1 
+  template: 
+    spec:
+      containers:
+      - image: quay.io/redhat-ai-dev/ai-template-bootstrap-app:latest # use pre-built to bootstrap 
+        name: app-inference 
diff --git a/components/test-jan22/overlays/development/gitops-repository.yaml b/components/test-jan22/overlays/development/gitops-repository.yaml
new file mode 100644
index 0000000..92dcd5c
--- /dev/null
+++ b/components/test-jan22/overlays/development/gitops-repository.yaml
@@ -0,0 +1,6 @@
+apiVersion: "pipelinesascode.tekton.dev/v1alpha1"
+kind: Repository
+metadata:
+  name: test-jan22-gitops-repository
+spec:
+  url: https://github.com/jdubrick-ai/test-jan22-gitops
\ No newline at end of file
diff --git a/components/test-jan22/overlays/development/kustomization.yaml b/components/test-jan22/overlays/development/kustomization.yaml
new file mode 100644
index 0000000..fbe304d
--- /dev/null
+++ b/components/test-jan22/overlays/development/kustomization.yaml
@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+patchesStrategicMerge:
+- deployment-patch.yaml
+resources:
+- ../../base 
+- gitops-repository.yaml
+- source-repository.yaml
diff --git a/components/test-jan22/overlays/development/source-repository.yaml b/components/test-jan22/overlays/development/source-repository.yaml
new file mode 100644
index 0000000..0700b11
--- /dev/null
+++ b/components/test-jan22/overlays/development/source-repository.yaml
@@ -0,0 +1,6 @@
+apiVersion: "pipelinesascode.tekton.dev/v1alpha1"
+kind: Repository
+metadata:
+  name: test-jan22-repository
+spec:
+  url: https://github.com/jdubrick-ai/test-jan22
\ No newline at end of file