diff --git a/getting-started/assets/cloud_providers/deploy-aws.sh b/getting-started/assets/cloud_providers/deploy-aws.sh
index 53eac40163..82e811fb37 100644
--- a/getting-started/assets/cloud_providers/deploy-aws.sh
+++ b/getting-started/assets/cloud_providers/deploy-aws.sh
@@ -67,9 +67,10 @@ do
 done
 
 POSTGRES_ADDR=$(echo $DESCRIBE_DB | jq -r '.["DBInstances"][0]["Endpoint"]' | jq -r '"\(.Address):\(.Port)"')
-
-FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR/{realm}" | sed 's/[&/\]/\\&/g')
-sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+export QUARKUS_DATASOURCE_JDBC_URL=$(printf '%s' "jdbc:postgresql://$POSTGRES_ADDR/POLARIS")
+export QUARKUS_DATASOURCE_USERNAME=postgres
+export QUARKUS_DATASOURCE_PASSWORD=postgres
+echo ($QUARKUS_DATASOURCE_JDBC_URL)
 
 S3_BUCKET_NAME="polaris-quickstart-s3-$RANDOM_SUFFIX"
 echo "S3 Bucket Name: $S3_BUCKET_NAME"
@@ -83,4 +84,4 @@ export STORAGE_LOCATION="s3://$S3_BUCKET_NAME/quickstart_catalog/"
        -Dquarkus.container-image.build=true \
        --no-build-cache
 
-docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
+docker compose -f getting-started/jdbc/docker-compose-bootstrap-db.yml -f getting-started/jdbc/docker-compose.yml up -d
diff --git a/getting-started/assets/cloud_providers/deploy-azure.sh b/getting-started/assets/cloud_providers/deploy-azure.sh
index 376ef6a3c6..764c18dc53 100644
--- a/getting-started/assets/cloud_providers/deploy-azure.sh
+++ b/getting-started/assets/cloud_providers/deploy-azure.sh
@@ -29,9 +29,10 @@ CREATE_DB_RESPONSE=$(az postgres flexible-server create -l $CURRENT_REGION -g $C
 az postgres flexible-server db create -g $CURRENT_RESOURCE_GROUP -s $INSTANCE_NAME -d POLARIS
 
 POSTGRES_ADDR=$(echo $CREATE_DB_RESPONSE | jq -r '.host')
-
-FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR:5432/{realm}" | sed 's/[&/\]/\\&/g')
-sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+export QUARKUS_DATASOURCE_JDBC_URL=$(printf '%s' "jdbc:postgresql://$POSTGRES_ADDR/POLARIS")
+export QUARKUS_DATASOURCE_USERNAME=postgres
+export QUARKUS_DATASOURCE_PASSWORD=postgres
+echo ($QUARKUS_DATASOURCE_JDBC_URL)
 
 STORAGE_ACCOUNT_NAME="polaristest$RANDOM_SUFFIX"
 STORAGE_CONTAINER_NAME="polaris-test-container-$RANDOM_SUFFIX"
@@ -70,4 +71,4 @@ EOF
        -Dquarkus.container-image.build=true \
        --no-build-cache
 
-docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
+docker compose -f getting-started/jdbc/docker-compose-bootstrap-db.yml -f getting-started/jdbc/docker-compose.yml up -d
diff --git a/getting-started/assets/cloud_providers/deploy-gcp.sh b/getting-started/assets/cloud_providers/deploy-gcp.sh
index 5a8bb35338..e6ed2cfb45 100644
--- a/getting-started/assets/cloud_providers/deploy-gcp.sh
+++ b/getting-started/assets/cloud_providers/deploy-gcp.sh
@@ -36,10 +36,10 @@ gcloud sql instances create $DB_INSTANCE_NAME \
 
 gcloud sql databases create POLARIS --instance=$DB_INSTANCE_NAME
 
-POSTGRES_ADDR=$(gcloud sql instances describe $DB_INSTANCE_NAME --format="get(ipAddresses[0].ipAddress)")
-
-FULL_POSTGRES_ADDR=$(printf '%s\n' "jdbc:postgresql://$POSTGRES_ADDR:5432/{realm}" | sed 's/[&/\]/\\&/g')
-sed -i "/jakarta.persistence.jdbc.url/ s|value=\"[^\"]*\"|value=\"$FULL_POSTGRES_ADDR\"|" "getting-started/assets/eclipselink/persistence.xml"
+export QUARKUS_DATASOURCE_JDBC_URL=$(printf '%s' "jdbc:postgresql://$POSTGRES_ADDR/POLARIS")
+export QUARKUS_DATASOURCE_USERNAME=postgres
+export QUARKUS_DATASOURCE_PASSWORD=postgres
+echo ($QUARKUS_DATASOURCE_JDBC_URL)
 
 GCS_BUCKET_NAME="polaris-test-gcs-$RANDOM_SUFFIX"
 echo "GCS Bucket Name: $GCS_BUCKET_NAME"
@@ -52,4 +52,4 @@ export STORAGE_LOCATION="gs://$GCS_BUCKET_NAME/quickstart_catalog/"
        -Dquarkus.container-image.build=true \
        --no-build-cache
 
-docker compose -f getting-started/eclipselink/docker-compose-bootstrap-db.yml -f getting-started/eclipselink/docker-compose.yml up -d
\ No newline at end of file
+docker compose -f getting-started/jdbc/docker-compose-bootstrap-db.yml -f getting-started/jdbc/docker-compose.yml up -d
diff --git a/getting-started/jdbc/README.md b/getting-started/jdbc/README.md
index 15dcaed2a2..ca2b181ee1 100644
--- a/getting-started/jdbc/README.md
+++ b/getting-started/jdbc/README.md
@@ -37,6 +37,9 @@ This example requires `jq` to be installed on your machine.
 2. Start the docker compose group by running the following command from the root of the repository:
 
     ```shell
+    export QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://postgres:5432/POLARIS
+    export QUARKUS_DATASOURCE_USERNAME=postgres
+    export QUARKUS_DATASOURCE_PASSWORD=postgres
     docker compose -f getting-started/jdbc/docker-compose-bootstrap-db.yml -f getting-started/assets/postgres/docker-compose-postgres.yml -f getting-started/jdbc/docker-compose.yml up
     ```
 
diff --git a/getting-started/jdbc/docker-compose-bootstrap-db.yml b/getting-started/jdbc/docker-compose-bootstrap-db.yml
index a98da5bc44..d23235b2d5 100644
--- a/getting-started/jdbc/docker-compose-bootstrap-db.yml
+++ b/getting-started/jdbc/docker-compose-bootstrap-db.yml
@@ -19,14 +19,13 @@
 
 services:
   polaris-bootstrap:
-    # IMPORTANT: the image MUST contain the Postgres JDBC driver and EclipseLink dependencies, see README for instructions
     image: apache/polaris-admin-tool:postgres-latest
     environment:
-      polaris.persistence.type: relational-jdbc
-      quarkus.datasource.db-kind: pgsql
-      quarkus.datasource.jdbc.url: jdbc:postgresql://postgres:5432/POLARIS
-      quarkus.datasource.username: postgres
-      quarkus.datasource.password: postgres
+      - POLARIS_PERSISTENCE_TYPE=relational-jdbc
+      - QUARKUS_DATASOURCE_DB_KIND=pgsql
+      - QUARKUS_DATASOURCE_JDBC_URL=${QUARKUS_DATASOURCE_JDBC_URL}
+      - QUARKUS_DATASOURCE_USERNAME=${QUARKUS_DATASOURCE_USERNAME}
+      - QUARKUS_DATASOURCE_PASSWORD=${QUARKUS_DATASOURCE_PASSWORD}
     command:
       - "bootstrap"
       - "--realm=POLARIS"
diff --git a/getting-started/jdbc/docker-compose.yml b/getting-started/jdbc/docker-compose.yml
index 924f20daf3..8b2a2dd769 100644
--- a/getting-started/jdbc/docker-compose.yml
+++ b/getting-started/jdbc/docker-compose.yml
@@ -29,15 +29,15 @@ services:
       # Optional, allows attaching a debugger to the Polaris JVM
       - "5005:5005"
     environment:
-      JAVA_DEBUG: "true"
-      JAVA_DEBUG_PORT: "*:5005"
-      polaris.persistence.type: relational-jdbc
-      quarkus.datasource.db-kind: pgsql
-      quarkus.datasource.jdbc.url: jdbc:postgresql://postgres:5432/POLARIS
-      quarkus.datasource.username: postgres
-      quarkus.datasource.password: postgres
-      polaris.realm-context.realms: POLARIS
-      quarkus.otel.sdk.disabled: "true"
+      - JAVA_DEBUG=true
+      - JAVA_DEBUG_PORT=*:5005
+      - POLARIS_PERSISTENCE_TYPE=relational-jdbc
+      - QUARKUS_DATASOURCE_DB_KIND=pgsql
+      - QUARKUS_DATASOURCE_JDBC_URL=${QUARKUS_DATASOURCE_JDBC_URL}
+      - QUARKUS_DATASOURCE_USERNAME=${QUARKUS_DATASOURCE_USERNAME}
+      - QUARKUS_DATASOURCE_PASSWORD=${QUARKUS_DATASOURCE_PASSWORD}
+      - POLARIS_REALM_CONTEXT_REALMS=POLARIS
+      - QUARKUS_OTEL_SDK_DISABLED=true
     healthcheck:
       test: ["CMD", "curl", "http://localhost:8182/q/health"]
       interval: 2s