diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ff3e311..012ca837 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
           --health-retries=3
 
       postgres:
-        image: postgres:15
+        image: postgres:18
         env:
           POSTGRES_PASSWORD: postgres
           POSTGRES_DB: test_db
diff --git a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/migration/DataCustodianApplicationPostgresTest.java b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/migration/DataCustodianApplicationPostgresTest.java
index b05d0844..ba8cbcd2 100644
--- a/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/migration/DataCustodianApplicationPostgresTest.java
+++ b/openespi-common/src/test/java/org/greenbuttonalliance/espi/common/migration/DataCustodianApplicationPostgresTest.java
@@ -27,9 +27,9 @@
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;
-import org.testcontainers.postgresql.PostgreSQLContainer;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.postgresql.PostgreSQLContainer;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -52,8 +52,10 @@
 @Disabled("Temporarily disabled due to Issue #53: PostgreSQL UUID CHAR(36) type mismatch. " +
           "JPA entities use @GeneratedValue(strategy = GenerationType.UUID) expecting native UUID type, " +
           "but Flyway migrations use CHAR(36) for MySQL/H2 compatibility. " +
-          "This will be resolved after MULTI_PHASE schema compliance plan completes. " +
-          "See: https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/53")
+          "Configuration issues (Issue #55) have been resolved - Flyway paths and PostgreSQL version are correct. " +
+          "This test will be re-enabled after MULTI_PHASE schema compliance plan completes and UUID conversion is implemented. " +
+          "See: https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/53 " +
+          "and https://github.com/GreenButtonAlliance/OpenESPI-GreenButton-Java/issues/55")
 class DataCustodianApplicationPostgresTest {
 
     @Container
diff --git a/openespi-datacustodian/src/test/resources/application-testcontainers-postgresql.yml b/openespi-datacustodian/src/test/resources/application-testcontainers-postgresql.yml
index 84b643a0..59c62817 100644
--- a/openespi-datacustodian/src/test/resources/application-testcontainers-postgresql.yml
+++ b/openespi-datacustodian/src/test/resources/application-testcontainers-postgresql.yml
@@ -26,7 +26,7 @@ spring:
   flyway:
     enabled: true
     baseline-on-migrate: true
-    locations: classpath:db/migration/postgresql
+    locations: classpath:db/migration,classpath:db/vendor/postgres
     
   # Faster testing configuration
   main:
diff --git a/openespi-thirdparty/src/test/resources/application-testcontainers-postgresql.yml b/openespi-thirdparty/src/test/resources/application-testcontainers-postgresql.yml
index 53c0f153..a7efe7b8 100644
--- a/openespi-thirdparty/src/test/resources/application-testcontainers-postgresql.yml
+++ b/openespi-thirdparty/src/test/resources/application-testcontainers-postgresql.yml
@@ -26,7 +26,7 @@ spring:
   flyway:
     enabled: true
     baseline-on-migrate: true
-    locations: classpath:db/migration/postgresql
+    locations: classpath:db/migration,classpath:db/vendor/postgres
     
   # Faster testing configuration
   main: