diff --git a/docker-compose.yml b/docker-compose.yml
index 7d68e4ef..78ebcc0e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -88,8 +88,7 @@ services:
       - apibara
     volumes:
       - deployment:/deployment
-    # TODO: Fix this command
-    command: bash -c "sleep 5 && source /deployment/.env && /root/.local/share/apibara/bin/apibara run docker-script.js --allow-env-from-env ART_PEACE_CONTRACT_ADDRESS"
+    restart: on-failure
   frontend:
     build:
       dockerfile: frontend/Dockerfile
diff --git a/indexer/Dockerfile b/indexer/Dockerfile
index 3246d426..993bcb38 100644
--- a/indexer/Dockerfile
+++ b/indexer/Dockerfile
@@ -1,14 +1,6 @@
-FROM ubuntu:24.04
-
-# Install prerequisites
-RUN apt-get update && apt-get install -y \
-curl jq
-RUN curl -sL https://install.apibara.com | bash
-
-SHELL ["/bin/bash", "-c"]
-RUN /root/.local/share/apibara/bin/apibara plugins install sink-webhook
+FROM quay.io/apibara/sink-webhook:0.6.0 as sink-webhook
 
 WORKDIR /indexer
 COPY ./indexer/docker-script.js .
 
-CMD ["source", "/deployment/.env", "&&", "/root/.local/share/apibara/bin/apibara", "run", "docker-script.js", "--allow-env-from-env", "ART_PEACE_CONTRACT_ADDRESS"]
+CMD ["run", "docker-script.js", "--allow-env", "/deployment/.env"]