diff --git a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
index d7410373fd9..ea0eee1a2ff 100644
--- a/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
+++ b/modules/oracle-xe/src/main/java/org/testcontainers/containers/OracleContainer.java
@@ -7,7 +7,7 @@
 /**
  * @author gusohal
  */
-public class OracleContainer extends JdbcDatabaseContainer {
+public class OracleContainer extends JdbcDatabaseContainer<OracleContainer> {
 
     public static final String NAME = "oracle";
 
@@ -81,13 +81,13 @@ public String getPassword() {
     @Override
     public OracleContainer withUsername(String username) {
         this.username = username;
-        return this;
+        return self();
     }
 
     @Override
     public OracleContainer withPassword(String password) {
         this.password = password;
-        return this;
+        return self();
     }
 
     @SuppressWarnings("SameReturnValue")