diff --git a/ansible/roles/stack-sunbird/templates/inbound.env b/ansible/roles/stack-sunbird/templates/inbound.env
index 331ae1d3fcc09c321400cd63fb41fcc8c1d2c7a7..d8b3bcba554c1f32b7ec5eae9e3d9e8c98aecd83 100644
--- a/ansible/roles/stack-sunbird/templates/inbound.env
+++ b/ansible/roles/stack-sunbird/templates/inbound.env
@@ -59,10 +59,10 @@ NETCORE_WHATSAPP_SOURCE={{uci_netcore_whatsapp_source}}
 NETCORE_WHATSAPP_URI={{uci_netcore_whatsapp_uri | default('https://waapi.pepipost.com/api/v2/')}}
 
 #Sunbird CDN Configuration
-SUNBIRD_CLOUD_MEDIA_STORAGE_TYPE=azure
-SUNBIRD_CLOUD_MEDIA_STORAGE_KEY={{sunbird_private_storage_account_name}}
-SUNBIRD_CLOUD_MEDIA_STORAGE_SECRET={{sunbird_private_storage_account_key}}
-SUNBIRD_CLOUD_MEDIA_STORAGE_CONTAINER={{sunbird_azure_uci_container_name | default('uci-' + env )}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_TYPE={{cloud_service_provider}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_KEY={{cloud_public_storage_accountname}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_SECRET={{cloud_public_storage_secret}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_CONTAINER={{cloud_storage_uci_bucketname | default('uci-' + env )}}
 
 #Selected CDN Configuration
 SELECTED_FILE_CDN=sunbird
diff --git a/ansible/roles/stack-sunbird/templates/transformer.env b/ansible/roles/stack-sunbird/templates/transformer.env
index b5be5c445125c42c7ffcb53d42bc97e8165dcce1..f8bcde12dc10e682a9c6e73223ccd11b8d19fb5e 100644
--- a/ansible/roles/stack-sunbird/templates/transformer.env
+++ b/ansible/roles/stack-sunbird/templates/transformer.env
@@ -71,10 +71,10 @@ EXHAUST_TELEMETRY_ENABLED=TRUE
 POSTHOG_EVENT_ENABLED=FALSE
 
 #Sunbird CDN Configuration
-SUNBIRD_CLOUD_MEDIA_STORAGE_TYPE=azure
-SUNBIRD_CLOUD_MEDIA_STORAGE_KEY={{sunbird_private_storage_account_name}}
-SUNBIRD_CLOUD_MEDIA_STORAGE_SECRET={{sunbird_private_storage_account_key}}
-SUNBIRD_CLOUD_MEDIA_STORAGE_CONTAINER={{sunbird_azure_uci_container_name | default('uci-' + env )}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_TYPE={{cloud_service_provider}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_KEY={{cloud_public_storage_accountname}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_SECRET={{cloud_public_storage_secret}}
+SUNBIRD_CLOUD_MEDIA_STORAGE_CONTAINER={{cloud_storage_uci_bucketname | default('uci-' + env )}}
 
 #Selected CDN Configuration
 SELECTED_FILE_CDN=sunbird
\ No newline at end of file