diff --git a/devops/core-plus/pipeline.yml b/devops/core-plus/pipeline.yml
index 31032c3ecc66f8d74c26e33843924880f6aa96e3..8d22caf70573853bb1b9708d66e7f566bf41ba60 100644
--- a/devops/core-plus/pipeline.yml
+++ b/devops/core-plus/pipeline.yml
@@ -68,6 +68,7 @@ core-plus-tests:
     ENVIRONMENT: dev #if this is not specified, it just assumes that the service is running locally
     PARTITION_BASE_URL: http://partition-service-image:8080/ #url where integration tests are hitting
     #CI_DEBUG_SERVICES: "true" #flag for debugging the services in the runner
+    PARTITION_POSTGRES_URL: $PARTITION_POSTGRES_URL
   script:
     - echo "--- Install psql ---"
     - apt-get update && apt-get install -y postgresql-client libpq-dev jq
diff --git a/partition-core-plus/src/main/resources/application.properties b/partition-core-plus/src/main/resources/application.properties
index db632af67281bf4f3c71c2103a8058511bacabfc..936429955547b8f18331a215754ad5dbc80fc86a 100644
--- a/partition-core-plus/src/main/resources/application.properties
+++ b/partition-core-plus/src/main/resources/application.properties
@@ -36,10 +36,10 @@ partition-property-kind=PartitionProperty
 partition-namespace=partition
 
 osmDriver=postgres
-osm.postgres.url=jdbc:postgresql://172.17.0.2:5432/partition_db
+osm.postgres.url=${PARTITION_POSTGRES_URL:jdbc:postgresql://127.0.0.1:5432/partition_db}
 #Username and password to connect to the above url which contains the db name
 #Has to be in sync with the user created using the bootstrapping scripts
-osm.postgres.username=usr_partition_pg
-osm.postgres.password=partition_pg
+osm.postgres.username=${PARTITION_POSTGRESQL_USERNAME:usr_partition_pg}
+osm.postgres.password=${PARTITION_POSTGRESQL_PASSWORD:partition_pg}
 #property used only for mandatory bean creation, not actually used in partition service
-dataPartitionId = test-partition
+dataPartitionId = ${DATA_PARTITION_ID:test-partition}