diff --git a/charts/cdefense/templates/api/config.yaml b/charts/cdefense/templates/api/config.yaml
index e4d3a34..cb6d1bf 100644
--- a/charts/cdefense/templates/api/config.yaml
+++ b/charts/cdefense/templates/api/config.yaml
@@ -36,4 +36,5 @@ data:
   K8_RESOURCES_LIMIT_MEMORY: {{ .Values.api.job.resource.memory.limit }}
   DATAJOB_WEBHOOK_URL: "https://discord.com/api/webhooks/1006160865386582077/HndjuqofW-wYXspUb5_iv-AJN46UojZZvQDksz1a2cgvx1Q1lUJkdZ_IhZrlsh_ytKKO"
   PROFILER_WEBHOOK_URL: "https://discord.com/api/webhooks/1102883054806114375/DwZqyzMTpYf66kMyQ47b7lgFLNFGfqmxQxEBfnfOZtH6cMJIFzoNw17pmQnG9OmNk9Tv"
-  CLOUDDEFENSE_SENDGRID_EMAIL: "support-noreply@clouddefense.ai" 
\ No newline at end of file
+  CLOUDDEFENSE_SENDGRID_EMAIL: "support-noreply@clouddefense.ai" 
+  MICRONAUT_ENVIRONMENTS: {{ .Values.api.environment | default "dev"  }}
\ No newline at end of file
diff --git a/charts/cdefense/templates/api/deployment.yaml b/charts/cdefense/templates/api/deployment.yaml
index 600e722..c8a5139 100644
--- a/charts/cdefense/templates/api/deployment.yaml
+++ b/charts/cdefense/templates/api/deployment.yaml
@@ -331,7 +331,7 @@ spec:
         - name: MICRONAUT_ENVIRONMENTS
           valueFrom:
             configMapKeyRef:
-              name: authservice-config
+              name: scan-server-config
               key: MICRONAUT_ENVIRONMENTS
         - name: CLOUDDEFENSE_BASE_URL
           valueFrom:
diff --git a/charts/cdefense/values.yaml b/charts/cdefense/values.yaml
index e402196..7bd608e 100644
--- a/charts/cdefense/values.yaml
+++ b/charts/cdefense/values.yaml
@@ -80,7 +80,7 @@ authservice:
   tolerations: []
   replicas: 1
   image: cdefense/auth-service
-  environment: prod
+  environment: dev
   realm: cdefense
   service:
     type: NodePort
@@ -93,6 +93,7 @@ api:
   nodeSelector: cdefense
   tolerations: []
   image: cdefense/scan-api
+  environment: prod
   service:
     type: NodePort
     ports: