diff --git a/provider/indexer-aws/src/main/resources/application.properties b/provider/indexer-aws/src/main/resources/application.properties
index 4f635efa59ab042b5ac8cd2f3360095aa414e739..27054c982b98d7ea757b66fefc30694e21b21705 100644
--- a/provider/indexer-aws/src/main/resources/application.properties
+++ b/provider/indexer-aws/src/main/resources/application.properties
@@ -22,13 +22,13 @@ aws.es.certificate.disableTrust=${ELASTIC_DISABLE_CERTIFICATE_TRUST:false}
 
 GAE_SERVICE=indexer
 
-#reusing STORAGE_HOST variable here as the base url to point to schema service
-SCHEMA_HOST=${STORAGE_HOST}/api/schema-service/v1/schema
+#reusing STORAGE_BASE_URL variable here as the base url to point to schema service
+SCHEMA_HOST=${SCHEMA_BASE_URL}/api/schema-service/v1/schema
 
-STORAGE_SCHEMA_HOST=${STORAGE_HOST}/api/storage/v2/schemas
-STORAGE_QUERY_RECORD_HOST=${STORAGE_HOST}/api/storage/v2/query/records
-STORAGE_QUERY_KINDS_HOST=${STORAGE_HOST}/api/storage/v2/query/kinds
-STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${STORAGE_HOST}/api/storage/v2/query/records:batch
+STORAGE_SCHEMA_HOST=${STORAGE_BASE_URL}/api/storage/v2/schemas
+STORAGE_QUERY_RECORD_HOST=${STORAGE_BASE_URL}/api/storage/v2/query/records
+STORAGE_QUERY_KINDS_HOST=${STORAGE_BASE_URL}/api/storage/v2/query/kinds
+STORAGE_QUERY_RECORD_FOR_CONVERSION_HOST=${STORAGE_BASE_URL}/api/storage/v2/query/records:batch
 STORAGE_RECORDS_BATCH_SIZE=20
 INDEXER_QUEUE_HOST=""
 ## AWS ElastiCache configuration