diff --git a/deploy/smithy/chart/values.yaml b/deploy/smithy/chart/values.yaml
index 95a75adf2..44924a781 100644
--- a/deploy/smithy/chart/values.yaml
+++ b/deploy/smithy/chart/values.yaml
@@ -19,8 +19,11 @@ kibana:
     tlsEnabled: false
 
 mongodb:
-  # if set, a MongoDB instance will be deployed
-  enabled: true
+  # if set, a MongoDB instance will be deployed.
+  # Disabled as there's currently an issue with M1-M3 processors and workarounds are necessary
+  # https://github.com/bitnami/containers/issues/53407
+  # It's better to stop leveraging MongoDB locally until the issue is resolved.
+  enabled: false
   # auth:
   #   enabled: true
   #   usernames: ["consumer-mongodb"]
diff --git a/deploy/smithy/values/dev.yaml b/deploy/smithy/values/dev.yaml
index 4da0c0873..82ec26726 100644
--- a/deploy/smithy/values/dev.yaml
+++ b/deploy/smithy/values/dev.yaml
@@ -13,7 +13,7 @@ kibana:
     tlsEnabled: false
 
 mongodb:
-  enabled: true
+  enabled: false
   auth:
     enabled: true
     usernames: ["consumer-mongodb"]
diff --git a/deploy/tektoncd/pipeline/templates/customresourcedefinitions.yaml b/deploy/tektoncd/pipeline/templates/customresourcedefinitions.yaml
index b1043e49e..62b61a3b7 100644
--- a/deploy/tektoncd/pipeline/templates/customresourcedefinitions.yaml
+++ b/deploy/tektoncd/pipeline/templates/customresourcedefinitions.yaml
@@ -11,25 +11,37 @@ metadata:
     helm.sh/chart: '{{ include "tekton.chart" . }}'
     pipeline.tekton.dev/release: v0.44.0
     version: v0.44.0
-  name: verificationpolicies.tekton.dev
+  name: clustertasks.tekton.dev
 spec:
+  conversion:
+    strategy: Webhook
+    webhook:
+      clientConfig:
+        service:
+          name: tekton-pipelines-webhook
+          namespace: tekton-pipelines
+      conversionReviewVersions:
+        - v1beta1
   group: tekton.dev
   names:
     categories:
       - tekton
       - tekton-pipelines
-    kind: VerificationPolicy
-    plural: verificationpolicies
-    singular: verificationpolicy
-  scope: Namespaced
+    kind: ClusterTask
+    plural: clustertasks
+    singular: clustertask
+  preserveUnknownFields: false
+  scope: Cluster
   versions:
-    - name: v1alpha1
+    - name: v1beta1
       schema:
         openAPIV3Schema:
           type: object
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
+      subresources:
+        status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
@@ -43,37 +55,25 @@ metadata:
     helm.sh/chart: '{{ include "tekton.chart" . }}'
     pipeline.tekton.dev/release: v0.44.0
     version: v0.44.0
-  name: clustertasks.tekton.dev
+  name: verificationpolicies.tekton.dev
 spec:
-  conversion:
-    strategy: Webhook
-    webhook:
-      clientConfig:
-        service:
-          name: tekton-pipelines-webhook
-          namespace: tekton-pipelines
-      conversionReviewVersions:
-        - v1beta1
   group: tekton.dev
   names:
     categories:
       - tekton
       - tekton-pipelines
-    kind: ClusterTask
-    plural: clustertasks
-    singular: clustertask
-  preserveUnknownFields: false
-  scope: Cluster
+    kind: VerificationPolicy
+    plural: verificationpolicies
+    singular: verificationpolicy
+  scope: Namespaced
   versions:
-    - name: v1beta1
+    - name: v1alpha1
       schema:
         openAPIV3Schema:
           type: object
           x-kubernetes-preserve-unknown-fields: true
       served: true
       storage: true
-      subresources:
-        status: {}
 ---
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition