diff --git a/auth/cmd/daemon.go b/auth/cmd/daemon.go
index d4f9810..2a637af 100644
--- a/auth/cmd/daemon.go
+++ b/auth/cmd/daemon.go
@@ -74,7 +74,7 @@ func runServe(cmd *cobra.Command, args []string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	if viper.GetString("app.env") == "prod" {
+	if viper.GetString("app.env") == "prod" || viper.GetString("app.env") == "dev" {
 		hostName = serviceName
 	} else {
 		hostName = "localhost"
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000..f8e311c
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,9 @@
+services:
+  pickfighter-gateway-service:
+    command: ["serve", "gateway", "--env", "dev"]
+  auth-service:
+    command: ["serve", "auth", "--env", "dev"]
+  fighters-service:
+    command: ["serve", "fighters", "--env", "dev"]
+  events-service:
+    command: ["serve", "events", "--env", "dev"]
\ No newline at end of file
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index ddf9cb1..a9f2738 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,4 +1,4 @@
-  services:
+services:
   db:
     container_name: pickfighter-db
     build:
diff --git a/docker-compose.yml b/docker-compose.yml
index 41712bc..2cf9b17 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,4 @@
 services:
-  db:
-    container_name: pickfighter-db
-    build:
-      context: .
-      dockerfile: migrations/init/Dockerfile
-    volumes:
-      - postgres:/var/lib/postgresql/data/pgdata
-    expose:
-      - "5432"
-    environment:
-      PGDATA: "/var/lib/postgresql/data/pgdata"
-      POSTGRES_USER: "postgres"
-      POSTGRES_PASSWORD: ${DB_PASS}
-      POSTGRES_DB: "pickfighter"
-      POSTGRES_HOST_AUTH_METHOD: "trust"
-    healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres"]
-      interval: 10s
-      retries: 5
-      start_period: 30s
-      timeout: 10s
-    networks:
-      - pickfighter_network
-
   redis:
     image: redis
     container_name: dev-redis
@@ -41,6 +17,8 @@ services:
       - redis
     environment:
       - REDIS_URL=redis:6379
+    ports:
+      - "9091:9091"
     networks:
       - pickfighter_network
 
@@ -52,10 +30,9 @@ services:
       dockerfile: auth/Dockerfile
     depends_on:
       - redis
-      - db
     environment:
       - REDIS_URL=redis:6379
-      - DB_URL=postgres://postgres@db:5432/pickfighter
+      - DB_URL=postgres://postgres:greedisgood@172.17.0.1:5432/pickfighter_db
     expose:
       - "9092"
     networks:
@@ -70,10 +47,9 @@ services:
       dockerfile: fighters/Dockerfile
     depends_on:
       - redis
-      - db
     environment:
       - REDIS_URL=redis:6379
-      - DB_URL=postgres://postgres@db:5432/pickfighter
+      - DB_URL=postgres://postgres:greedisgood@172.17.0.1:5432/pickfighter_db
     expose:
       - "9093"
     networks:
@@ -87,10 +63,9 @@ services:
       dockerfile: events/Dockerfile
     depends_on:
       - redis
-      - db
     environment:
       - REDIS_URL=redis:6379
-      - DB_URL=postgres://postgres@db:5432/pickfighter
+      - DB_URL=postgres://postgres:greedisgood@172.17.0.1:5432/pickfighter_db
     expose:
       - "9094"
     networks:
@@ -102,7 +77,7 @@ services:
     volumes:
       - ./nginx/nginx.local.conf:/etc/nginx/nginx.conf:ro
     ports:
-      - "8081:80"
+      - "8081:8081"
     depends_on:
       - pickfighter-gateway-service
     networks:
@@ -111,7 +86,4 @@ services:
 networks:
   pickfighter_network:
     name: pickfighter_network
-    driver: bridge
-
-volumes:
-  postgres:
\ No newline at end of file
+    driver: bridge
\ No newline at end of file
diff --git a/events/cmd/daemon.go b/events/cmd/daemon.go
index 540b398..1e4c154 100644
--- a/events/cmd/daemon.go
+++ b/events/cmd/daemon.go
@@ -73,7 +73,7 @@ func runServe(cmd *cobra.Command, args []string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	if viper.GetString("app.env") == "prod" {
+	if viper.GetString("app.env") == "prod" || viper.GetString("app.env") == "dev" {
 		hostName = serviceName
 	} else {
 		hostName = "localhost"
diff --git a/fighters/cmd/daemon.go b/fighters/cmd/daemon.go
index 7ff9f04..4f3795a 100644
--- a/fighters/cmd/daemon.go
+++ b/fighters/cmd/daemon.go
@@ -74,7 +74,7 @@ func runServe(cmd *cobra.Command, args []string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	if viper.GetString("app.env") == "prod" {
+	if viper.GetString("app.env") == "prod" || viper.GetString("app.env") == "dev" {
 		hostName = serviceName
 	} else {
 		hostName = "localhost"
diff --git a/migrations/init/auth_service_init.sql b/migrations/init/auth_service_init.sql
index 67a670a..451e054 100644
--- a/migrations/init/auth_service_init.sql
+++ b/migrations/init/auth_service_init.sql
@@ -1,4 +1,4 @@
-\c pickfighter
+\c pickfighter;
 
 -- Create the users table
 CREATE TABLE IF NOT EXISTS auth.users (
diff --git a/migrations/init/events_service_init.sql b/migrations/init/events_service_init.sql
index 4138ed5..08e5f28 100644
--- a/migrations/init/events_service_init.sql
+++ b/migrations/init/events_service_init.sql
@@ -1,4 +1,4 @@
-\c pickfighter
+\c pickfighter;
 
 -- Queries to create tables
 CREATE TABLE IF NOT EXISTS events.bets (
diff --git a/migrations/init/fighters_service_init.sql b/migrations/init/fighters_service_init.sql
index 6cd7c14..18a58ee 100644
--- a/migrations/init/fighters_service_init.sql
+++ b/migrations/init/fighters_service_init.sql
@@ -1,4 +1,4 @@
-\c pickfighter
+\c pickfighter;
 
 -- Create tables
 CREATE TABLE IF NOT EXISTS fighters.divisions (
diff --git a/pickfighter/cmd/daemon.go b/pickfighter/cmd/daemon.go
index e98e31b..342b6eb 100644
--- a/pickfighter/cmd/daemon.go
+++ b/pickfighter/cmd/daemon.go
@@ -75,7 +75,7 @@ func runServe(cmd *cobra.Command, args []string) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	if viper.GetString("app.env") == "prod" {
+	if viper.GetString("app.env") == "prod" || viper.GetString("app.env") == "dev" {
 		hostName = serviceName
 	} else {
 		hostName = "localhost"
diff --git a/pickfighter/internal/handler/http/handlers.go b/pickfighter/internal/handler/http/handlers.go
index 8d7c915..20cd528 100644
--- a/pickfighter/internal/handler/http/handlers.go
+++ b/pickfighter/internal/handler/http/handlers.go
@@ -330,6 +330,7 @@ func (h *Handler) CreateEvent(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		// TODO handle errors from service
 		httplib.ErrorResponseJSON(w, http.StatusBadRequest, internalErr.Events, err)
+		return
 	}
 
 	result := httplib.SuccessfulResult()
@@ -345,6 +346,7 @@ func (h *Handler) GetEvents(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		// TODO handle errors from service
 		httplib.ErrorResponseJSON(w, http.StatusBadRequest, internalErr.Events, err)
+		return
 	}
 
 	httplib.ResponseJSON(w, httplib.ListResult{
diff --git a/scripts/cfg_backup.sh b/scripts/cfg_backup.sh
index c851624..5a6c49a 100755
--- a/scripts/cfg_backup.sh
+++ b/scripts/cfg_backup.sh
@@ -12,12 +12,16 @@ FILES_TO_BACKUP=(
     ".env"
     "auth/configs/config.dev.yaml"
     "auth/configs/config.prod.yaml"
+    "auth/configs/config.local.yaml"
     "events/configs/config.dev.yaml"
     "events/configs/config.prod.yaml"
+    "events/configs/config.local.yaml"
     "fighters/configs/config.dev.yaml"
     "fighters/configs/config.prod.yaml"
+    "fighters/configs/config.local.yaml"
     "pickfighter/configs/config.dev.yaml"
     "pickfighter/configs/config.prod.yaml"
+    "pickfighter/configs/config.local.yaml"
     "scraper/configs/proxy.yaml"
     "auth/logs/log.json"
     "events/logs/log.json"