diff --git a/infrastructure.yaml b/infrastructure.yaml
index abeffe4..e7deaa1 100644
--- a/infrastructure.yaml
+++ b/infrastructure.yaml
@@ -13,7 +13,7 @@ spec:
     targetRevision: gitops
     helm:
       valueFiles:                                                                                                                                                                                                                                                                         
-      - infrastructure-values.yaml
+      - ../infrastructure-values.yaml
   project: default
   syncPolicy:
     automated:
diff --git a/infrastructure/templates/microcks.yaml b/infrastructure/templates/microcks.yaml
index 35592db..8979ffb 100644
--- a/infrastructure/templates/microcks.yaml
+++ b/infrastructure/templates/microcks.yaml
@@ -4,10 +4,10 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "10"
   name: microcks
-  namespace: {{ projectName | quote }}
+  namespace: {{ .Values.projectName | quote }}
 spec:
   targetNamespaces:
-  - {{ projectName | quote }}
+  - {{ .Values.projectName | quote }}
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -15,7 +15,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "10"
   name: microcks
-  namespace: {{ projectName | quote }}
+  namespace: {{ .Values.projectName | quote }}
 spec:
   channel: stable
   name: microcks
diff --git a/infrastructure/templates/project.yaml b/infrastructure/templates/project.yaml
index 9fa5bc2..d59ca00 100644
--- a/infrastructure/templates/project.yaml
+++ b/infrastructure/templates/project.yaml
@@ -5,8 +5,8 @@ metadata:
     argocd.argoproj.io/sync-wave: "0"
     openshift.io/display-name: "Demo API Management"
   labels:
-    kubernetes.io/metadata.name: {{ projectName | quote }}
-  name: {{ projectName | quote }}
+    kubernetes.io/metadata.name: {{ .Values.projectName | quote }}
+  name: {{ .Values.projectName | quote }}
 spec:
   finalizers:
   - kubernetes
diff --git a/infrastructure/templates/sso.yaml b/infrastructure/templates/sso.yaml
index 2da301b..fde6e0c 100644
--- a/infrastructure/templates/sso.yaml
+++ b/infrastructure/templates/sso.yaml
@@ -4,10 +4,10 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "10"
   name: sso
-  namespace: {{ projectName | quote }}
+  namespace: {{ .Values.projectName | quote }}
 spec:
   targetNamespaces:
-  - {{ projectName | quote }}
+  - {{ .Values.projectName | quote }}
 ---
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -15,7 +15,7 @@ metadata:
   annotations:
     argocd.argoproj.io/sync-wave: "10"
   name: rhsso-operator
-  namespace: {{ projectName | quote }}
+  namespace: {{ .Values.projectName | quote }}
 spec:
   channel: stable
   name: rhsso-operator