diff --git a/kubernetes/helm_charts/sunbird-RC/certificatesign/values.j2 b/kubernetes/helm_charts/sunbird-RC/certificatesign/values.j2
index 31308746dc..f9bf368541 100644
--- a/kubernetes/helm_charts/sunbird-RC/certificatesign/values.j2
+++ b/kubernetes/helm_charts/sunbird-RC/certificatesign/values.j2
@@ -30,7 +30,7 @@ autoscaling:
 certificatesignenv:
   PORT: '"8079"'
   QR_TYPE: {{ QR_TYPE|default('W3C-VC') }}
-  CERTIFICATE_DOMAIN_URL: {{ CERTIFICATE_DOMAIN_URL|default('https://dev.sunbirded.org') }}
+  CERTIFICATE_DOMAIN_URL: "https://{{domain_name}}"
   CERTIFICATE_PUBLIC_KEY: "{{ CERTIFICATE_PUBLIC_KEY|default("''")}}"
   CERTIFICATE_PRIVATE_KEY: "{{ CERTIFICATE_PRIVATE_KEY|default("''")}}"
   SIGNING_KEY_TYPE: "{{ SIGNING_KEY_TYPE|default("''")}}"
diff --git a/kubernetes/helm_charts/sunbird-RC/registry/values.j2 b/kubernetes/helm_charts/sunbird-RC/registry/values.j2
index f56ca3fa0a..d9d6fa538e 100644
--- a/kubernetes/helm_charts/sunbird-RC/registry/values.j2
+++ b/kubernetes/helm_charts/sunbird-RC/registry/values.j2
@@ -33,8 +33,8 @@ rccoreenv:
   connectionInfo_password: {{ connectionInfo_password }}
   elastic_search_enabled: {{ elastic_search_enabled|default('true')}}
   elastic_search_connection_url: {{ elastic_search_connection_url }}
-  search_provider: {{search_provider|default('dev.sunbirdrc.registry.service.ElasticSearchService')}}
-  search_providerName: {{search_providerName|default('dev.sunbirdrc.registry.service.ElasticSearchService')}}
+  search_provider: "{{env}}.sunbirdrc.registry.service.ElasticSearchService"
+  search_providerName: "{{env}}.sunbirdrc.registry.service.ElasticSearchService"
   enable_external_templates: {{ enable_external_templates|default('true') }}
   sign_url: {{ sign_url|default('http://certificatesign-service:8079/sign') }}
   signature_enabled: {{ signature_enabled|default('true') }}