diff --git a/docker/.gitignore b/docker/.gitignore
index b6681ca8a64..33c83313c67 100644
--- a/docker/.gitignore
+++ b/docker/.gitignore
@@ -1,6 +1,4 @@
-volumes/db/data/**/*
-!volumes/db/data/.gitkeep
-volumes/storage/data/**/*
-!volumes/storage/data/.gitkeep
+volumes/db/data
+volumes/storage
 .env
 test.http
diff --git a/docker/dev/docker-compose.dev.yml b/docker/dev/docker-compose.dev.yml
index be651e90ede..88f25341e84 100644
--- a/docker/dev/docker-compose.dev.yml
+++ b/docker/dev/docker-compose.dev.yml
@@ -3,13 +3,11 @@ version: "3.8"
 services:
   mail:
     container_name: supabase-mail
-    image: phamhieu/inbucket:latest
+    image: inbucket/inbucket:stable
     ports:
       - '2500:2500' # SMTP
       - '9000:9000' # web interface
       - '1100:1100' # POP3
   db:
     volumes:
-      - type: bind
-        source: ./dev/data.sql
-        target: /docker-entrypoint-initdb.d/data.sql
\ No newline at end of file
+      - ./dev/data.sql:/docker-entrypoint-initdb.d/data.sql
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 5047947855e..516db87042f 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -22,13 +22,11 @@ services:
       KONG_DNS_ORDER: LAST,A,CNAME
       KONG_PLUGINS: request-transformer,cors,key-auth,acl
     volumes:
-      - type: bind
-        source: ./volumes/api/kong.yml
-        target: /var/lib/kong/kong.yml
+      - ./volumes/api/kong.yml:/var/lib/kong/kong.yml
 
   auth:
     container_name: supabase-auth
-    image: supabase/gotrue:v2.1.8
+    image: supabase/gotrue:v2.2.6
     depends_on:
       - db
     restart: unless-stopped
@@ -75,6 +73,7 @@ services:
       PGRST_DB_ANON_ROLE: anon
       PGRST_JWT_SECRET: ${JWT_SECRET}
       PGRST_DB_USE_LEGACY_GUCS: "false"
+
   realtime:
     container_name: supabase-realtime
     image: supabase/realtime:v0.15.0
@@ -115,13 +114,11 @@ services:
       REGION: stub
       GLOBAL_S3_BUCKET: stub
     volumes:
-      - type: volume
-        source: volume_storage
-        target: /var/lib/storage
+      - ./volumes/storage:/var/lib/storage
 
   meta:
     container_name: supabase-meta
-    image: supabase/postgres-meta:v0.26.1
+    image: supabase/postgres-meta:v0.28.0
     depends_on:
       - db
     restart: unless-stopped
@@ -139,17 +136,6 @@ services:
       - ${POSTGRES_PORT}:5432
     environment:
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
-      PGDATA: /var/lib/postgresql/data/pgdata
     volumes:
-      - /var/lib/postgresql/data/pgdata
-      - type: bind
-        source: ./volumes/db/init
-        target: /docker-entrypoint-initdb.d
-
-volumes:
-  volume_storage: 
-    driver: local
-    driver_opts:
-      type: none
-      device: ./volumes/storage/data
-      o: bind
\ No newline at end of file
+      - ./volumes/db/data:/var/lib/postgresql/data
+      - ./volumes/db/init:/docker-entrypoint-initdb.d
diff --git a/docker/volumes/db/data/.gitkeep b/docker/volumes/db/data/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/docker/volumes/db/init/data.sql b/docker/volumes/db/init/data.sql
deleted file mode 100755
index e69de29bb2d..00000000000
diff --git a/docker/volumes/storage/data/.gitkeep b/docker/volumes/storage/data/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000