diff --git a/.github/workflows/jpa-boot-read-replica-postgresql.yml b/.github/workflows/jpa-boot-read-replica-postgresql.yml
index 4ca1bc661..19508175c 100644
--- a/.github/workflows/jpa-boot-read-replica-postgresql.yml
+++ b/.github/workflows/jpa-boot-read-replica-postgresql.yml
@@ -33,7 +33,7 @@ jobs:
           cache: "maven"
       - name: Start up databases via docker compose
         run: |
-          docker compose up -d postgresql-master postgresql-slave
+          docker compose -f docker/docker-compose.yml up -d postgresql-master postgresql-slave
           sleep 5
           docker ps -a
       - name: Build and analyze
diff --git a/.vscode/launch.json b/.vscode/launch.json
index fd5cad552..516c647fd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -292,6 +292,16 @@
             "projectName": "boot-scheduler-quartz",
             "args": "--spring.profiles.active=local",
             "envFile": "${workspaceFolder}/.env"
+        },
+        {
+            "type": "java",
+            "name": "Spring Boot-ReadReplicaApplication<boot-read-replica-postgresql>",
+            "request": "launch",
+            "cwd": "${workspaceFolder}",
+            "mainClass": "com.example.demo.readreplica.ReadReplicaApplication",
+            "projectName": "boot-read-replica-postgresql",
+            "args": "",
+            "envFile": "${workspaceFolder}/.env"
         }
     ]
 }
diff --git a/jpa/boot-read-replica-postgresql/docker-compose.yaml b/jpa/boot-read-replica-postgresql/docker-compose.yaml
deleted file mode 100644
index 3e7644958..000000000
--- a/jpa/boot-read-replica-postgresql/docker-compose.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-services:
-  postgresql-master:
-    image: 'bitnami/postgresql:latest'
-    ports:
-      - '5432:5432'
-    volumes:
-      - 'postgresql_master_data:/bitnami/postgresql'
-    environment:
-      - POSTGRESQL_PGAUDIT_LOG=READ,WRITE
-      - POSTGRESQL_LOG_HOSTNAME=TRUE
-      - POSTGRESQL_REPLICATION_MODE=master
-      - POSTGRESQL_REPLICATION_USER=repl_user
-      - POSTGRESQL_REPLICATION_PASSWORD=repl_password
-      - POSTGRESQL_USERNAME=postgres_write
-      - POSTGRESQL_PASSWORD=postgres_write
-      - POSTGRESQL_DATABASE=my_database
-  postgresql-slave:
-    image: 'bitnami/postgresql:latest'
-    ports:
-      - '15432:5432'
-    depends_on:
-      - postgresql-master
-    environment:
-      - POSTGRESQL_REPLICATION_MODE=slave
-      - POSTGRESQL_REPLICATION_USER=repl_user
-      - POSTGRESQL_REPLICATION_PASSWORD=repl_password
-      - POSTGRESQL_MASTER_HOST=postgresql-master
-      - POSTGRESQL_USERNAME=postgres_write
-      - POSTGRESQL_PASSWORD=postgres_write
-      - POSTGRESQL_MASTER_PORT_NUMBER=5432
-      - POSTGRESQL_PGAUDIT_LOG=READ,WRITE
-      - POSTGRESQL_LOG_HOSTNAME=TRUE
-
-  pgadmin4:
-    image: dpage/pgadmin4
-    ports:
-      - "5050:80"
-    depends_on:
-      - postgresql-master
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
-      - PGADMIN_DEFAULT_PASSWORD=admin
-
-volumes:
-  postgresql_master_data:
-    driver: local
\ No newline at end of file
diff --git a/jpa/boot-read-replica-postgresql/docker/configure-master.sh b/jpa/boot-read-replica-postgresql/docker/configure-master.sh
new file mode 100644
index 000000000..ac563c18e
--- /dev/null
+++ b/jpa/boot-read-replica-postgresql/docker/configure-master.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -euo pipefail
+
+echo "Configuring PostgreSQL master for replication..."
+
+# Update postgresql.conf for replication
+cat >> "$PGDATA/postgresql.conf" <<EOF
+
+# Replication settings
+wal_level = replica
+max_wal_senders = 3
+max_replication_slots = 3
+hot_standby = on
+hot_standby_feedback = on
+listen_addresses = '*'
+EOF
+
+# Update pg_hba.conf to allow replication connections
+cat >> "$PGDATA/pg_hba.conf" <<EOF
+
+# Replication connections
+host replication repl_user 0.0.0.0/0 md5
+EOF
+
+echo "Master configuration complete"
diff --git a/jpa/boot-read-replica-postgresql/docker/docker-compose.yml b/jpa/boot-read-replica-postgresql/docker/docker-compose.yml
new file mode 100644
index 000000000..999fcef2d
--- /dev/null
+++ b/jpa/boot-read-replica-postgresql/docker/docker-compose.yml
@@ -0,0 +1,62 @@
+name: read-replica-postgresql
+services:
+  postgresql-master:
+    image: 'postgres:17'
+    ports:
+      - '5432:5432'
+    volumes:
+      - 'postgresql_master_data:/var/lib/postgresql/data'
+      - './init-master.sql:/docker-entrypoint-initdb.d/01-init-master.sql:ro'
+      - './configure-master.sh:/docker-entrypoint-initdb.d/02-configure-master.sh:ro'
+    environment:
+      - POSTGRES_USER=postgres_write
+      - POSTGRES_PASSWORD=postgres_write
+      - POSTGRES_DB=my_database
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres_write -d my_database -h 127.0.0.1 -p 5432"]
+      interval: 5s
+      timeout: 3s
+      retries: 20
+      start_period: 10s
+  postgresql-slave:
+    image: 'postgres:17'
+    ports:
+      - '15432:5432'
+    depends_on:
+      postgresql-master:
+        condition: service_healthy
+    volumes:
+      - 'postgresql_slave_data:/var/lib/postgresql/data'
+      - './setup-slave.sh:/setup-slave.sh:ro'
+    environment:
+      - POSTGRES_USER=postgres_write
+      - POSTGRES_PASSWORD=postgres_write
+      - PGUSER=postgres_write
+      - POSTGRES_MASTER_HOST=postgresql-master
+      - POSTGRES_MASTER_PORT=5432
+      - REPLICATION_USER=repl_user
+      - REPLICATION_PASSWORD=repl_password
+    entrypoint: ["/setup-slave.sh"]
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres_write -h 127.0.0.1 -p 5432"]
+      interval: 5s
+      timeout: 3s
+      retries: 20
+      start_period: 15s
+
+  pgadmin4:
+    image: dpage/pgadmin4
+    ports:
+      - "5050:80"
+    depends_on:
+      postgresql-master:
+        condition: service_healthy
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=pgadmin4@pgadmin.org
+      - PGADMIN_DEFAULT_PASSWORD=admin
+
+volumes:
+  postgresql_master_data:
+    driver: local
+  postgresql_slave_data:
+    driver: local
diff --git a/jpa/boot-read-replica-postgresql/docker/init-master.sql b/jpa/boot-read-replica-postgresql/docker/init-master.sql
new file mode 100644
index 000000000..baa4a15c2
--- /dev/null
+++ b/jpa/boot-read-replica-postgresql/docker/init-master.sql
@@ -0,0 +1,18 @@
+-- Create replication user
+CREATE USER repl_user WITH REPLICATION ENCRYPTED PASSWORD 'repl_password';
+
+-- Grant necessary permissions
+GRANT CONNECT ON DATABASE my_database TO repl_user;
+GRANT USAGE ON SCHEMA public TO repl_user;
+GRANT SELECT ON ALL TABLES IN SCHEMA public TO repl_user;
+GRANT SELECT ON ALL SEQUENCES IN SCHEMA public TO repl_user;
+
+-- Update pg_hba.conf to allow replication connections
+-- This will be added to the end of pg_hba.conf by PostgreSQL init process
+DO $$
+BEGIN
+    -- Add replication entry to pg_hba.conf
+    -- Note: The official postgres image handles pg_hba.conf configuration
+    -- The replication connection will be allowed via the default settings
+    RAISE NOTICE 'Replication user created successfully';
+END $$;
diff --git a/jpa/boot-read-replica-postgresql/docker/setup-slave.sh b/jpa/boot-read-replica-postgresql/docker/setup-slave.sh
new file mode 100755
index 000000000..f67e8be0a
--- /dev/null
+++ b/jpa/boot-read-replica-postgresql/docker/setup-slave.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+export PGDATA=/var/lib/postgresql/data
+
+echo "Setting up PostgreSQL slave..."
+
+# Wait for master to be ready
+echo "Waiting for master to be ready..."
+until PGPASSWORD="$POSTGRES_PASSWORD" psql -h "$POSTGRES_MASTER_HOST" -p "$POSTGRES_MASTER_PORT" -U "$POSTGRES_USER" -d "my_database" -c '\l' > /dev/null 2>&1
+do
+  echo "Waiting for master database..."
+  sleep 3
+done
+
+echo "Master is ready. Checking if slave data exists..."
+
+if [ "$(ls -A $PGDATA 2>/dev/null)" ]; then
+    echo "Data directory exists, starting PostgreSQL..."
+    # Change ownership and start as postgres user
+    chown -R postgres:postgres "$PGDATA"
+    exec gosu postgres postgres -c hot_standby=on -c hot_standby_feedback=on
+else
+    echo "Data directory is empty, creating base backup..."
+    
+    # Create base backup from master
+    PGPASSWORD="$REPLICATION_PASSWORD" pg_basebackup \
+        -h "$POSTGRES_MASTER_HOST" \
+        -p "$POSTGRES_MASTER_PORT" \
+        -U "$REPLICATION_USER" \
+        -D "$PGDATA" \
+        -W \
+        -v \
+        -R \
+        -X stream
+
+    # Set proper permissions
+    chmod 700 "$PGDATA"
+    chown -R postgres:postgres "$PGDATA"
+    
+    # Add standby configuration
+    cat >> "$PGDATA/postgresql.conf" <<EOF
+hot_standby = on
+hot_standby_feedback = on
+EOF
+
+    echo "Base backup complete. Starting PostgreSQL in standby mode..."
+    exec gosu postgres postgres
+fi
diff --git a/jpa/boot-read-replica-postgresql/src/main/java/com/example/demo/readreplica/ReadReplicaApplication.java b/jpa/boot-read-replica-postgresql/src/main/java/com/example/demo/readreplica/ReadReplicaApplication.java
index 7d3da7eb4..7fbbb1909 100644
--- a/jpa/boot-read-replica-postgresql/src/main/java/com/example/demo/readreplica/ReadReplicaApplication.java
+++ b/jpa/boot-read-replica-postgresql/src/main/java/com/example/demo/readreplica/ReadReplicaApplication.java
@@ -1,5 +1,6 @@
 package com.example.demo.readreplica;
 
+import java.util.TimeZone;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -7,6 +8,8 @@
 public class ReadReplicaApplication {
 
     public static void main(String[] args) {
+        // Set default timezone to UTC to avoid timezone conflicts
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
         SpringApplication.run(ReadReplicaApplication.class, args);
     }
 }
diff --git a/jpa/boot-read-replica-postgresql/src/main/resources/application.yml b/jpa/boot-read-replica-postgresql/src/main/resources/application.yml
index cd0e7d292..0a2d8f0b9 100644
--- a/jpa/boot-read-replica-postgresql/src/main/resources/application.yml
+++ b/jpa/boot-read-replica-postgresql/src/main/resources/application.yml
@@ -5,21 +5,24 @@ spring:
       password: postgres_write
       username: postgres_write
       driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://localhost:5432/my_database
+      url: jdbc:postgresql://localhost:5432/my_database?options=-c%20timezone=UTC 
       hikari:
         auto-commit: false
         pool-name: primaryHikariPool
         data-source-properties:
           ApplicationName: ${spring.application.name}
+          serverTimezone: UTC
   replica:
     datasource:
       password: repl_password
       username: repl_user
       driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://localhost:15432/my_database
+      url: jdbc:postgresql://localhost:15432/my_database?options=-c%20timezone=UTC 
       hikari:
         auto-commit: false
         poolName: replicaHikariPool
+        data-source-properties:
+          serverTimezone: UTC
 ################ Database #####################
   data:
     jpa: