diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index 62e895a43..6806dac35 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull iotaledger/inx-coordinator:0.2
-          docker pull iotaledger/inx-indexer:0.3
+          docker pull iotaledger/inx-indexer:0.4
 
       - name: Run integration tests
         run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
@@ -59,7 +59,7 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull iotaledger/inx-coordinator:0.2
-          docker pull iotaledger/inx-indexer:0.3
+          docker pull iotaledger/inx-indexer:0.4
 
       - name: Run integration tests
         run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
@@ -92,7 +92,7 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull iotaledger/inx-coordinator:0.2
-          docker pull iotaledger/inx-indexer:0.3
+          docker pull iotaledger/inx-indexer:0.4
           docker build github.com/iotaledger/chrysalis-tools#:wfmock -t wfmock:latest
 
       - name: Run integration tests
@@ -126,7 +126,7 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull iotaledger/inx-coordinator:0.2
-          docker pull iotaledger/inx-indexer:0.3
+          docker pull iotaledger/inx-indexer:0.4
 
       - name: Run integration tests
         run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
@@ -159,7 +159,7 @@ jobs:
       - name: Pull additional Docker images
         run: |
           docker pull iotaledger/inx-coordinator:0.2
-          docker pull iotaledger/inx-indexer:0.3
+          docker pull iotaledger/inx-indexer:0.4
 
       - name: Run integration tests
         run: docker-compose -f integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build
diff --git a/docker-compose.yml b/docker-compose.yml
index 94a9585b5..c0fd16c77 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,15 +1,17 @@
 version: '3'
 services:
   inx-indexer:
-    image: iotaledger/inx-indexer:0.3
+    image: iotaledger/inx-indexer:0.4
     restart: on-failure
+    volumes:
+      - ./alphanet/indexer:/app/database
     command:
       - "--inx.address=hornet:9029"
       - "--indexer.bindAddress=inx-indexer:9091"
       - "--prometheus.bindAddress=inx-indexer:9312"
 
   inx-mqtt:
-    image: iotaledger/inx-mqtt:0.3
+    image: iotaledger/inx-mqtt:0.4
     restart: on-failure
     command:
       - "--inx.address=hornet:9029"
diff --git a/integration-tests/runTests.sh b/integration-tests/runTests.sh
index 1f7ff0fe0..887b7ac2c 100755
--- a/integration-tests/runTests.sh
+++ b/integration-tests/runTests.sh
@@ -17,7 +17,7 @@ then
 fi
 
 docker pull iotaledger/inx-coordinator:0.2
-docker pull iotaledger/inx-indexer:0.3
+docker pull iotaledger/inx-indexer:0.4
 
 echo "Run integration tests"
 for name in $TEST_NAMES; do
diff --git a/integration-tests/tester/framework/config.go b/integration-tests/tester/framework/config.go
index 7f5f799d1..1b2f28633 100644
--- a/integration-tests/tester/framework/config.go
+++ b/integration-tests/tester/framework/config.go
@@ -36,7 +36,7 @@ const (
 
 	containerNodeImage           = "hornet:dev"
 	coordinatorImage             = "iotaledger/inx-coordinator:0.2"
-	indexerImage                 = "iotaledger/inx-indexer:0.3"
+	indexerImage                 = "iotaledger/inx-indexer:0.4"
 	containerWhiteFlagMockServer = "wfmock:latest"
 
 	containerNameTester  = "/tester"
diff --git a/private_tangle/bootstrap.sh b/private_tangle/bootstrap.sh
index 39f9c8d23..dd0220e1f 100755
--- a/private_tangle/bootstrap.sh
+++ b/private_tangle/bootstrap.sh
@@ -38,6 +38,7 @@ fi
 
 # Prepare database directory
 mkdir -p privatedb/coo
+mkdir -p privatedb/indexer
 mkdir -p privatedb/state
 mkdir -p privatedb/hornet-2
 mkdir -p privatedb/hornet-3
diff --git a/private_tangle/docker-compose.yml b/private_tangle/docker-compose.yml
index e78029254..494045d46 100644
--- a/private_tangle/docker-compose.yml
+++ b/private_tangle/docker-compose.yml
@@ -58,11 +58,13 @@ services:
       - 4-nodes
 
   inx-indexer:
-    image: iotaledger/inx-indexer:0.3
+    image: iotaledger/inx-indexer:0.4
     networks:
       peering_net:
         ipv4_address: 172.18.211.21
     restart: on-failure
+    volumes:
+      - ./privatedb/indexer:/app/database
     command:
       - "--inx.address=172.18.211.11:9029"
       - "--indexer.bindAddress=172.18.211.21:9091"
@@ -73,7 +75,7 @@ services:
       - 4-nodes
 
   inx-mqtt:
-    image: iotaledger/inx-mqtt:0.3
+    image: iotaledger/inx-mqtt:0.4
     networks:
       peering_net:
         ipv4_address: 172.18.211.22
@@ -89,7 +91,7 @@ services:
       - 4-nodes
 
   inx-faucet:
-    image: iotaledger/inx-faucet:0.2
+    image: iotaledger/inx-faucet:0.3
     networks:
       peering_net:
         ipv4_address: 172.18.211.23