diff --git a/docker-compose.yml b/docker-compose.yml
index e179a4a4b4..42ad26d98e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
       APP_USER: THE
       ORACLE_RANDOM_PASSWORD: yes
     platform: "linux/amd64"
-    image: gvenzl/oracle-free:23.3-slim-faststart
+    image: gvenzl/oracle-free:23.5-slim-faststart
     ports: [1521:1521]
     volumes: [/opt/oracle/oradata]
     healthcheck:
diff --git a/legacy/Dockerfile b/legacy/Dockerfile
index 916fbf0f48..62009b82f0 100644
--- a/legacy/Dockerfile
+++ b/legacy/Dockerfile
@@ -30,7 +30,6 @@ RUN mvn versions:set -DnewVersion=${APP_VERSION} -f pom.xml -DskipTests -Dtests.
 # Build
 RUN mvn -Pnative native:compile
 
-
 ### Deployer
 FROM gcr.io/distroless/java-base:nonroot AS deploy
 ARG PORT=9000
diff --git a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java
index d6bba5978a..aad29acf8c 100644
--- a/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java
+++ b/legacy/src/test/java/ca/bc/gov/app/extensions/CustomOracleContainer.java
@@ -3,11 +3,16 @@
 import java.time.Duration;
 import java.util.UUID;
 import org.testcontainers.containers.OracleContainer;
+import org.testcontainers.utility.DockerImageName;
 
 public class CustomOracleContainer extends OracleContainer {
 
   public CustomOracleContainer() {
-    super("gvenzl/oracle-xe:21.3.0-slim-faststart");
+    super(
+        DockerImageName
+            .parse("gvenzl/oracle-free:23.5-slim-faststart")
+            .asCompatibleSubstituteFor("gvenzl/oracle-xe")
+    );
 
     this.withDatabaseName("legacyfsa")
         .withUsername("THE")
diff --git a/legacydb/Dockerfile b/legacydb/Dockerfile
index 6859818fb0..5dba85efe3 100644
--- a/legacydb/Dockerfile
+++ b/legacydb/Dockerfile
@@ -1,4 +1,4 @@
-FROM gvenzl/oracle-free:23.3-slim-faststart
+FROM gvenzl/oracle-free:23.5-slim-faststart
 
 COPY --chown=oracle:oracle removeDatabase ${ORACLE_BASE}/removeDatabase
 RUN chmod +x ${ORACLE_BASE}/removeDatabase