diff --git a/.github/workflows/deploy-to-staging.yml b/.github/workflows/deploy-to-staging.yml
index dc63cb7..7859f1c 100644
--- a/.github/workflows/deploy-to-staging.yml
+++ b/.github/workflows/deploy-to-staging.yml
@@ -110,10 +110,10 @@ jobs:
             --namespace=${{ env.NAMESPACE }} \
             -f ./charts/backoffice/values.staging.yaml \
             --set image.tag=${{ github.ref_name }}-${{ github.sha }} \
-            --set secrets.databaseURL=dummy \
-            --set secrets.nextauthSecret=dummy \
-            --set secrets.googleClientID=dummy \
-            --set secrets.googleClientSecret=dummy \
+            --set backoffice.secrets.databaseURL=dummy \
+            --set backoffice.secrets.nextauthSecret=dummy \
+            --set backoffice.secrets.googleClientID=dummy \
+            --set backoffice.secrets.googleClientSecret=dummy \
             backoffice \
             ./charts/backoffice
 
@@ -129,9 +129,9 @@ jobs:
             --namespace=${{ env.NAMESPACE }} \
             -f ./charts/backoffice/values.staging.yaml \
             --set image.tag=${{ github.ref_name }}-${{ github.sha }} \
-            --set secrets.databaseURL=${{ secrets.DATABASE_URL }} \
-            --set secrets.nextauthSecret=${{ secrets.NEXTAUTH_SECRET }} \
-            --set secrets.googleClientID=${{ secrets.GOOGLE_CLIENT_ID }} \
-            --set secrets.googleClientSecret=${{ secrets.GOOGLE_CLIENT_SECRET }} \
+            --set backoffice.secrets.databaseURL=${{ secrets.DATABASE_URL }} \
+            --set backoffice.secrets.nextauthSecret=${{ secrets.NEXTAUTH_SECRET }} \
+            --set backoffice.secrets.googleClientID=${{ secrets.GOOGLE_CLIENT_ID }} \
+            --set backoffice.secrets.googleClientSecret=${{ secrets.GOOGLE_CLIENT_SECRET }} \
             backoffice \
             ./charts/backoffice
diff --git a/charts/backoffice/templates/configmap.yaml b/charts/backoffice/templates/configmap.yaml
index 5bc9d64..523dcc4 100644
--- a/charts/backoffice/templates/configmap.yaml
+++ b/charts/backoffice/templates/configmap.yaml
@@ -6,6 +6,6 @@ metadata:
     "helm.sh/hook": pre-install,pre-upgrade
     "helm.sh/hook-weight": "-15"
 data:
-  NODE_ENV: {{ .Values.env }}
+  NODE_ENV: {{ .Values.backoffice.env }}
   NEXTAUTH_URL: "https://{{ .Values.ingress.host }}/"
   PORT: {{ .Values.service.portNumber | quote }}
diff --git a/charts/backoffice/values.staging.yaml b/charts/backoffice/values.staging.yaml
index a19b524..40df05c 100644
--- a/charts/backoffice/values.staging.yaml
+++ b/charts/backoffice/values.staging.yaml
@@ -5,4 +5,5 @@ ingress:
     cert-manager.io/cluster-issuer: letsencrypt-prod
     cert-manager.io/issuer: letsencrypt-prod
 
-env: staging
+backoffice:
+  env: staging
diff --git a/charts/backoffice/values.yaml b/charts/backoffice/values.yaml
index 492a3fe..1a29284 100644
--- a/charts/backoffice/values.yaml
+++ b/charts/backoffice/values.yaml
@@ -29,10 +29,11 @@ resources:
     cpu: 100m
     memory: 128Mi
 
-env: null
+backoffice:
+  env: null
 
-secrets:
-  databaseURL: null
-  nextauthSecret: null
-  googleClientID: null
-  googleClientSecret: null
+  secrets:
+    databaseURL: null
+    nextauthSecret: null
+    googleClientID: null
+    googleClientSecret: null