diff --git a/src/main/java/stirling/software/SPDF/model/Authority.java b/src/main/java/stirling/software/SPDF/model/Authority.java
index 337db49b1f3..8dd6d6e742f 100644
--- a/src/main/java/stirling/software/SPDF/model/Authority.java
+++ b/src/main/java/stirling/software/SPDF/model/Authority.java
@@ -12,7 +12,7 @@
 import jakarta.persistence.Table;
 
 @Entity
-@Table(name = "authorities", schema = "stirling_pdf")
+@Table(name = "authorities")
 public class Authority implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/stirling/software/SPDF/model/PersistentLogin.java b/src/main/java/stirling/software/SPDF/model/PersistentLogin.java
index c5f075e5fc8..cc94eea28d2 100644
--- a/src/main/java/stirling/software/SPDF/model/PersistentLogin.java
+++ b/src/main/java/stirling/software/SPDF/model/PersistentLogin.java
@@ -8,7 +8,7 @@
 import jakarta.persistence.Table;
 
 @Entity
-@Table(name = "persistent_logins", schema = "stirling_pdf")
+@Table(name = "persistent_logins")
 public class PersistentLogin {
 
     @Id
diff --git a/src/main/java/stirling/software/SPDF/model/SessionEntity.java b/src/main/java/stirling/software/SPDF/model/SessionEntity.java
index 0327a5fc57f..fcdb8777b64 100644
--- a/src/main/java/stirling/software/SPDF/model/SessionEntity.java
+++ b/src/main/java/stirling/software/SPDF/model/SessionEntity.java
@@ -10,7 +10,7 @@
 
 @Entity
 @Data
-@Table(name = "sessions", schema = "stirling_pdf")
+@Table(name = "sessions")
 public class SessionEntity implements Serializable {
     @Id private String sessionId;
 
diff --git a/src/main/java/stirling/software/SPDF/model/User.java b/src/main/java/stirling/software/SPDF/model/User.java
index 77852de1d2a..b3cfa129d0e 100644
--- a/src/main/java/stirling/software/SPDF/model/User.java
+++ b/src/main/java/stirling/software/SPDF/model/User.java
@@ -10,7 +10,7 @@
 import jakarta.persistence.*;
 
 @Entity
-@Table(name = "users", schema = "stirling_pdf")
+@Table(name = "users")
 public class User implements Serializable {
 
     private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/application-postgres.properties b/src/main/resources/application-postgres.properties
index 08db7a8f3ba..9ab14949f98 100644
--- a/src/main/resources/application-postgres.properties
+++ b/src/main/resources/application-postgres.properties
@@ -1,5 +1,5 @@
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
+spring.datasource.url=jdbc:postgresql://db:5432/postgres
 spring.datasource.username=postgres
 spring.datasource.password=postgres
 spring.jpa.database-platform=org.hibernate.dialect.PostgreSQLDialect