diff --git a/go/cmd/orion/main.go b/go/cmd/orion/main.go
index 6cd2183..eb1fc22 100644
--- a/go/cmd/orion/main.go
+++ b/go/cmd/orion/main.go
@@ -27,13 +27,8 @@ import (
 	"google.golang.org/grpc/credentials/insecure"
 )
 
-const (
-	// FIX: Use separate redis instance. We start with higher number because use this same instance in helios.
-	REDIS_DATABASE_FOR_AUTH int = 4
-)
-
 func redisForAuth() *redis.Client {
-	return internal.ConnectAndTestRedis(REDIS_DATABASE_FOR_AUTH)
+	return internal.ConnectAndTestRedis(db.RedisDBAuth)
 }
 
 func main() {
diff --git a/go/cmd/pusherservice/main.go b/go/cmd/pusherservice/main.go
index 5d160bd..2d0c253 100644
--- a/go/cmd/pusherservice/main.go
+++ b/go/cmd/pusherservice/main.go
@@ -21,11 +21,6 @@ import (
 	"google.golang.org/grpc"
 )
 
-const (
-	redisDBAuth   = 4 // shared with orion for session validation
-	redisDBPusher = 5 // dedicated to pusher state (presence, pub/sub)
-)
-
 func main() {
 	port := utils.MustGetEnv("PORT")
 	grpcPort := utils.MustGetEnv("GRPC_PORT")
@@ -35,10 +30,10 @@ func main() {
 	defer db.Cleanup()
 
 	// Redis for auth session validation (same DB as orion)
-	authRedis := internal.ConnectAndTestRedis(redisDBAuth)
+	authRedis := internal.ConnectAndTestRedis(db.RedisDBAuth)
 
 	// Redis for pusher state (presence hashes, pub/sub)
-	pusherRedis := internal.ConnectAndTestRedis(redisDBPusher)
+	pusherRedis := internal.ConnectAndTestRedis(db.RedisDBPusher)
 
 	// Services
 	authSvc := auth.NewAuthService(authRedis, nil) // nil aeroSvc — pusher only calls GetSession
diff --git a/go/internal/db/connect.go b/go/internal/db/postgres.go
similarity index 100%
rename from go/internal/db/connect.go
rename to go/internal/db/postgres.go
diff --git a/go/internal/db/redis.go b/go/internal/db/redis.go
new file mode 100644
index 0000000..d663685
--- /dev/null
+++ b/go/internal/db/redis.go
@@ -0,0 +1,8 @@
+package db
+
+// Shared database namespaces used across services
+// FIX: Use separate redis instance. We start with higher number because use this same instance in helios.
+const (
+	RedisDBAuth   = 4 // auth sessions
+	RedisDBPusher = 5 // dedicated to pusher state (presence, pub/sub)
+)