diff --git a/installers/cluster/addons/install_cluster_addons.sh b/installers/cluster/addons/install_cluster_addons.sh
index 1bb9162..c1dab5b 100755
--- a/installers/cluster/addons/install_cluster_addons.sh
+++ b/installers/cluster/addons/install_cluster_addons.sh
@@ -88,7 +88,6 @@
     helm repo update
     helm upgrade --install cert-manager --create-namespace --namespace cert-manager jetstack/cert-manager \
         --version ${CERTMANAGER_VERSION} --set installCRDs=true --set prometheus.enabled=false \
-        --set clusterResourceNamespace=osm \
         --set extraArgs="{--enable-certificate-owner-ref=true}"
     [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
 }
diff --git a/installers/helm/osm/templates/certauth_setup/ca-issuer.yaml b/installers/helm/osm/templates/certauth_setup/ca-issuer.yaml
index 59de79f..d2869e6 100644
--- a/installers/helm/osm/templates/certauth_setup/ca-issuer.yaml
+++ b/installers/helm/osm/templates/certauth_setup/ca-issuer.yaml
@@ -16,9 +16,10 @@
 # limitations under the License.
 #######################################################################################
 apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
+kind: Issuer
 metadata:
   name: ca-issuer
+  namespace: {{ .Release.Namespace }}
 spec:
   ca:
     secretName: osm-ca
diff --git a/installers/helm/osm/templates/lcm/lcm-client-certificate.yaml b/installers/helm/osm/templates/lcm/lcm-client-certificate.yaml
index a16a805..9b84b97 100644
--- a/installers/helm/osm/templates/lcm/lcm-client-certificate.yaml
+++ b/installers/helm/osm/templates/lcm/lcm-client-certificate.yaml
@@ -34,6 +34,6 @@
     - "client auth"
   issuerRef:
     name: ca-issuer
-    kind: ClusterIssuer
+    kind: Issuer
     group: cert-manager.io
 {{- end }}