diff --git a/charts/cdefense/templates/api/config.yaml b/charts/cdefense/templates/api/config.yaml
index 27f098a..08ecab8 100644
--- a/charts/cdefense/templates/api/config.yaml
+++ b/charts/cdefense/templates/api/config.yaml
@@ -40,4 +40,4 @@ data:
   CLOUDDEFENSE_SENDGRID_EMAIL: "support-noreply@clouddefense.ai" 
   MICRONAUT_ENVIRONMENTS: {{ .Values.api.environment | default "dev"  }}
   ALERT_SERVICE_URL: "http://alertservice"
-  CUSTOM_ALLOWED_ORIGIN: "https://cdefense.clouddefenseai.com"
\ No newline at end of file
+  CUSTOM_ALLOWED_ORIGIN: {{ .Values.api.origin | default "https://cdefense.clouddefenseai.com" }}
\ No newline at end of file
diff --git a/charts/cdefense/templates/authservice/config.yaml b/charts/cdefense/templates/authservice/config.yaml
index 232e5ab..a32da83 100644
--- a/charts/cdefense/templates/authservice/config.yaml
+++ b/charts/cdefense/templates/authservice/config.yaml
@@ -7,5 +7,4 @@ metadata:
 data:
   AUTH_DEPLOYMENT_MODE_DOCKER: "true"
   NEW_RELIC_APP_NAME: cdefense
-  DOMAIN: "cdefense.clouddefenseai.com"
-  CUSTOM_ALLOWED_ORIGIN: "https://cdefense.clouddefenseai.com"
\ No newline at end of file
+  DOMAIN: "cdefense.clouddefenseai.com"
\ No newline at end of file
diff --git a/charts/cdefense/templates/authservice/deployment.yaml b/charts/cdefense/templates/authservice/deployment.yaml
index c536d80..8c86ff2 100644
--- a/charts/cdefense/templates/authservice/deployment.yaml
+++ b/charts/cdefense/templates/authservice/deployment.yaml
@@ -109,7 +109,7 @@ spec:
           - name: CUSTOM_ALLOWED_ORIGIN
             valueFrom:
               configMapKeyRef:
-                name: authservice-config
+                name: scan-server-config
                 key: CUSTOM_ALLOWED_ORIGIN
           - name: CLOUDDEFENSE_EMAIL_SENDGRID_KEY
             valueFrom:
diff --git a/charts/cdefense/values.yaml b/charts/cdefense/values.yaml
index 165778c..3308a29 100644
--- a/charts/cdefense/values.yaml
+++ b/charts/cdefense/values.yaml
@@ -108,6 +108,7 @@ api:
     bucket: cdefense-dast-curl
   fullscan:
     image: cdefense/fullscan
+  origin: "https://cdefense.clouddefenseai.com"
   data:
     region: us-east-1
     bucket: cdefense-vulnerability-new-data