diff --git a/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml
index d9d4f32ea7..ea2b046e7a 100644
--- a/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/ingress-annotations.prod.yaml
@@ -105,11 +105,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
   MB_SITE_URL: https://metabase-test-ingress-annotations.fabrique.social.gouv.fr
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/packages/kontinuous/tests/__snapshots__/ingress-betagouv.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-betagouv.prod.yaml
deleted file mode 100644
index d54ea0ee4a..0000000000
--- a/packages/kontinuous/tests/__snapshots__/ingress-betagouv.prod.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`test build manifests with snapshots ingress-betagouv.prod 1`] = `
-"apiVersion: v1
-kind: Namespace
-metadata:
-  annotations:
-    field.cattle.io/projectId: \\"1234\\"
-    kontinuous/gitBranch: feature-branch-1
-    kontinuous/mainNamespace: \\"true\\"
-    kapp.k14s.io/exists: \\"\\"
-    kontinuous/chartPath: project.fabrique.contrib.rancher-namespace
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/rancher-namespace/templates/namespace.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-  labels:
-    application: test-ingress-betagouv
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: namespace-test-ingress-betagouv-2w4zjtae
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  name: test-ingress-betagouv
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: netpol-ingress
-  namespace: test-ingress-betagouv
-  annotations:
-    kontinuous/chartPath: project.fabrique.contrib.security-policies
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/security-policies/templates/network-policy.yml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-  labels:
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: networkpolicy-netpol-ingress-61ndxljw
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-spec:
-  ingress:
-    - from:
-        - podSelector: {}
-    - from:
-        - namespaceSelector:
-            matchLabels:
-              network-policy/source: ingress-controller
-    - from:
-        - namespaceSelector:
-            matchLabels:
-              network-policy/source: monitoring
-  podSelector: {}
-  policyTypes:
-    - Ingress
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: default
-  annotations:
-    kontinuous/chartPath: project.fabrique.contrib.security-policies
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/security-policies/templates/service-account.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-  labels:
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: serviceaccount-default-2g5dmk74
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  namespace: test-ingress-betagouv
-automountServiceAccountToken: false
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  labels:
-    component: metabase
-    application: test-ingress-betagouv
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: configmap-metabase-1tfah3wb
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  name: metabase
-  namespace: test-ingress-betagouv
-  annotations:
-    kontinuous/chartPath: project.fabrique.contrib.metabase
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/configmap.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-data:
-  MB_APPLICATION_NAME: metabase
-  MB_DB_TYPE: postgres
-  MB_ADMIN_EMAIL: admin@fabrique.social.gouv.fr
-  MB_ANON_TRACKING_ENABLED: \\"false\\"
-  MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
-  MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
-  MB_ENABLE_EMBEDDING: \\"true\\"
-  MB_ENABLE_PUBLIC_SHARING: \\"true\\"
-  MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
-  MB_SITE_URL: https://some.beta.gouv.fr
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    component: metabase
-    application: test-ingress-betagouv
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: deployment-metabase-5wn3odrk
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  name: metabase
-  namespace: test-ingress-betagouv
-  annotations:
-    kontinuous/chartPath: project.fabrique.contrib.metabase
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/deployment.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/depname.full: project.fabrique.contrib.metabase.deployment.metabase
-    kontinuous/depname.chartResource: metabase.deployment.metabase
-    kontinuous/depname.chartName: metabase
-    kontinuous/depname.chartPath: project.fabrique.contrib.metabase
-    kontinuous/depname.resourcePath: deployment.metabase
-    kontinuous/depname.resourceName: metabase
-    kontinuous/depname.chartNameTopFull: metabase
-    kontinuous/depname.chartNameTop: metabase
-    kontinuous/plugin.log: \\"false\\"
-    reloader.stakater.com/auto: \\"true\\"
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      component: metabase
-  template:
-    metadata:
-      labels:
-        component: metabase
-        kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-        kontinuous/deployment.env: test-ingress-betagouv-prod
-        kontinuous/ref: feature-branch-1
-        kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-        kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-        kontinuous/resourceName: deployment-metabase-5wn3odrk
-        app.kubernetes.io/manifest-managed-by: kontinuous
-        app.kubernetes.io/manifest-created-by: kontinuous
-      annotations:
-        kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    spec:
-      securityContext:
-        runAsUser: 1000
-        runAsGroup: 1000
-        fsGroup: 1000
-        runAsNonRoot: true
-      containers:
-        - image: metabase/metabase:v0.46.6.1
-          name: metabase
-          securityContext:
-            allowPrivilegeEscalation: false
-          envFrom:
-            - configMapRef:
-                name: metabase
-          ports:
-            - containerPort: 3000
-              name: http
-          startupProbe:
-            failureThreshold: 30
-            httpGet:
-              path: /api/health
-              port: http
-            periodSeconds: 10
-            initialDelaySeconds: 60
-            successThreshold: 1
-            timeoutSeconds: 10
-          readinessProbe:
-            failureThreshold: 15
-            httpGet:
-              path: /api/health
-              port: http
-            initialDelaySeconds: 1
-            periodSeconds: 5
-            successThreshold: 1
-            timeoutSeconds: 1
-          livenessProbe:
-            failureThreshold: 6
-            httpGet:
-              path: /api/health
-              port: http
-            initialDelaySeconds: 30
-            periodSeconds: 5
-            timeoutSeconds: 5
-          resources:
-            limits:
-              cpu: 1000m
-              memory: 2048Mi
-            requests:
-              cpu: 500m
-              memory: 512Mi
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    component: metabase
-    application: test-ingress-betagouv
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: service-metabase-5idimw41
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  name: metabase
-  namespace: test-ingress-betagouv
-  annotations:
-    kontinuous/chartPath: project.fabrique.contrib.metabase
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/service.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-spec:
-  ports:
-    - name: http
-      port: 80
-      targetPort: 3000
-  selector:
-    component: metabase
-  type: ClusterIP
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    kontinuous/chartPath: project.fabrique.contrib.metabase
-    kontinuous/source: project/charts/fabrique/charts/contrib/charts/metabase/templates/ingress.yaml
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    cert-manager.io: cluster-issuer
-    cert-manager.io/cluster-issuer: letsencrypt-prod
-    kubernetes.io/tls-acme: \\"true\\"
-  labels:
-    component: metabase
-    application: test-ingress-betagouv
-    kontinuous/deployment: test-ingress-betagouv-feature-branch-1-ffac537e6cbbf9-kk9zkm6i
-    kontinuous/deployment.env: test-ingress-betagouv-prod
-    kontinuous/ref: feature-branch-1
-    kontinuous/gitSha: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/appVersion: ffac537e6cbbf934b08745a378932722df287a53
-    kontinuous/resourceName: ingress-metabase-5ybj4te8
-    app.kubernetes.io/manifest-managed-by: kontinuous
-    app.kubernetes.io/manifest-created-by: kontinuous
-  name: metabase
-  namespace: test-ingress-betagouv
-spec:
-  rules:
-    - host: some.beta.gouv.fr
-      http:
-        paths:
-          - backend:
-              service:
-                name: metabase
-                port:
-                  name: http
-            path: /
-            pathType: Prefix
-  tls:
-    - hosts:
-        - some.beta.gouv.fr
-      secretName: metabase-crt
-"
-`;
diff --git a/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml
index 0226b7a822..8fdcb71f7b 100644
--- a/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/ingress-custom-annotations.prod.yaml
@@ -105,11 +105,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
-  MB_SITE_URL: https://metabase-test-ingress-custom-annotations.fabrique.social.gouv.fr
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
+  MB_SITE_URL: https://some.beta.gouv.fr
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -267,7 +270,7 @@ metadata:
   namespace: test-ingress-custom-annotations
 spec:
   rules:
-    - host: metabase-test-ingress-custom-annotations.fabrique.social.gouv.fr
+    - host: some.beta.gouv.fr
       http:
         paths:
           - backend:
@@ -279,7 +282,7 @@ spec:
             pathType: Prefix
   tls:
     - hosts:
-        - metabase-test-ingress-custom-annotations.fabrique.social.gouv.fr
+        - some.beta.gouv.fr
       secretName: metabase-crt
 "
 `;
diff --git a/packages/kontinuous/tests/__snapshots__/ingress-custom-certs.prod.yaml b/packages/kontinuous/tests/__snapshots__/ingress-custom-certs.prod.yaml
index 4f80cc6523..83781d75b3 100644
--- a/packages/kontinuous/tests/__snapshots__/ingress-custom-certs.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/ingress-custom-certs.prod.yaml
@@ -105,11 +105,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
   MB_SITE_URL: https://some.external.host
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/packages/kontinuous/tests/__snapshots__/metabase.prod.yaml b/packages/kontinuous/tests/__snapshots__/metabase.prod.yaml
index 1876bb52aa..9b33490f93 100644
--- a/packages/kontinuous/tests/__snapshots__/metabase.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/metabase.prod.yaml
@@ -105,11 +105,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
   MB_SITE_URL: https://metabase-app1-test-metabase.fabrique.social.gouv.fr
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -138,11 +141,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
   MB_SITE_URL: https://metabase-app2-test-metabase.fabrique.social.gouv.fr
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 kind: ConfigMap
 apiVersion: v1
diff --git a/packages/kontinuous/tests/__snapshots__/oauth2-proxy-metabase.prod.yaml b/packages/kontinuous/tests/__snapshots__/oauth2-proxy-metabase.prod.yaml
index 676b45ec79..c2a8891b8c 100644
--- a/packages/kontinuous/tests/__snapshots__/oauth2-proxy-metabase.prod.yaml
+++ b/packages/kontinuous/tests/__snapshots__/oauth2-proxy-metabase.prod.yaml
@@ -105,11 +105,14 @@ data:
   MB_ANON_TRACKING_ENABLED: \\"false\\"
   MB_APPLICATION_LOGO_URL: https://socialgouv.github.io/support/_media/marianne.jpeg
   MB_EMAIL_FROM_ADDRESS: contact@fabrique.social.gouv.fr
+  MB_EMAIL_FROM_NAME: Fabrique numérique des ministères sociaux
   MB_ENABLE_EMBEDDING: \\"true\\"
   MB_ENABLE_PUBLIC_SHARING: \\"true\\"
   MB_SITE_LOCALE: fr
-  MB_SITE_NAME: Fabrique des ministères sociaux
+  MB_START_OF_WEEK: monday
+  MB_SITE_NAME: Fabrique numérique des ministères sociaux
   MB_SITE_URL: https://metabase-test-oauth2-proxy-metabase.fabrique.social.gouv.fr
+  MB_PASSWORD_COMPLEXITY: strong
 ---
 apiVersion: apps/v1
 kind: Deployment
diff --git a/packages/kontinuous/tests/samples/ingress-betagouv/config.yaml b/packages/kontinuous/tests/samples/ingress-betagouv/config.yaml
deleted file mode 100644
index ff779aad47..0000000000
--- a/packages/kontinuous/tests/samples/ingress-betagouv/config.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-dependencies:
-  fabrique:
-    import: socialgouv/kontinuous/plugins/fabrique
\ No newline at end of file
diff --git a/packages/kontinuous/tests/samples/ingress-betagouv/env/prod/values.yaml b/packages/kontinuous/tests/samples/ingress-betagouv/env/prod/values.yaml
deleted file mode 100644
index 4b20e3fe00..0000000000
--- a/packages/kontinuous/tests/samples/ingress-betagouv/env/prod/values.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-metabase:
-  enabled: true
-  host: some.beta.gouv.fr
diff --git a/packages/kontinuous/tests/samples/ingress-custom-annotations/env/prod/values.yaml b/packages/kontinuous/tests/samples/ingress-custom-annotations/env/prod/values.yaml
index e5a23f2573..66203e967b 100644
--- a/packages/kontinuous/tests/samples/ingress-custom-annotations/env/prod/values.yaml
+++ b/packages/kontinuous/tests/samples/ingress-custom-annotations/env/prod/values.yaml
@@ -1,5 +1,6 @@
 metabase:
   enabled: true
+  host: some.beta.gouv.fr
   ingress:
     annotations:
       some: annotation
diff --git a/plugins/contrib/charts/metabase/templates/configmap.yaml b/plugins/contrib/charts/metabase/templates/configmap.yaml
index 5857d2f5ac..eeb2481d68 100644
--- a/plugins/contrib/charts/metabase/templates/configmap.yaml
+++ b/plugins/contrib/charts/metabase/templates/configmap.yaml
@@ -13,8 +13,12 @@ data:
   MB_ANON_TRACKING_ENABLED: "false"
   MB_APPLICATION_LOGO_URL: "https://socialgouv.github.io/support/_media/marianne.jpeg"
   MB_EMAIL_FROM_ADDRESS: "contact@fabrique.social.gouv.fr"
+  MB_EMAIL_FROM_NAME: "Fabrique numérique des ministères sociaux"
   MB_ENABLE_EMBEDDING: "true"
   MB_ENABLE_PUBLIC_SHARING: "true"
   MB_SITE_LOCALE: "fr"
-  MB_SITE_NAME: "Fabrique des ministères sociaux"
+  MB_START_OF_WEEK: "monday"
+  MB_SITE_NAME: "Fabrique numérique des ministères sociaux"
   MB_SITE_URL: "https://{{ include "contrib-helpers.ingress-host" . }}"
+  MB_PASSWORD_COMPLEXITY: strong
+
diff --git a/plugins/contrib/charts/metabase/templates/deployment.yaml b/plugins/contrib/charts/metabase/templates/deployment.yaml
index 279a4a9bea..9c88544bbb 100644
--- a/plugins/contrib/charts/metabase/templates/deployment.yaml
+++ b/plugins/contrib/charts/metabase/templates/deployment.yaml
@@ -6,7 +6,12 @@ metadata:
     application: {{ .Values.global.repositoryName }}
   name: {{ (or .Values.component .Chart.Name) | lower }}
   namespace: {{ or .Values.namespace .Values.global.namespace }}
-  annotations: {}
+  annotations:
+    {{ if .Values.annotations }}
+    {{ range $key, $val := .Values.annotations }}
+    "{{ $key }}": {{ $val | quote }}
+    {{ end }}
+    {{ end }}
 spec:
   replicas: 1
   selector:
@@ -23,7 +28,7 @@ spec:
         fsGroup: 1000
         runAsNonRoot: true
       containers:
-        # renovate: datasource=docker depName=metabase/metabase versioning=v0.45.3
+        # renovate: datasource=docker depName=metabase/metabase versioning=v0.46.6.1
         - image: metabase/metabase:v0.46.6.1
           name: metabase
           securityContext:
diff --git a/plugins/contrib/charts/metabase/templates/ingress.yaml b/plugins/contrib/charts/metabase/templates/ingress.yaml
index ccb80e6e80..be5afb93c3 100644
--- a/plugins/contrib/charts/metabase/templates/ingress.yaml
+++ b/plugins/contrib/charts/metabase/templates/ingress.yaml
@@ -4,9 +4,16 @@ kind: Ingress
 metadata:
   annotations:
     kubernetes.io/ingress.class: nginx
-    {{ range $key, $val := (merge dict .Values.global.ingress.annotations .Values.ingress.annotations) }}
+    {{ if .Values.global.ingress.annotations }}
+    {{ range $key, $val := (merge dict .Values.global.ingress.annotations) }}
     "{{ $key }}": {{ $val | quote }}
     {{ end }}
+    {{ end }}
+    {{ if .Values.ingress.annotations }}
+    {{ range $key, $val := (merge dict .Values.ingress.annotations) }}
+    "{{ $key }}": {{ $val | quote }}
+    {{ end }}
+    {{ end }}
   labels:
     component: {{ (or .Values.component .Chart.Name) | lower }}
     application: {{ .Values.global.repositoryName }}
diff --git a/plugins/contrib/charts/metabase/values.yaml b/plugins/contrib/charts/metabase/values.yaml
index 1a6a4d394c..b3ec8a70ec 100644
--- a/plugins/contrib/charts/metabase/values.yaml
+++ b/plugins/contrib/charts/metabase/values.yaml
@@ -7,6 +7,7 @@ envFrom: []
 ingress:
   enabled: true
   annotations: {}
+annotations: {}
 
 matomo:
   cronjob: