diff --git a/charts/orchestrator-software-templates-infra/Chart.yaml b/charts/orchestrator-software-templates-infra/Chart.yaml
index 5d02a810..2ade692b 100644
--- a/charts/orchestrator-software-templates-infra/Chart.yaml
+++ b/charts/orchestrator-software-templates-infra/Chart.yaml
@@ -10,7 +10,7 @@ kubeVersion: ">= 1.25.0-0"
 type: application
 sources:
   - https://github.com/redhat-developer/rhdh-software-templates-infrastructure
-version: 0.2.2
+version: 0.2.3
 maintainers:
   - name: Red Hat Developer Hub Team
     url: https://github.com/redhat-developer/rhdh-chart
diff --git a/charts/orchestrator-software-templates-infra/README.md b/charts/orchestrator-software-templates-infra/README.md
index 43467131..f70aad29 100644
--- a/charts/orchestrator-software-templates-infra/README.md
+++ b/charts/orchestrator-software-templates-infra/README.md
@@ -1,7 +1,7 @@
 
 # Orchestrator Software Templates Infra Chart for OpenShift (Community Version)
 
-![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square)
+![Version: 0.2.3](https://img.shields.io/badge/Version-0.2.3-informational?style=flat-square)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A Helm chart to install Openshift GitOps and Openshift Pipelines, which are required operators for installing the Orchestrator Software Templates to be available on RHDH.
diff --git a/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrolebinding.yaml b/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrolebinding.yaml
index dd6b1941..32eb9cfe 100644
--- a/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrolebinding.yaml
+++ b/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-application-controller-clusterrolebinding.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/component: application-controller
     app.kubernetes.io/name: {{ $ns }}-argocd-application-controller
-    app.kubernetes.io/part-of: {{ $.Values.openshiftGitops.namespaces | first }}
+    app.kubernetes.io/part-of: {{ $ns }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "0"
@@ -16,10 +16,10 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: {{ $.Values.openshiftGitops.namespaces | first }}-argocd-application-controller
+  name: {{ $ns }}-argocd-application-controller
 subjects:
 - kind: ServiceAccount
-  name: {{ $.Values.openshiftGitops.name }}-argocd-application-controller
+  name: {{ $ns }}-argocd-application-controller
   namespace: {{ $ns }}
 {{- end }}
 {{- end }}
diff --git a/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-cr.yaml b/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-cr.yaml
index bd282c29..183d22bf 100644
--- a/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-cr.yaml
+++ b/charts/orchestrator-software-templates-infra/templates/openshift-gitops/argocd-cr.yaml
@@ -5,9 +5,9 @@
 apiVersion: argoproj.io/v1beta1
 kind: ArgoCD
 metadata:
-  name: {{ $.Values.openshiftGitops.name }}
+  name: {{ $ns }}
   labels:
-    app: {{ $.Values.openshiftGitops.name }}
+    app: {{ $ns }}
   namespace: {{ $ns }}
   annotations:
     helm.sh/hook: post-install,post-upgrade