diff --git a/installers/helm/osm/templates/certauth_setup/lcm-client-certificate.yaml b/installers/helm/osm/templates/certauth_setup/lcm-client-certificate.yaml
index 9a9646f..a16a805 100644
--- a/installers/helm/osm/templates/certauth_setup/lcm-client-certificate.yaml
+++ b/installers/helm/osm/templates/certauth_setup/lcm-client-certificate.yaml
@@ -19,7 +19,7 @@
 kind: Certificate
 metadata:
   name: lcm-client
-  namespace: osm
+  namespace: {{ .Release.Namespace }}
 spec:
   secretName: lcm-client-cert
   privateKey:
diff --git a/installers/helm/osm/templates/certauth_setup/osm-ca-certificate.yaml b/installers/helm/osm/templates/certauth_setup/osm-ca-certificate.yaml
index 23765df..dc69564 100644
--- a/installers/helm/osm/templates/certauth_setup/osm-ca-certificate.yaml
+++ b/installers/helm/osm/templates/certauth_setup/osm-ca-certificate.yaml
@@ -19,7 +19,7 @@
 kind: Certificate
 metadata:
   name: osm-ca-certificate
-  namespace: osm
+  namespace: {{ .Release.Namespace }}
 spec:
   isCA: true
   commonName: osm
diff --git a/installers/helm/osm/templates/grafana/grafana-clusterrolebinding.yaml b/installers/helm/osm/templates/grafana/grafana-clusterrolebinding.yaml
index a6c2f97..46669bf 100644
--- a/installers/helm/osm/templates/grafana/grafana-clusterrolebinding.yaml
+++ b/installers/helm/osm/templates/grafana/grafana-clusterrolebinding.yaml
@@ -28,5 +28,5 @@
 subjects:
 - kind: ServiceAccount
   name: grafana
-  namespace: osm
+  namespace: {{ .Release.Namespace }}
 {{- end -}}
\ No newline at end of file