diff --git a/indexer/Dockerfile.development b/Dockerfile.development
similarity index 55%
rename from indexer/Dockerfile.development
rename to Dockerfile.development
index e7f40318..e60f0a7d 100644
--- a/indexer/Dockerfile.development
+++ b/Dockerfile.development
@@ -2,11 +2,9 @@ FROM node:18-alpine
 
 WORKDIR /app
 
-COPY package.json .
+COPY ./indexer ./yarn.lock ./
 RUN yarn install --frozen-lockfile
-RUN yarn global add ts-node dotenv-cli
-
-COPY . .
+RUN yarn global add ts-node dotenv-cli sequelize-cli
 
 EXPOSE 3001
 
diff --git a/indexer/docker-compose.development.yml b/indexer/docker-compose.development.yml
index c9d94ac9..19f52ecc 100644
--- a/indexer/docker-compose.development.yml
+++ b/indexer/docker-compose.development.yml
@@ -10,6 +10,8 @@ services:
       POSTGRES_DB: ${DB_NAME}
     ports:
       - "5432:5432"
+    volumes:
+      - ${PWD}/indexer/postgres:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME}"]
       interval: 10s
@@ -18,66 +20,39 @@ services:
 
   db-migration:
     build:
-      context: .
+      context: ../
       dockerfile: Dockerfile.development
     container_name: db-migration
     environment:
       DB_HOST: indexer-db
-    command: >
-      /bin/sh -c "
-      rm -f /app/shared/db-migration-complete &&
-      rm -f /app/shared/graphql-running &&
-      yarn create:database &&
-      touch /app/shared/db-migration-complete"
+    command: ["yarn", "create:database"]
     depends_on:
       indexer-db:
         condition: service_healthy
-    volumes:
-      - shared-data:/app/shared
 
   graphql-app:
     build:
-      context: .
+      context: ../
       dockerfile: Dockerfile.development
     container_name: kad-indexer-graphql
     environment:
       DB_HOST: indexer-db
-    command: >
-      /bin/sh -c "
-      while [ ! -f /app/shared/db-migration-complete ]; do
-        echo 'Waiting for db-migration...';
-        sleep 6;
-      done &&
-      touch /app/shared/graphql-running &&
-      yarn dev:graphql"
+    command: ["yarn", "dev:graphql"]
     ports:
       - "3001:3001"
     depends_on:
       db-migration:
-        condition: service_started
-    volumes:
-      - shared-data:/app/shared
+        condition: service_completed_successfully
 
   streaming-app:
     build:
-      context: .
+      context: ../
       dockerfile: Dockerfile.development
     container_name: kad-indexer-streaming
     environment:
       DB_HOST: indexer-db
       KADENA_GRAPHQL_API_URL: http://graphql-app
-    command: >
-      /bin/sh -c "
-      while [ ! -f /app/shared/graphql-running ]; do
-        echo 'Waiting for graphql-app...';
-        sleep 6;
-      done &&
-      yarn dev:streaming"
+    command: ["yarn", "dev:streaming"]
     depends_on:
       graphql-app:
         condition: service_started
-    volumes:
-      - shared-data:/app/shared
-
-volumes:
-  shared-data: