diff --git a/charts/gardener-extension-registry-cache/templates/clusterrole.yaml b/charts/gardener-extension-registry-cache/templates/clusterrole.yaml
index 88fd7de7..14fdea7c 100644
--- a/charts/gardener-extension-registry-cache/templates/clusterrole.yaml
+++ b/charts/gardener-extension-registry-cache/templates/clusterrole.yaml
@@ -78,8 +78,6 @@ rules:
   - patch
   - delete
   resourceNames:
-# TODO(dimitar-kostadinov): Remove 'extension-registry-cache-monitoring' after August 2024.
-  - extension-registry-cache-monitoring
   - registry-cache-dashboards
 - apiGroups:
   - ""
@@ -108,13 +106,4 @@ rules:
   - create
   - update
   - patch
-  - delete
-# TODO(dimitar-kostadinov): Remove this after August 2024.
-- apiGroups:
-  - apps
-  resources:
-  - statefulsets
-  verbs:
-  - get
-  - list
-  - watch
\ No newline at end of file
+  - delete
\ No newline at end of file
diff --git a/example/controller-registration.yaml b/example/controller-registration.yaml
index 24cd5b71..1be27306 100644
--- a/example/controller-registration.yaml
+++ b/example/controller-registration.yaml
@@ -4,7 +4,7 @@ kind: ControllerDeployment
 metadata:
   name: extension-registry-cache
 helm:
-  rawChart: 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
+  rawChart: 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
   values:
     image: europe-docker.pkg.dev/gardener-project/public/gardener/extensions/registry-cache:v0.10.0-dev
 ---
diff --git a/pkg/component/registrycaches/alerting-rules/registry-cache.rules.yaml b/pkg/component/registrycaches/alerting-rules/registry-cache.rules.yaml
deleted file mode 100644
index 346da792..00000000
--- a/pkg/component/registrycaches/alerting-rules/registry-cache.rules.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-groups:
-- name: registry-cache.rules
-  rules:
-  - alert: RegistryCachePersistentVolumeUsageCritical
-    expr: |
-      100 * (
-        kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-          /
-        kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-      ) < 5
-    for: 1h
-    labels:
-      service: registry-cache-extension
-      severity: warning
-      type: shoot
-      visibility: owner
-    annotations:
-      summary: Registry cache PersistentVolume almost full.
-      description: The registry-cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is only {{ printf "%0.2f" $value }}% free. When there is no available disk space, no new images will be cached. However, image pull operations are not affected.
-  - alert: RegistryCachePersistentVolumeFullInFourDays
-    expr: |
-      100 * (
-        kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-          /
-        kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-      ) < 15
-      and
-      predict_linear(kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}[30m], 4 * 24 * 3600) <= 0
-    for: 1h
-    labels:
-      service: registry-cache-extension
-      severity: warning
-      type: shoot
-      visibility: owner
-    annotations:
-      summary: Registry cache PersistentVolume will be full in four days.
-      description: Based on recent sampling, the registry cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is expected to fill up within four days. Currently {{ printf "%0.2f" $value }}% is available.
-
-  # We rely on the implicit contract that recording rules in format "shoot:(.+):(.+)" will be
-  # automatically federated to the aggregate prometheus and then to the garden-prometheus.
-  # Ref https://github.com/gardener/gardener/blob/v1.90.0/pkg/component/observability/monitoring/prometheus/aggregate/servicemonitors.go#L45
-  - record: shoot:registry_proxy_pushed_bytes_total:sum
-    expr: sum by (upstream_host) (rate(registry_proxy_pushed_bytes_total[5m]))
-  - record: shoot:registry_proxy_pulled_bytes_total:sum
-    expr: sum by (upstream_host) (rate(registry_proxy_pulled_bytes_total[5m]))
diff --git a/pkg/component/registrycaches/monitoring.go b/pkg/component/registrycaches/monitoring.go
index 9baaee6c..1ab8ad1d 100644
--- a/pkg/component/registrycaches/monitoring.go
+++ b/pkg/component/registrycaches/monitoring.go
@@ -7,247 +7,163 @@ package registrycaches
 import (
 	"context"
 	_ "embed"
-	"fmt"
 	"strconv"
 
 	v1beta1constants "github.com/gardener/gardener/pkg/apis/core/v1beta1/constants"
 	kubeapiserverconstants "github.com/gardener/gardener/pkg/component/kubernetes/apiserver/constants"
 	monitoringutils "github.com/gardener/gardener/pkg/component/observability/monitoring/utils"
 	"github.com/gardener/gardener/pkg/controllerutils"
-	"github.com/gardener/gardener/pkg/utils"
-	kutil "github.com/gardener/gardener/pkg/utils/kubernetes"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	monitoringv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
-	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 var (
-	scrapeConfigYAML = `- job_name: registry-cache-metrics
-  scheme: https
-  tls_config:
-    ca_file: /etc/prometheus/seed/ca.crt
-  authorization:
-    type: Bearer
-    credentials_file: /var/run/secrets/gardener.cloud/shoot/token/token
-  honor_labels: false
-  kubernetes_sd_configs:
-  - role: pod
-    api_server: https://` + v1beta1constants.DeploymentNameKubeAPIServer + `:` + strconv.Itoa(kubeapiserverconstants.Port) + `
-    namespaces:
-      names: [ kube-system ]
-    tls_config:
-      ca_file: /etc/prometheus/seed/ca.crt
-    authorization:
-      type: Bearer
-      credentials_file: /var/run/secrets/gardener.cloud/shoot/token/token
-  relabel_configs:
-  - source_labels: [__meta_kubernetes_pod_label_upstream_host, __meta_kubernetes_pod_container_port_name]
-    action: keep
-    regex: (.+);debug
-  - action: labelmap
-    regex: __meta_kubernetes_pod_label_(.+)
-  - target_label: __address__
-    action: replace
-    replacement: ` + v1beta1constants.DeploymentNameKubeAPIServer + `:` + strconv.Itoa(kubeapiserverconstants.Port) + `
-  - source_labels: [__meta_kubernetes_pod_name, __meta_kubernetes_pod_container_port_number]
-    action: replace
-    target_label: __metrics_path__
-    regex: (.+);(.+)
-    replacement: /api/v1/namespaces/kube-system/pods/${1}:${2}/proxy/metrics
-  metric_relabel_configs:
-  - source_labels: [ __name__ ]
-    regex: registry_proxy_.+
-    action: keep
-`
-	//go:embed alerting-rules/registry-cache.rules.yaml
-	monitoringAlertingRules string
 	//go:embed monitoring/dashboard.json
 	dashboard string
 )
 
-func (r *registryCaches) alertingRules() string {
-	return fmt.Sprintf("registry-cache.rules.yaml: |\n  %s\n", utils.Indent(monitoringAlertingRules, 2))
-}
-
-func (r *registryCaches) dashboard() string {
-	return fmt.Sprintf("registry-cache.dashboard.json: '%s'", dashboard)
-}
-
-func (r *registryCaches) scrapeConfig() string {
-	return scrapeConfigYAML
-}
-
 func (r *registryCaches) deployMonitoringConfig(ctx context.Context) error {
-	// TODO(dimitar-kostadinov): Delete this if-condition after August 2024.
-	if r.client.Get(ctx, client.ObjectKey{Name: "prometheus-shoot", Namespace: r.namespace}, &appsv1.StatefulSet{}) == nil {
-		if err := kutil.DeleteObject(ctx, r.client, &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "extension-registry-cache-monitoring", Namespace: r.namespace}}); err != nil {
-			return fmt.Errorf("failed deleting %s ConfigMap: %w", "extension-registry-cache-monitoring", err)
-		}
-
-		configMapDashboards := &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "registry-cache-dashboards", Namespace: r.namespace}}
-		if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, configMapDashboards, func() error {
-			metav1.SetMetaDataLabel(&configMapDashboards.ObjectMeta, "component", "registry-cache")
-			metav1.SetMetaDataLabel(&configMapDashboards.ObjectMeta, "dashboard.monitoring.gardener.cloud/shoot", "true")
-			configMapDashboards.Data = map[string]string{"registry-cache.dashboard.json": dashboard}
-			return nil
-		}); err != nil {
-			return err
-		}
+	configMapDashboards := &corev1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "registry-cache-dashboards", Namespace: r.namespace}}
+	if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, configMapDashboards, func() error {
+		metav1.SetMetaDataLabel(&configMapDashboards.ObjectMeta, "component", "registry-cache")
+		metav1.SetMetaDataLabel(&configMapDashboards.ObjectMeta, "dashboard.monitoring.gardener.cloud/shoot", "true")
+		configMapDashboards.Data = map[string]string{"registry-cache.dashboard.json": dashboard}
+		return nil
+	}); err != nil {
+		return err
+	}
 
-		prometheusRule := &monitoringv1.PrometheusRule{ObjectMeta: monitoringutils.ConfigObjectMeta("registry-cache", r.namespace, "shoot")}
-		if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, prometheusRule, func() error {
-			metav1.SetMetaDataLabel(&prometheusRule.ObjectMeta, "component", "registry-cache")
-			metav1.SetMetaDataLabel(&prometheusRule.ObjectMeta, "prometheus", "shoot")
-			prometheusRule.Spec = monitoringv1.PrometheusRuleSpec{
-				Groups: []monitoringv1.RuleGroup{{
-					Name: "registry-cache.rules",
-					Rules: []monitoringv1.Rule{
-						{
-							Alert: "RegistryCachePersistentVolumeUsageCritical",
-							Expr: intstr.FromString(`100 * (
-	 kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-	   /
-	 kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-	) < 5`),
-							For: ptr.To(monitoringv1.Duration("1h")),
-							Labels: map[string]string{
-								"service":    "registry-cache-extension",
-								"severity":   "warning",
-								"type":       "shoot",
-								"visibility": "owner",
-							},
-							Annotations: map[string]string{
-								"description": `The registry-cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is only {{ printf "%0.2f" $value }}% free. When there is no available disk space, no new images will be cached. However, image pull operations are not affected.`,
-								"summary":     "Registry cache PersistentVolume almost full.",
-							},
-						},
-						{
-							Alert: "RegistryCachePersistentVolumeFullInFourDays",
-							Expr: intstr.FromString(`100 * (
-	 kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-	   /
-	 kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
-	) < 15
-	and
-	predict_linear(kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}[30m], 4 * 24 * 3600) <= 0`),
-							For: ptr.To(monitoringv1.Duration("1h")),
-							Labels: map[string]string{
-								"service":    "registry-cache-extension",
-								"severity":   "warning",
-								"type":       "shoot",
-								"visibility": "owner",
-							},
-							Annotations: map[string]string{
-								"description": `Based on recent sampling, the registry cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is expected to fill up within four days. Currently {{ printf "%0.2f" $value }}% is available.`,
-								"summary":     "Registry cache PersistentVolume will be full in four days.",
-							},
-						},
-						// We rely on the implicit contract that recording rules in format "shoot:(.+):(.+)" will be
-						// automatically federated to the aggregate prometheus and then to the garden-prometheus.
-						// Ref https://github.com/gardener/gardener/blob/v1.90.0/pkg/component/observability/monitoring/prometheus/aggregate/servicemonitors.go#L45
-						{
-							Record: "shoot:registry_proxy_pushed_bytes_total:sum",
-							Expr:   intstr.FromString("sum by (upstream_host) (rate(registry_proxy_pushed_bytes_total[5m]))"),
+	prometheusRule := &monitoringv1.PrometheusRule{ObjectMeta: monitoringutils.ConfigObjectMeta("registry-cache", r.namespace, "shoot")}
+	if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, prometheusRule, func() error {
+		metav1.SetMetaDataLabel(&prometheusRule.ObjectMeta, "component", "registry-cache")
+		metav1.SetMetaDataLabel(&prometheusRule.ObjectMeta, "prometheus", "shoot")
+		prometheusRule.Spec = monitoringv1.PrometheusRuleSpec{
+			Groups: []monitoringv1.RuleGroup{{
+				Name: "registry-cache.rules",
+				Rules: []monitoringv1.Rule{
+					{
+						Alert: "RegistryCachePersistentVolumeUsageCritical",
+						Expr: intstr.FromString(`100 * (
+ kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
+   /
+ kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
+) < 5`),
+						For: ptr.To(monitoringv1.Duration("1h")),
+						Labels: map[string]string{
+							"service":    "registry-cache-extension",
+							"severity":   "warning",
+							"type":       "shoot",
+							"visibility": "owner",
 						},
-						{
-							Record: "shoot:registry_proxy_pulled_bytes_total:sum",
-							Expr:   intstr.FromString("sum by (upstream_host) (rate(registry_proxy_pulled_bytes_total[5m]))"),
+						Annotations: map[string]string{
+							"description": `The registry-cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is only {{ printf "%0.2f" $value }}% free. When there is no available disk space, no new images will be cached. However, image pull operations are not affected.`,
+							"summary":     "Registry cache PersistentVolume almost full.",
 						},
 					},
-				}},
-			}
-			return nil
-		}); err != nil {
-			return err
-		}
-
-		scrapeConfig := &monitoringv1alpha1.ScrapeConfig{ObjectMeta: monitoringutils.ConfigObjectMeta("registry-cache", r.namespace, "shoot")}
-		if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, scrapeConfig, func() error {
-			metav1.SetMetaDataLabel(&scrapeConfig.ObjectMeta, "component", "registry-cache")
-			metav1.SetMetaDataLabel(&scrapeConfig.ObjectMeta, "prometheus", "shoot")
-			scrapeConfig.Spec = monitoringv1alpha1.ScrapeConfigSpec{
-				HonorLabels:   ptr.To(false),
-				ScrapeTimeout: ptr.To(monitoringv1.Duration("10s")),
-				Scheme:        ptr.To("HTTPS"),
-				// This is needed because the kubelets' certificates are not are generated for a specific pod IP
-				TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
-				Authorization: &monitoringv1.SafeAuthorization{Credentials: &corev1.SecretKeySelector{
-					LocalObjectReference: corev1.LocalObjectReference{Name: "shoot-access-prometheus-shoot"},
-					Key:                  "token",
-				}},
-				KubernetesSDConfigs: []monitoringv1alpha1.KubernetesSDConfig{{
-					APIServer:  ptr.To("https://" + v1beta1constants.DeploymentNameKubeAPIServer + ":" + strconv.Itoa(kubeapiserverconstants.Port)),
-					Role:       "endpoints",
-					Namespaces: &monitoringv1alpha1.NamespaceDiscovery{Names: []string{metav1.NamespaceSystem}},
-					Authorization: &monitoringv1.SafeAuthorization{Credentials: &corev1.SecretKeySelector{
-						LocalObjectReference: corev1.LocalObjectReference{Name: "shoot-access-prometheus-shoot"},
-						Key:                  "token",
-					}},
-					// This is needed because we do not fetch the correct cluster CA bundle right now
-					TLSConfig:       &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
-					FollowRedirects: ptr.To(true),
-				}},
-				RelabelConfigs: []monitoringv1.RelabelConfig{
-					{
-						Action:      "replace",
-						Replacement: ptr.To("registry-cache-metrics"),
-						TargetLabel: "job",
-					},
 					{
-						SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_pod_label_upstream_host", "__meta_kubernetes_pod_container_port_name"},
-						Action:       "keep",
-						Regex:        `(.+);debug`,
-					},
-					{
-						Action: "labelmap",
-						Regex:  `__meta_kubernetes_pod_label_(.+)`,
+						Alert: "RegistryCachePersistentVolumeFullInFourDays",
+						Expr: intstr.FromString(`100 * (
+ kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
+   /
+ kubelet_volume_stats_capacity_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}
+) < 15
+and
+predict_linear(kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"^cache-volume-registry-.+$"}[30m], 4 * 24 * 3600) <= 0`),
+						For: ptr.To(monitoringv1.Duration("1h")),
+						Labels: map[string]string{
+							"service":    "registry-cache-extension",
+							"severity":   "warning",
+							"type":       "shoot",
+							"visibility": "owner",
+						},
+						Annotations: map[string]string{
+							"description": `Based on recent sampling, the registry cache PersistentVolume claimed by {{ $labels.persistentvolumeclaim }} is expected to fill up within four days. Currently {{ printf "%0.2f" $value }}% is available.`,
+							"summary":     "Registry cache PersistentVolume will be full in four days.",
+						},
 					},
+					// We rely on the implicit contract that recording rules in format "shoot:(.+):(.+)" will be
+					// automatically federated to the aggregate prometheus and then to the garden-prometheus.
+					// Ref https://github.com/gardener/gardener/blob/v1.90.0/pkg/component/observability/monitoring/prometheus/aggregate/servicemonitors.go#L45
 					{
-						TargetLabel: "__address__",
-						Action:      "replace",
-						Replacement: ptr.To(v1beta1constants.DeploymentNameKubeAPIServer + ":" + strconv.Itoa(kubeapiserverconstants.Port)),
+						Record: "shoot:registry_proxy_pushed_bytes_total:sum",
+						Expr:   intstr.FromString("sum by (upstream_host) (rate(registry_proxy_pushed_bytes_total[5m]))"),
 					},
 					{
-						SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_pod_name", "__meta_kubernetes_pod_container_port_number"},
-						Action:       "replace",
-						TargetLabel:  "__metrics_path__",
-						Regex:        `(.+);(.+)`,
-						Replacement:  ptr.To("/api/v1/namespaces/kube-system/pods/${1}:${2}/proxy/metrics"),
+						Record: "shoot:registry_proxy_pulled_bytes_total:sum",
+						Expr:   intstr.FromString("sum by (upstream_host) (rate(registry_proxy_pulled_bytes_total[5m]))"),
 					},
 				},
-				MetricRelabelConfigs: monitoringutils.StandardMetricRelabelConfig("registry_proxy_.+"),
-			}
-			return nil
-		}); err != nil {
-			return err
+			}},
 		}
-
 		return nil
+	}); err != nil {
+		return err
 	}
 
-	// TODO(dimitar-kostadinov): Delete this, scrapeConfigYAML & monitoringAlertingRules vars and alerting-rules/registry-cache.rules.yaml file after August 2024.
-	monitoringConfigMap := &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      "extension-registry-cache-monitoring",
-			Namespace: r.namespace,
-		},
-	}
-	_, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, monitoringConfigMap, func() error {
-		metav1.SetMetaDataLabel(&monitoringConfigMap.ObjectMeta, v1beta1constants.LabelExtensionConfiguration, v1beta1constants.LabelMonitoring)
-
-		monitoringConfigMap.Data = map[string]string{
-			v1beta1constants.PrometheusConfigMapAlertingRules:  r.alertingRules(),
-			v1beta1constants.PrometheusConfigMapScrapeConfig:   r.scrapeConfig(),
-			v1beta1constants.PlutonoConfigMapOperatorDashboard: r.dashboard(),
+	scrapeConfig := &monitoringv1alpha1.ScrapeConfig{ObjectMeta: monitoringutils.ConfigObjectMeta("registry-cache", r.namespace, "shoot")}
+	if _, err := controllerutils.GetAndCreateOrMergePatch(ctx, r.client, scrapeConfig, func() error {
+		metav1.SetMetaDataLabel(&scrapeConfig.ObjectMeta, "component", "registry-cache")
+		metav1.SetMetaDataLabel(&scrapeConfig.ObjectMeta, "prometheus", "shoot")
+		scrapeConfig.Spec = monitoringv1alpha1.ScrapeConfigSpec{
+			HonorLabels:   ptr.To(false),
+			ScrapeTimeout: ptr.To(monitoringv1.Duration("10s")),
+			Scheme:        ptr.To("HTTPS"),
+			// This is needed because the kubelets' certificates are not are generated for a specific pod IP
+			TLSConfig: &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
+			Authorization: &monitoringv1.SafeAuthorization{Credentials: &corev1.SecretKeySelector{
+				LocalObjectReference: corev1.LocalObjectReference{Name: "shoot-access-prometheus-shoot"},
+				Key:                  "token",
+			}},
+			KubernetesSDConfigs: []monitoringv1alpha1.KubernetesSDConfig{{
+				APIServer:  ptr.To("https://" + v1beta1constants.DeploymentNameKubeAPIServer + ":" + strconv.Itoa(kubeapiserverconstants.Port)),
+				Role:       "endpoints",
+				Namespaces: &monitoringv1alpha1.NamespaceDiscovery{Names: []string{metav1.NamespaceSystem}},
+				Authorization: &monitoringv1.SafeAuthorization{Credentials: &corev1.SecretKeySelector{
+					LocalObjectReference: corev1.LocalObjectReference{Name: "shoot-access-prometheus-shoot"},
+					Key:                  "token",
+				}},
+				// This is needed because we do not fetch the correct cluster CA bundle right now
+				TLSConfig:       &monitoringv1.SafeTLSConfig{InsecureSkipVerify: ptr.To(true)},
+				FollowRedirects: ptr.To(true),
+			}},
+			RelabelConfigs: []monitoringv1.RelabelConfig{
+				{
+					Action:      "replace",
+					Replacement: ptr.To("registry-cache-metrics"),
+					TargetLabel: "job",
+				},
+				{
+					SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_pod_label_upstream_host", "__meta_kubernetes_pod_container_port_name"},
+					Action:       "keep",
+					Regex:        `(.+);debug`,
+				},
+				{
+					Action: "labelmap",
+					Regex:  `__meta_kubernetes_pod_label_(.+)`,
+				},
+				{
+					TargetLabel: "__address__",
+					Action:      "replace",
+					Replacement: ptr.To(v1beta1constants.DeploymentNameKubeAPIServer + ":" + strconv.Itoa(kubeapiserverconstants.Port)),
+				},
+				{
+					SourceLabels: []monitoringv1.LabelName{"__meta_kubernetes_pod_name", "__meta_kubernetes_pod_container_port_number"},
+					Action:       "replace",
+					TargetLabel:  "__metrics_path__",
+					Regex:        `(.+);(.+)`,
+					Replacement:  ptr.To("/api/v1/namespaces/kube-system/pods/${1}:${2}/proxy/metrics"),
+				},
+			},
+			MetricRelabelConfigs: monitoringutils.StandardMetricRelabelConfig("registry_proxy_.+"),
 		}
-
 		return nil
-	})
+	}); err != nil {
+		return err
+	}
 
-	return err
+	return nil
 }
diff --git a/pkg/component/registrycaches/registry_caches_test.go b/pkg/component/registrycaches/registry_caches_test.go
index 91deeeb5..ff71a01a 100644
--- a/pkg/component/registrycaches/registry_caches_test.go
+++ b/pkg/component/registrycaches/registry_caches_test.go
@@ -22,7 +22,6 @@ import (
 	. "github.com/onsi/gomega"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	monitoringv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
-	appsv1 "k8s.io/api/apps/v1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -515,79 +514,50 @@ status: {}
 			})
 		})
 
-		// TODO(dimitar-kostadinov) delete this after August 2024.
-		It("should deploy a monitoring ConfigMap", func() {
+		It("should deploy a monitoring objects", func() {
 			Expect(registryCaches.Deploy(ctx)).To(Succeed())
 
-			monitoringConfigMap := &corev1.ConfigMap{
+			configMapDashboards := &corev1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:      "extension-registry-cache-monitoring",
+					Name:      "registry-cache-dashboards",
 					Namespace: namespace,
 				},
 			}
-			Expect(c.Get(ctx, client.ObjectKeyFromObject(monitoringConfigMap), monitoringConfigMap)).To(Succeed())
-			Expect(monitoringConfigMap.Labels).To(HaveKeyWithValue("extensions.gardener.cloud/configuration", "monitoring"))
-			Expect(monitoringConfigMap.Data).To(HaveKey("alerting_rules"))
-			Expect(monitoringConfigMap.Data).To(HaveKey("scrape_config"))
-		})
-
-		// TODO(dimitar-kostadinov) remove 'When' condition after August 2024.
-		When("prometheus-shoot statefulset set exist", func() {
-			BeforeEach(func() {
-				prometheusShoot := &appsv1.StatefulSet{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "prometheus-shoot",
-						Namespace: namespace,
-					},
-				}
-				Expect(c.Create(ctx, prometheusShoot)).To(Succeed())
-			})
+			Expect(c.Get(ctx, client.ObjectKeyFromObject(configMapDashboards), configMapDashboards)).To(Succeed())
+			Expect(configMapDashboards.Labels).To(HaveKeyWithValue("dashboard.monitoring.gardener.cloud/shoot", "true"))
+			Expect(configMapDashboards.Labels).To(HaveKeyWithValue("component", "registry-cache"))
+			Expect(configMapDashboards.Data).To(HaveKey("registry-cache.dashboard.json"))
 
-			It("should deploy a monitoring objects", func() {
-				Expect(registryCaches.Deploy(ctx)).To(Succeed())
-
-				configMapDashboards := &corev1.ConfigMap{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "registry-cache-dashboards",
-						Namespace: namespace,
-					},
-				}
-				Expect(c.Get(ctx, client.ObjectKeyFromObject(configMapDashboards), configMapDashboards)).To(Succeed())
-				Expect(configMapDashboards.Labels).To(HaveKeyWithValue("dashboard.monitoring.gardener.cloud/shoot", "true"))
-				Expect(configMapDashboards.Labels).To(HaveKeyWithValue("component", "registry-cache"))
-				Expect(configMapDashboards.Data).To(HaveKey("registry-cache.dashboard.json"))
-
-				prometheusRule := &monitoringv1.PrometheusRule{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "shoot-registry-cache",
-						Namespace: namespace,
-					},
-				}
-				Expect(c.Get(ctx, client.ObjectKeyFromObject(prometheusRule), prometheusRule)).To(Succeed())
-				Expect(prometheusRule.Labels).To(HaveKeyWithValue("prometheus", "shoot"))
-				Expect(prometheusRule.Labels).To(HaveKeyWithValue("component", "registry-cache"))
-				Expect(prometheusRule.Spec.Groups[0].Name).To(Equal("registry-cache.rules"))
-				Expect(prometheusRule.Spec.Groups[0].Rules).To(HaveLen(4))
-				Expect(prometheusRule.Spec.Groups[0].Rules[0].Alert).To(Equal("RegistryCachePersistentVolumeUsageCritical"))
-				Expect(prometheusRule.Spec.Groups[0].Rules[1].Alert).To(Equal("RegistryCachePersistentVolumeFullInFourDays"))
-				Expect(prometheusRule.Spec.Groups[0].Rules[2].Record).To(Equal("shoot:registry_proxy_pushed_bytes_total:sum"))
-				Expect(prometheusRule.Spec.Groups[0].Rules[3].Record).To(Equal("shoot:registry_proxy_pulled_bytes_total:sum"))
-
-				scrapeConfig := &monitoringv1alpha1.ScrapeConfig{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "shoot-registry-cache",
-						Namespace: namespace,
-					},
-				}
-				Expect(c.Get(ctx, client.ObjectKeyFromObject(scrapeConfig), scrapeConfig)).To(Succeed())
-				Expect(scrapeConfig.Labels).To(HaveKeyWithValue("prometheus", "shoot"))
-				Expect(scrapeConfig.Labels).To(HaveKeyWithValue("component", "registry-cache"))
-				Expect(scrapeConfig.Spec.Authorization.Credentials.LocalObjectReference.Name).To(Equal("shoot-access-prometheus-shoot"))
-				Expect(scrapeConfig.Spec.KubernetesSDConfigs[0].APIServer).To(Equal(ptr.To("https://kube-apiserver:443")))
-				Expect(scrapeConfig.Spec.RelabelConfigs).To(HaveLen(5))
-				Expect(scrapeConfig.Spec.MetricRelabelConfigs).To(HaveLen(1))
-				Expect(scrapeConfig.Spec.MetricRelabelConfigs[0].Regex).To(Equal("^(registry_proxy_.+)$"))
-			})
+			prometheusRule := &monitoringv1.PrometheusRule{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "shoot-registry-cache",
+					Namespace: namespace,
+				},
+			}
+			Expect(c.Get(ctx, client.ObjectKeyFromObject(prometheusRule), prometheusRule)).To(Succeed())
+			Expect(prometheusRule.Labels).To(HaveKeyWithValue("prometheus", "shoot"))
+			Expect(prometheusRule.Labels).To(HaveKeyWithValue("component", "registry-cache"))
+			Expect(prometheusRule.Spec.Groups[0].Name).To(Equal("registry-cache.rules"))
+			Expect(prometheusRule.Spec.Groups[0].Rules).To(HaveLen(4))
+			Expect(prometheusRule.Spec.Groups[0].Rules[0].Alert).To(Equal("RegistryCachePersistentVolumeUsageCritical"))
+			Expect(prometheusRule.Spec.Groups[0].Rules[1].Alert).To(Equal("RegistryCachePersistentVolumeFullInFourDays"))
+			Expect(prometheusRule.Spec.Groups[0].Rules[2].Record).To(Equal("shoot:registry_proxy_pushed_bytes_total:sum"))
+			Expect(prometheusRule.Spec.Groups[0].Rules[3].Record).To(Equal("shoot:registry_proxy_pulled_bytes_total:sum"))
+
+			scrapeConfig := &monitoringv1alpha1.ScrapeConfig{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "shoot-registry-cache",
+					Namespace: namespace,
+				},
+			}
+			Expect(c.Get(ctx, client.ObjectKeyFromObject(scrapeConfig), scrapeConfig)).To(Succeed())
+			Expect(scrapeConfig.Labels).To(HaveKeyWithValue("prometheus", "shoot"))
+			Expect(scrapeConfig.Labels).To(HaveKeyWithValue("component", "registry-cache"))
+			Expect(scrapeConfig.Spec.Authorization.Credentials.LocalObjectReference.Name).To(Equal("shoot-access-prometheus-shoot"))
+			Expect(scrapeConfig.Spec.KubernetesSDConfigs[0].APIServer).To(Equal(ptr.To("https://kube-apiserver:443")))
+			Expect(scrapeConfig.Spec.RelabelConfigs).To(HaveLen(5))
+			Expect(scrapeConfig.Spec.MetricRelabelConfigs).To(HaveLen(1))
+			Expect(scrapeConfig.Spec.MetricRelabelConfigs[0].Regex).To(Equal("^(registry_proxy_.+)$"))
 		})
 	})
 
diff --git a/skaffold.yaml b/skaffold.yaml
index fda09e67..05f6dd30 100644
--- a/skaffold.yaml
+++ b/skaffold.yaml
@@ -25,7 +25,6 @@ build:
             - pkg/apis/registry/v1alpha3
             - pkg/cmd
             - pkg/component/registrycaches
-            - pkg/component/registrycaches/alerting-rules/registry-cache.rules.yaml
             - pkg/component/registrycaches/monitoring/dashboard.json
             - pkg/component/registrycaches/templates/config.yml.tpl
             - pkg/constants