diff --git a/group_vars/k8s-cluster/plain.yml b/group_vars/k8s-cluster/plain.yml
index aa85172..1aa4f7f 100644
--- a/group_vars/k8s-cluster/plain.yml
+++ b/group_vars/k8s-cluster/plain.yml
@@ -11,5 +11,6 @@ filebeat_enabled: false
 helm_enabled: true
 cloud_provider: external
 kube_network_plugin: calico
+kube_proxy_metrics_bind_address: 0.0.0.0:10249
 kubelet_preferred_address_types: InternalIP,ExternalIP,Hostname
 docker_log_opts: "--log-opt max-size=100m --log-opt max-file=5 --log-opt compress=true"
diff --git a/kubernetes.yml b/kubernetes.yml
index c22d080..423b584 100644
--- a/kubernetes.yml
+++ b/kubernetes.yml
@@ -18,7 +18,7 @@
   roles:
     - { role: kubernetes/base }
 # DEV-243 is waiting for hetzner support << Ticket#2021110303010972 RE: Anderes Problem (Server: #15275628) >>
-#    - { role: kubernetes/cloud-controller-manager }
+    - { role: kubernetes/cloud-controller-manager }
     - { role: kubernetes/cert-manager }
     - { role: kubernetes/ingress-controller }
     - { role: kubernetes/apps, tags: prometheus }
diff --git a/roles/kubernetes/apps/defaults/main.yml b/roles/kubernetes/apps/defaults/main.yml
index ed97d53..1934225 100644
--- a/roles/kubernetes/apps/defaults/main.yml
+++ b/roles/kubernetes/apps/defaults/main.yml
@@ -1 +1,11 @@
 ---
+k8s_prometheus_helm__release_values:
+  grafana:
+    adminPassword: "8gsf8073g"
+  kubeControllerManager:
+    service:
+      port: 10257
+      targetPort: 10257
+    serviceMonitor:
+      https: true
+      insecureSkipVerify: true
\ No newline at end of file
diff --git a/roles/kubernetes/apps/tasks/main.yml b/roles/kubernetes/apps/tasks/main.yml
index ef3af20..7ed1506 100644
--- a/roles/kubernetes/apps/tasks/main.yml
+++ b/roles/kubernetes/apps/tasks/main.yml
@@ -4,24 +4,14 @@
 ###   prometheus
 ###   argo-cd
 
-- name: Add prometheus-community chart repo
-  kubernetes.core.helm_repository:
-    name: prometheus-community
-    repo_url: "https://prometheus-community.github.io/helm-charts"
-  when: 
-  - inventory_hostname == groups['kube-master'][0]
-  tags:
-    - prometheus
-
-# TODO
-# https://stackoverflow.com/questions/65806507/how-to-change-kube-proxy-config
-# https://stackoverflow.com/questions/65901186/kube-prometheus-stack-issue-scraping-metrics
 - name: Deploy kube-prometheus-stack inside monitoring namespace
   kubernetes.core.helm:
     name: prometheus
-    chart_ref: prometheus-community/kube-prometheus-stack
-    release_namespace: monitoring
-    create_namespace: true
+    chart_repo_url: "{{ k8s_prometheus_helm__chart_repo_url | default('https://prometheus-community.github.io/helm-charts') }}"
+    chart_ref: "{{ k8s_ingress_helm__chart_ref | default('kube-prometheus-stack') }}"
+    release_namespace: "{{ k8s_prometheus_helm__release_namespace | default('monitoring') }}"
+    create_namespace: yes
+    release_values: "{{ k8s_prometheus_helm__release_values }}"
   when: 
   - inventory_hostname == groups['kube-master'][0]
   tags:
diff --git a/roles/kubernetes/cloud-controller-manager/tasks/main.yml b/roles/kubernetes/cloud-controller-manager/tasks/main.yml
index b2d22c3..1eea2df 100644
--- a/roles/kubernetes/cloud-controller-manager/tasks/main.yml
+++ b/roles/kubernetes/cloud-controller-manager/tasks/main.yml
@@ -41,35 +41,3 @@
   - inventory_hostname == groups['kube-master'][0]
   tags:
     - ccm
-
-- name: Add prometheus-community chart repo
-  kubernetes.core.helm_repository:
-    name: prometheus-community
-    repo_url: "https://prometheus-community.github.io/helm-charts"
-  when: 
-  - inventory_hostname == groups['kube-master'][0]
-
-- name: Add argo-cd chart repo
-  kubernetes.core.helm_repository:
-    name: argo-cd
-    repo_url: "https://argoproj.github.io/argo-helm"
-  when: 
-  - inventory_hostname == groups['kube-master'][0]
-
-- name: Deploy Prometheus inside monitoring namespace
-  kubernetes.core.helm:
-    name: prometheus
-    chart_ref: prometheus-community/kube-prometheus-stack
-    release_namespace: monitoring
-    create_namespace: true
-  when: 
-  - inventory_hostname == groups['kube-master'][0]
-
-- name: Deploy Argo-CD inside argo-cd namespace
-  kubernetes.core.helm:
-    name: argo-cd
-    chart_ref: argo-cd/argo-cd
-    release_namespace: argo-cd
-    create_namespace: true
-  when: 
-  - inventory_hostname == groups['kube-master'][0]