diff --git a/provider/indexer-azure/src/main/resources/application.properties b/provider/indexer-azure/src/main/resources/application.properties
index aefae389710f6249f6050016db6f3cb82ea5a2b7..a334813afb2b5cccfe9127b0cf95a9730f9e4f81 100644
--- a/provider/indexer-azure/src/main/resources/application.properties
+++ b/provider/indexer-azure/src/main/resources/application.properties
@@ -36,7 +36,7 @@ KINDS_REDIS_DATABASE=1
 CRON_INDEX_CLEANUP_THRESHOLD_DAYS=3
 CRON_EMPTY_INDEX_CLEANUP_THRESHOLD_DAYS=7
 
-SCHEMA_HOST=${HOST}/api/schema-service/v1/schema
+SCHEMA_HOST=${schema_service_url}/schema
 
 storage_service_url=${storage_service_endpoint}
 STORAGE_SCHEMA_HOST=${storage_service_url}/schemas
diff --git a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
index 41b5ecdff97631c89ccc24f2c9bf15f6e6bf542c..ee2529723c38201d3418e04bf9ffb94d3761aa2c 100644
--- a/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
+++ b/testing/indexer-test-core/src/main/java/org/opengroup/osdu/util/Config.java
@@ -81,7 +81,7 @@ public class Config {
     }
 
     public static String getSchemaBaseURL() {
-        return getEnvironmentVariableOrDefaultValue("SCHEMA_HOST", DEFAULT_SCHEMA_HOST);
+        return getEnvironmentVariableOrDefaultValue("HOST", DEFAULT_SCHEMA_HOST) + "/api/schema-service/v1";
     }
 
     public static String getEntitlementsDomain() {