diff --git a/monitoring/k3s.libsonnet b/monitoring/k3s.libsonnet
index f3b7657..b38aa67 100644
--- a/monitoring/k3s.libsonnet
+++ b/monitoring/k3s.libsonnet
@@ -54,5 +54,34 @@ local masterIP = '185.95.218.11';
       endpoints.mixin.metadata.withNamespace('kube-system') +
       endpoints.mixin.metadata.withLabels({ 'k8s-app': 'kube-controller-manager' }) +
       endpoints.withSubsets(subset),
+    serviceMonitorKubeScheduler+:
+      {
+        spec+: {
+          endpoints: [
+            {
+              port: 'http-metrics',
+              interval: '30s',
+            },
+          ],
+        },
+      },
+    serviceMonitorKubeControllerManager+:
+      {
+        spec+: {
+          endpoints: [
+            {
+              port: 'http-metrics',
+              interval: '30s',
+              metricRelabelings: (import 'kube-prometheus/dropping-deprecated-metrics-relabelings.libsonnet') + [
+                {
+                  sourceLabels: ['__name__'],
+                  regex: 'etcd_(debugging|disk|request|server).*',
+                  action: 'drop',
+                },
+              ],
+            },
+          ],
+        },
+      },
   },
 }
diff --git a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
index f8aaaa6..67f4b78 100644
--- a/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
+++ b/monitoring/manifests/alertmanager-tbrnt-config-secret.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: monitoring
 spec:
   encryptedData:
-    alertmanager.yaml: AgCo2juSFAgA8iAjZGHrjyOVIaB/7OU6CZyga5s6cVfhiT/G/wt+BEfvmh7XZnc2ETv52T9giwnXQF4zhnHOGNLOT5ZoveRp36kuk1gNjdwZVEOoK/KlwNJ4nWOE6XfqYt+GdZIuvrJluiSpEybNBxRcO6xyPz4QMZQeGJQBuZXKvfMqhHMVb3TASBoe8Bl6LyXQW7QGwNpOzTW3PNp66kXfN3NLEF0ZW8JoYNh3aXTDTTvTgbQuGiC4dtNR6yTADBkJnQ34+O2GLxgti/uv2SDSWcnzY+arJREzKuorApprNG1awKaRb6E2fQqyl2wgTD/Ci3w2GwO/5R6GS7GvKw4RHNzaKzXJKMHC30d+hFHWzS/RGRfAFzSr6uv+aUE2sFwfvP/Cx8AQu6xwbg/qyoDGzRJQdHN4naZLLlGnz99yo8CSUfmhaxjy6dOqtDbm7kbZWoRtInxB6WGrsg3mVqjf8gfaEMMnlXQxywWGJ9XvgzM5OGYrwwA2wSfC+f6IqnhbwrpDcs6B2XgqKFElopTkQXTh67tlkedpoDY3RuO9b/6+xy7yKoKXl6xaBgoNtMeg27KqCeE49Kn7CyzLtz8IsZinUTqx2mE8/4BBR2tKtSl0eqNXtXX1gzXdEDMPy4alQb+8ulDlhfFLG9fdP463f/6LeIKiwcI02W/P+fleUWjvBb8xDgxQVKn/W8htZq/w6fRW7Kbm1h7uC32aLlRh7zPZxpzWg5XbveHX1tmgpmbgMY4g6jB7WVf9J8eFO49R5ID/xdWqabV025kFbVCQ1NCMbg9gRIIMu5qz4q2DddO/ojod7COerxK11yynFUeaTCxNpoLI7ANUneR6+VFZGOeUI09V2wh5OTS0ZvcACbts6r3PH54bHvTwNcxTszxD9UFNzLvmyUODJo6i2C+ZtqssrCHY4rBpwMARpH4IFN0ecEEYx48RnMiL75LjODppab5D+ufSh8K6l54QY//Jb3m9W+wPO59uTObGBoHrAc7kNJsHQrkHJcXywKaI7J0oFGPBtWGMaqqct5vrYbCUkwJbZo7pi0qxwNpGSOPqgorn5v5+PK5X0kFkGyPbsQVic7W578ac8mU50CanHGvzroJ3JzZXRFtWX8oIUvz1Z+JU1NWZif2oxooXnEVQ68bImdfQVtt62le9zIjFDjMXNYIA8y1KLR0Takb3+T0cbrVpR8GNxx+M7RraF+Ha5pZ88yncht6fL6eXbCCaxnimFdEFfgNEnVxaK3viQhPGVb6UKDzNjqYmn8wn/4+fOhcjsw0a0SCHbLtnmNXXgEx1A319nc0uS7JM2qN7SiaRxlViAKzAVDlFwm08wi3JSsjtC/1mDDv22u+eiBXOzDm/0rOSf52n/6k06oZsWdY/gOrlQvX6A1qyHOIvg3H3a+c7z4KwvSYwfyEk3asHt2THkP0QXJ2SdGpuE0zEzhrjYJz63vUN/KZpyyFWVKfcCfICuiUvC2wgZo2NXF8Qpa/bk77QDzrq0aNhYxnSBszQoHR/jALYd509kM23ymmjWHTl2+Pr43J98mIKhMlr5UgBxbdaPWCeIzp2A7KTjvVYrtjkvUwYEodUqxRoyxqVHDQuFfh0Ldot7txrAEMSA8GGT1Rzml0nSpLcS7dSWLTNRnPLCFLF+sgdqlNZHXRxInxmnXRZK59nT8tkRb8A5cX1j/MvURjux7cKHXPYKEwttdi5Wg==
+    alertmanager.yaml: AgDMHzGP2Z01zF3DT/i5Yk/JmEY5dMZyfx1wBRd1xs9LS5B5us0b1Y0BulDLMzNpZbHBLbp7GYoq9EyH/1EarDtFKcwbCFPBJ0GFIngU/j+jQk0Grd/mwhXoy+p8HSo0T9ddRRnJlMBjoP8WbOhZpUDbrF3V7UIP/ksPwnk0h/AuCPxQxWc1gw9eSY0wrdAWFkznG+9fGgO73QqITn1WdO6OGEsD5LoFamI+EHMFu8Z5lwu+s+jw0qkTmPE7c+GR/X30fhVVStkf2XyOlpo/I3G+EsgzXoAs1QvuRycYuPMFjIAhUh245019eIeIahdarduR8IqfO869jjqaqBmwhkyyr05tVFF8tu1hcAewZ26drWZwlzpI+eAFx8pU9SUNron0M+Y1Rkvx+1pnQRo0BDcX5+Is52k4dELbUVYb05pjdN8DaA2/M/qg9YA9llH5dTzDgAj+DmC1kUexadSJVPi/1Q+0NHdwYBx9CU0j0tb2jrrHT8UW13mbFGC7ctSEsf9NZV66IQ5m/HOlKBAtRAlp2N4kcDdU5qaukoDpjpx1Ge31iiAA8U48zQ8RNNtQUMTQ+xJvASL++SKV3b1CPvWRMlRuPV5gtaL9p+Aa+ReBIG1dDI2gHOsd5fsIcILoB+8C+WOhA6jGmAOdVw7BLChfIxbKkKT1fBuqRjGSGlCc1ymhuEy60CxNRzkyjru3jlzjjIFessuz0531B4GGHGRxCvuVN7zju4ZUQN4edCDGiF1jfVMw/IQ6xrlBigDunfm/vF9ojGuiGFuoBYNUH40ocdqMguT36DSfLoPBsVbaQHQcRRbXMIL2R1LjlssmzcgSm8SuWVw0jvk3sad/CucihrNACOUhvirPFSlL55ttbVqXPTzCcISx7kmafuP2ylB3wGjSNJcOC0gOOVG6IkACbUnQsRU2aHga9uaH81Iv8WlN9xEe7atWTH/vu2SjSC8wicuJ0cUFfTdKx0XTusMdGQiDA5Xla473yDRuQ/FtMc/70gYewHQ0eupW1k5mnn+V75hCoY9KrjlN+BGXZOAg719NmXOUk7jZw+yexIkCVSNe0CHjNBv1CofIWMQ6jXKmRiuZg9LbLUwZYLr96ntvFqRcDHekVfWMNGxbB+Txcj8dpon1sgPYy1gJ1nWB9EwXaK0HrdTNhu3Ue/apE/C6n0ll+qkGHKsnraIO3tgIksZ8WtoOHyiz0sCXb2plPxG143MxPPLFPoBaK0wtqCb7uxikYskppQG07B523MvkYAV8vNNSQmol+2T0oOrhfRHSAHHXt5V34owTpNojwY5jWhVHDDkGiSsXS+8pJWgP68A8CWWXmM7aTjLSejKdc2aBSPqT31Ygdb8bDuopVQgmwAeXxeQQfgr37GEr/H433e9q2jTgsaHf9cMYNqXkF/gi6kM9Iw9jOCg27OAKz36TBVgi/PGLLjXZKnsshf69msVjhWXa2mHZEH34b9N8KocI7teyYSFZjxhEiMbr7XT958Y+zds6wmScaQU28G5GUPZnXID70v4VgejSt0Y+DscvRpYx/mGA60f0QrcfoStAxAmvM/5vC32W8VdMKbEL9vhTpDpveZxtNHzy7nV8BQczCeGYYIj85rKZVkIcFDCspmKqWcWDHRV0tZaWRZ72td3gE1ivZYfmFbOZ6esKEb+wZCQF0NZy0LKFv6o6canwADPz00780uX+2enmPCxFuql0Mg==
   template:
     metadata:
       creationTimestamp: null
diff --git a/monitoring/manifests/prometheus-serviceMonitorKubeControllerManager.yaml b/monitoring/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
index 0f23d84..7f20fce 100644
--- a/monitoring/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
+++ b/monitoring/manifests/prometheus-serviceMonitorKubeControllerManager.yaml
@@ -7,8 +7,7 @@ metadata:
   namespace: monitoring
 spec:
   endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
+  - interval: 30s
     metricRelabelings:
     - action: drop
       regex: kubelet_(pod_worker_latency_microseconds|pod_start_latency_microseconds|cgroup_manager_latency_microseconds|pod_worker_start_latency_microseconds|pleg_relist_latency_microseconds|pleg_relist_interval_microseconds|runtime_operations|runtime_operations_latency_microseconds|runtime_operations_errors|eviction_stats_age_microseconds|device_plugin_registration_count|device_plugin_alloc_latency_microseconds|network_plugin_operations_latency_microseconds)
@@ -46,10 +45,7 @@ spec:
       regex: etcd_(debugging|disk|request|server).*
       sourceLabels:
       - __name__
-    port: https-metrics
-    scheme: https
-    tlsConfig:
-      insecureSkipVerify: true
+    port: http-metrics
   jobLabel: k8s-app
   namespaceSelector:
     matchNames:
diff --git a/monitoring/manifests/prometheus-serviceMonitorKubeScheduler.yaml b/monitoring/manifests/prometheus-serviceMonitorKubeScheduler.yaml
index 8073eac..f00db0e 100644
--- a/monitoring/manifests/prometheus-serviceMonitorKubeScheduler.yaml
+++ b/monitoring/manifests/prometheus-serviceMonitorKubeScheduler.yaml
@@ -7,12 +7,8 @@ metadata:
   namespace: monitoring
 spec:
   endpoints:
-  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
-    interval: 30s
-    port: https-metrics
-    scheme: https
-    tlsConfig:
-      insecureSkipVerify: true
+  - interval: 30s
+    port: http-metrics
   jobLabel: k8s-app
   namespaceSelector:
     matchNames: