diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
index fef7060c..07457c88 100644
--- a/config/default/kustomization.yaml
+++ b/config/default/kustomization.yaml
@@ -28,7 +28,6 @@ patchesStrategicMerge:
 - manager_image_patch_edited.yaml
 - manager_webhook_patch.yaml
 - webhookcainjection_patch.yaml
-- manager_prometheus_metrics_patch.yaml
 
 # Protect the /metrics endpoint by putting it behind auth.
 # If you want your controller-manager to expose the /metrics
diff --git a/config/default/manager_prometheus_metrics_patch.yaml b/config/default/manager_prometheus_metrics_patch.yaml
deleted file mode 100644
index 0b96c681..00000000
--- a/config/default/manager_prometheus_metrics_patch.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# This patch enables Prometheus scraping for the manager pod.
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: controller-manager
-  namespace: system
-spec:
-  template:
-    metadata:
-      annotations:
-        prometheus.io/scrape: 'true'
-    spec:
-      containers:
-      # Expose the prometheus metrics on default port
-      - name: manager
-        ports:
-        - containerPort: 8080
-          name: metrics
-          protocol: TCP
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
index e6125130..a66ade9d 100644
--- a/config/manager/manager.yaml
+++ b/config/manager/manager.yaml
@@ -23,9 +23,10 @@ spec:
       - command:
         - /manager
         args:
-        - --leader-elect
-        - --cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}
-        - --cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}
+        - "--leader-elect"
+        - "--metrics-bind-addr=localhost:8080"
+        - "--cloudstackcluster-concurrency=${CAPC_CLOUDSTACKCLUSTER_CONCURRENCY:=10}"
+        - "--cloudstackmachine-concurrency=${CAPC_CLOUDSTACKMACHINE_CONCURRENCY:=10}"
         image: controller:latest
         name: manager
         securityContext:
diff --git a/docs/book/src/development/tilt.md b/docs/book/src/development/tilt.md
index fce2a04c..991c9e87 100644
--- a/docs/book/src/development/tilt.md
+++ b/docs/book/src/development/tilt.md
@@ -35,13 +35,23 @@ Next, create a `tilt-settings.json` file and place it in your local copy of `clu
 
 **Example `tilt-settings.json` for CAPC clusters:**
 
+```json
+{
+    "default_registry": "gcr.io/your-project-name-here",
+    "provider_repos": ["../cluster-api-provider-cloudstack"],
+    "enable_providers": ["kubeadm-bootstrap", "kubeadm-control-plane", "cloudstack"]
+}
+```
+
+**Example `tilt-settings.json` for CAPC clusters with experimental feature gate:**
+
 ```json
 {
     "default_registry": "gcr.io/your-project-name-here",
     "provider_repos": ["../cluster-api-provider-cloudstack"],
     "enable_providers": ["kubeadm-bootstrap", "kubeadm-control-plane", "cloudstack"],
     "kustomize_substitutions": {
-        "CLOUDSTACK_B64ENCODED_CREDENTIALS": "RANDOM_STRING==",
+        "EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION": "true",
     }
 }
 ```
diff --git a/test/e2e/config/cloudstack.yaml b/test/e2e/config/cloudstack.yaml
index ee06f42c..076be161 100644
--- a/test/e2e/config/cloudstack.yaml
+++ b/test/e2e/config/cloudstack.yaml
@@ -106,8 +106,6 @@ providers:
         replacements:
           - old: --metrics-bind-addr=localhost:8080
             new: --metrics-bind-addr=:8080
-          - old: "--leader-elect"
-            new: "--leader-elect\n        - --metrics-bind-addr=:8080"
 
 variables:
   KUBERNETES_VERSION_MANAGEMENT: "v1.25.3"