diff --git a/chart/templates/clusterrolebinding.yaml b/chart/templates/clusterrolebinding.yaml
index ea5d3164e9cefe4923a9b46789f07e1d98106b39..95707a1b3ac9bee9ec5b9b9c7e0f28f22ab62002 100644
--- a/chart/templates/clusterrolebinding.yaml
+++ b/chart/templates/clusterrolebinding.yaml
@@ -8,5 +8,5 @@ roleRef:
   name: cluster-admin
 subjects:
   - kind: ServiceAccount
-    name: cloud-controller-manager
-    namespace: kube-system
+    name: {{ include "hcloud-cloud-controller-manager.name" . }}
+    namespace: {{ .Release.Namespace }}
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index d695904a20476549b4411f0a1cecc6ef394c877d..ed8e3907e6b12a6c4b842701a607b2a1b7e7b8de 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -1,8 +1,8 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: hcloud-cloud-controller-manager
-  namespace: kube-system
+  name: {{ include "hcloud-cloud-controller-manager.name" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   replicas: 1
   revisionHistoryLimit: 2
@@ -14,7 +14,7 @@ spec:
       labels:
         {{- include "hcloud-cloud-controller-manager.selectorLabels" . | nindent 8 }}
     spec:
-      serviceAccountName: cloud-controller-manager
+      serviceAccountName: {{ include "hcloud-cloud-controller-manager.name" . }}
       dnsPolicy: Default
       tolerations:
         # Allow HCCM itself to schedule on nodes that have not yet been initialized by HCCM.
diff --git a/chart/templates/podmonitor.yaml b/chart/templates/podmonitor.yaml
index bdc0978328ef48c0a1752a165afb25e7656009a8..198e7436845742f416eedce342124721dfd68c6a 100644
--- a/chart/templates/podmonitor.yaml
+++ b/chart/templates/podmonitor.yaml
@@ -3,7 +3,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: PodMonitor
 metadata:
-  name: hcloud-cloud-controller-manager
+  name: {{ include "hcloud-cloud-controller-manager.name" . }}
+  namespace: {{ .Release.Namespace }}
 spec:
   {{- tpl (toYaml $.Values.monitoring.podMonitor.spec) $ | nindent 2 }}
   selector:
diff --git a/chart/templates/serviceaccount.yaml b/chart/templates/serviceaccount.yaml
index fc31d96f192c0d2d1f818015cc03c808f97c22cd..c92f571fac3f711a21d1d8134061751a3cb4f594 100644
--- a/chart/templates/serviceaccount.yaml
+++ b/chart/templates/serviceaccount.yaml
@@ -1,5 +1,5 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: cloud-controller-manager
-  namespace: kube-system
+  name: {{ include "hcloud-cloud-controller-manager.name" . }}
+  namespace: {{ .Release.Namespace }}
diff --git a/skaffold.yaml b/skaffold.yaml
index a44783951b871557099031d6d0b73a8f4eac4554..f10feed2534b1544871fb4796fb5334f5f4d9b52 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -17,6 +17,7 @@ manifests:
   helm:
     releases:
       - name: hccm
+        namespace: kube-system
         chartPath: chart
         setValues:
           networking.enabled: true