diff --git a/.github/workflows/test-charmed-katib.yaml b/.github/workflows/test-charmed-katib.yaml
index 7312c559d9e..06cf6076ce9 100644
--- a/.github/workflows/test-charmed-katib.yaml
+++ b/.github/workflows/test-charmed-katib.yaml
@@ -75,6 +75,8 @@ jobs:
           juju bundle deploy --build --destructive-mode --serial
           juju wait -wvt 300
 
+          kubectl label namespace kubeflow katib.kubeflow.org/metrics-collector-injection=enabled
+
       - name: Test Katib
         run: kubectl apply -f examples/v1beta1/hp-tuning/random.yaml
 
diff --git a/manifests/v1beta1/components/webhook/webhooks.yaml b/manifests/v1beta1/components/webhook/webhooks.yaml
index f84a5586c56..9bbbe21a1a2 100644
--- a/manifests/v1beta1/components/webhook/webhooks.yaml
+++ b/manifests/v1beta1/components/webhook/webhooks.yaml
@@ -5,7 +5,6 @@ metadata:
 webhooks:
   - name: validator.experiment.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     admissionReviewVersions:
       - v1
     clientConfig:
@@ -32,7 +31,6 @@ metadata:
 webhooks:
   - name: defaulter.experiment.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     admissionReviewVersions:
       - v1
     clientConfig:
@@ -53,7 +51,6 @@ webhooks:
           - experiments
   - name: mutator.pod.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     admissionReviewVersions:
       - v1
     clientConfig:
diff --git a/operators/bundle.yaml b/operators/bundle.yaml
index 5e336fff694..b85d8ad791b 100644
--- a/operators/bundle.yaml
+++ b/operators/bundle.yaml
@@ -1,3 +1,4 @@
+name: katib
 bundle: kubernetes
 applications:
   katib-controller: { charm: katib-controller,            scale: 1 }
diff --git a/operators/charmcraft.yaml b/operators/charmcraft.yaml
new file mode 100644
index 00000000000..d7a57a879cd
--- /dev/null
+++ b/operators/charmcraft.yaml
@@ -0,0 +1 @@
+type: bundle
diff --git a/operators/katib-controller/src/webhooks.yaml.j2 b/operators/katib-controller/src/webhooks.yaml.j2
index 146281b9d3c..9d7eac12091 100644
--- a/operators/katib-controller/src/webhooks.yaml.j2
+++ b/operators/katib-controller/src/webhooks.yaml.j2
@@ -5,7 +5,6 @@ metadata:
 webhooks:
   - name: validator.experiment.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     # TODO (andreyvelich): Migrate to v1 ?
     admissionReviewVersions:
       - v1beta1
@@ -34,7 +33,6 @@ metadata:
 webhooks:
   - name: defaulter.experiment.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     admissionReviewVersions:
       - v1beta1
     clientConfig:
@@ -56,7 +54,6 @@ webhooks:
           - experiments
   - name: mutator.pod.katib.kubeflow.org
     sideEffects: None
-    failurePolicy: Fail
     admissionReviewVersions:
       - v1beta1
     clientConfig: