diff --git a/src/hubgw/models/base.py b/src/hubgw/models/base.py
index 091a45b..6dc4c16 100644
--- a/src/hubgw/models/base.py
+++ b/src/hubgw/models/base.py
@@ -16,4 +16,4 @@ class Base(DeclarativeBase):
     @declared_attr.directive
     def __table_args__(cls):
         """Set default schema for all tables."""
-        return {"schema": "hubmc"}
+        return {"schema": "public"}
diff --git a/src/hubgw/models/cooldown.py b/src/hubgw/models/cooldown.py
index 03ea016..db1825e 100644
--- a/src/hubgw/models/cooldown.py
+++ b/src/hubgw/models/cooldown.py
@@ -15,7 +15,7 @@ class Cooldown(Base):
         UniqueConstraint(
             "player_uuid", "cooldown_type", name="idx_hub_cooldowns_player_type"
         ),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(
diff --git a/src/hubgw/models/home.py b/src/hubgw/models/home.py
index c31d090..8a8de7c 100644
--- a/src/hubgw/models/home.py
+++ b/src/hubgw/models/home.py
@@ -13,7 +13,7 @@ class Home(Base):
     __tablename__ = "hub_homes"
     __table_args__ = (
         UniqueConstraint("player_uuid", "name", name="idx_hub_homes_player_name"),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(
diff --git a/src/hubgw/models/luckperms.py b/src/hubgw/models/luckperms.py
index 11f17c8..aae4a45 100644
--- a/src/hubgw/models/luckperms.py
+++ b/src/hubgw/models/luckperms.py
@@ -41,7 +41,7 @@ class LuckPermsUserPermission(Base):
             "server",
             "world",
         ),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(Integer, primary_key=True, autoincrement=True)
diff --git a/src/hubgw/models/punishment.py b/src/hubgw/models/punishment.py
index a5e982c..bae327a 100644
--- a/src/hubgw/models/punishment.py
+++ b/src/hubgw/models/punishment.py
@@ -31,9 +31,9 @@ class Punishment(Base):
         Index(
             "idx_hub_punishments_player_ip",
             "player_ip",
-            postgresql_where=Column("player_ip") != None,
+            postgresql_where=Column("player_ip").is_not(None),
         ),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(
diff --git a/src/hubgw/models/warp.py b/src/hubgw/models/warp.py
index 466a685..fc4c163 100644
--- a/src/hubgw/models/warp.py
+++ b/src/hubgw/models/warp.py
@@ -15,7 +15,7 @@ class Warp(Base):
         Index(
             "idx_hub_warps_public", "is_public", postgresql_where=Column("is_public")
         ),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(
diff --git a/src/hubgw/models/whitelist.py b/src/hubgw/models/whitelist.py
index 85bca52..7a99bb1 100644
--- a/src/hubgw/models/whitelist.py
+++ b/src/hubgw/models/whitelist.py
@@ -19,9 +19,9 @@ class WhitelistEntry(Base):
         Index(
             "idx_hub_whitelist_expires",
             "expires_at",
-            postgresql_where=Column("expires_at") != None,
+            postgresql_where=Column("expires_at").is_not(None),
         ),
-        {"schema": "hubmc"},
+        {"schema": "public"},
     )
 
     id = Column(