diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index eae491796..44b45b45f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,6 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         jdk: [8, 11]
+        schema:
+          - "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:latest-dev"
+          - "ghcr.io/hydrologicengineeringcenter/cwms-database/cwms/database-ready-ora-23.5:25-07-01-RC06"
     name: build and test
     runs-on: ubuntu-latest
     outputs:
@@ -31,7 +34,7 @@ jobs:
         id: thebuild
         run: ./gradlew build --info --init-script init.gradle
       - name: integration tests
-        run: ./gradlew integrationtest --info --init-script init.gradle
+        run: ./gradlew integrationtest --info --init-script init.gradle -PCDA.oracle.database.image=${{matrix.schema}}
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v5
         if: success() || failure() # always run even if the previous step fails
diff --git a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java
index 661293e8d..6c13b0936 100644
--- a/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java
+++ b/cwms-data-api/src/test/java/fixtures/CwmsDataApiSetupCallback.java
@@ -103,7 +103,7 @@ else if(tmp.toLowerCase().endsWith("staging")) {
         }
         else
         {
-            ret = Dao.versionAsInteger(tmp);
+            ret = Dao.versionAsInteger(tmp.replaceAll("-RC.*", "").replace("-","."));
         }
         return ret;
     }