diff --git a/Makefile b/Makefile
index f40030c7..aac51be0 100644
--- a/Makefile
+++ b/Makefile
@@ -370,7 +370,7 @@ local-env-setup: ## Prepare environment to run the operator with "make run"
 
 ## Miscellaneous Custom targets
 .PHONY: local-setup
-local-setup: export IMG := limitador-operator:dev
+local-setup: export IMG := localhost/limitador-operator:dev
 local-setup: ## Deploy operator in local kind cluster
 	$(MAKE) local-env-setup
 	$(MAKE) docker-build
diff --git a/bundle/manifests/limitador-operator-controller-manager-metrics-service_v1_service.yaml b/bundle/manifests/limitador-operator-metrics_v1_service.yaml
similarity index 82%
rename from bundle/manifests/limitador-operator-controller-manager-metrics-service_v1_service.yaml
rename to bundle/manifests/limitador-operator-metrics_v1_service.yaml
index c29a73a5..008c71e8 100644
--- a/bundle/manifests/limitador-operator-controller-manager-metrics-service_v1_service.yaml
+++ b/bundle/manifests/limitador-operator-metrics_v1_service.yaml
@@ -4,7 +4,7 @@ metadata:
   creationTimestamp: null
   labels:
     control-plane: controller-manager
-  name: limitador-operator-controller-manager-metrics-service
+  name: limitador-operator-metrics
 spec:
   ports:
   - name: metrics
diff --git a/bundle/manifests/limitador-operator.clusterserviceversion.yaml b/bundle/manifests/limitador-operator.clusterserviceversion.yaml
index d831dfdf..be734b86 100644
--- a/bundle/manifests/limitador-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/limitador-operator.clusterserviceversion.yaml
@@ -37,7 +37,7 @@ metadata:
     capabilities: Basic Install
     categories: Integration & Delivery
     containerImage: quay.io/kuadrant/limitador-operator:latest
-    createdAt: "2024-07-02T10:21:19Z"
+    createdAt: "2024-07-05T11:06:08Z"
     operators.operatorframework.io/builder: operator-sdk-v1.32.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/Kuadrant/limitador-operator
diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index 2e2c4512..63bed7a4 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -29,7 +29,6 @@ patchesStrategicMerge:
 # If you want your controller-manager to expose the /metrics
 # endpoint w/o any authn/z, please comment the following line.
 # - manager_auth_proxy_patch.yaml
-- manager_metrics_patch.yaml
 
 # Mount the controller config file for loading manager configurations
 # through a ComponentConfig type
diff --git a/config/default/manager_metrics_patch.yaml b/config/default/manager_metrics_patch.yaml
deleted file mode 100644
index 82b0c633..00000000
--- a/config/default/manager_metrics_patch.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: controller-manager
-  namespace: system
-spec:
-  template:
-    spec:
-      containers:
-      - name: manager
-        ports:
-        - containerPort: 8080
-          name: metrics
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index 942f07d2..334d1582 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -37,6 +37,9 @@ spec:
           name: manager
           securityContext:
             allowPrivilegeEscalation: false
+          ports:
+            - name: metrics
+              containerPort: 8080
           livenessProbe:
             httpGet:
               path: /healthz
diff --git a/config/manager/metrics_service.yaml b/config/manager/metrics_service.yaml
index 79a3b23a..1e46eba5 100644
--- a/config/manager/metrics_service.yaml
+++ b/config/manager/metrics_service.yaml
@@ -4,7 +4,7 @@ kind: Service
 metadata:
   labels:
     control-plane: controller-manager
-  name: controller-manager-metrics-service
+  name: metrics
   namespace: system
 spec:
   ports: