diff --git a/provider/indexer-ibm/src/main/resources/application.properties b/provider/indexer-ibm/src/main/resources/application.properties
index 05e97d3b977e3e3496287a1e19c429c22e170c2e..ca710ec1fd14c689294eb175cce214a4f733f30e 100644
--- a/provider/indexer-ibm/src/main/resources/application.properties
+++ b/provider/indexer-ibm/src/main/resources/application.properties
@@ -3,16 +3,15 @@ server.servlet.contextPath=/api/indexer/v2/
 LOG_PREFIX=indexer
 
 logging.level.org.springframework.web=DEBUG
-server.port=8084
+server.port=8080
 JAVA_HEAP_OPTS=-Xms4096M -Xmx4096M
 JAVA_GC_OPTS=-XX:+UseG1GC -XX:+UseStringDeduplication -XX:InitiatingHeapOccupancyPercent=45
 
 DEFAULT_DATA_COUNTRY=US
 
-AUTHORIZE_API=https://entitlements-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/entitlements/v1
+AUTHORIZE_API=https://entitlements:8080/api/entitlements/v1
 AUTHORIZE_API_KEY=tobeupdated
-#LEGALTAG_API=https://os-legal-ibm-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud/api/legal/v1
-LEGALTAG_API=http://localhost:8081/api/legal/v1
+LEGALTAG_API=http://legal:8080/api/legal/v1
 
 DEPLOYMENT_ENVIRONMENT=CLOUD
 
@@ -42,7 +41,7 @@ ibm.tenant.cloudant.apikey=${ibm.cloudant.apikey}
 
 ibm.rabbitmq.uri=REPLACE_ME
 
-ibm.keycloak.endpoint_url=keycloak-osdu-r2.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud
+ibm.keycloak.endpoint_url=keycloak-host.com
 ibm.keycloak.realm=OSDU
 ibm.keycloak.client_id=osdu-login
 ibm.keycloak.username=REPLACE_ME
@@ -55,6 +54,6 @@ indexer.queue.key=abcd
 ELASTIC_DATASTORE_KIND=SearchSettings
 ELASTIC_DATASTORE_ID=indexer-service
 
-ELASTIC_HOST=elasticsearch-instance-osdu-es.osduadev-a1c3eaf78a86806e299f5f3f207556f0-0000.us-south.containers.appdomain.cloud
+ELASTIC_HOST=elasticsearch.com
 ELASTIC_PORT=443
 ELASTIC_USER_PASSWORD=REPLACE_ME:REPLACE_ME