diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 15dd48d..746686a 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -16,6 +16,8 @@ jobs:
             image: anssi/shovel-webapp
           - context: ./suricata
             image: anssi/shovel-suricata
+          - context: ./grafana
+            image: anssi/shovel-grafana
     steps:
       - uses: actions/checkout@v4
       - uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
diff --git a/docker-compose.yml b/docker-compose.yml
index 0e1ba69..8bced0f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3"
 services:
   suricata:
     build: ./suricata
-    image: shovel-suricata
+    image: anssi/shovel-suricata:dev
     volumes:
       - "./input_pcaps:/input_pcaps:ro"
       - "./suricata/rules:/suricata/rules:ro"
@@ -13,7 +13,7 @@ services:
 
   webapp:
     build: ./webapp
-    image: shovel-webapp
+    image: anssi/shovel-webapp:dev
     volumes:
       - "./input_pcaps:/webapp/static/input_pcaps:ro"
       - "./suricata/output:/suricata/output:ro"
@@ -25,7 +25,7 @@ services:
 
   grafana:
     build: ./grafana
-    image: shovel-grafana
+    image: anssi/shovel-grafana:dev
     volumes:
       - "./webapp/database:/webapp/database:ro"
     ports:
diff --git a/grafana/Dockerfile b/grafana/Dockerfile
index daa8733..8f73dcb 100644
--- a/grafana/Dockerfile
+++ b/grafana/Dockerfile
@@ -1,10 +1,10 @@
 FROM grafana/grafana-oss:10.1.2
-ENV GF_ANALYTICS_CHECK_FOR_PLUGIN_UPDATES=false
-ENV GF_ANALYTICS_CHECK_FOR_UPDATES=false
-ENV GF_ANALYTICS_REPORTING_ENABLED=false
-ENV GF_AUTH_ANONYMOUS_ENABLED=true
-ENV GF_AUTH_ANONYMOUS_HIDE_VERSION=true
-ENV GF_INSTALL_PLUGINS=frser-sqlite-datasource
-ENV GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/var/lib/grafana/dashboards/home.json
+ENV GF_ANALYTICS_CHECK_FOR_PLUGIN_UPDATES=false \
+    GF_ANALYTICS_CHECK_FOR_UPDATES=false \
+    GF_ANALYTICS_REPORTING_ENABLED=false \
+    GF_AUTH_ANONYMOUS_ENABLED=true \
+    GF_AUTH_ANONYMOUS_HIDE_VERSION=true \
+    GF_INSTALL_PLUGINS=frser-sqlite-datasource \
+    GF_DASHBOARDS_DEFAULT_HOME_DASHBOARD_PATH=/var/lib/grafana/dashboards/home.json
 COPY ./provisioning /etc/grafana/provisioning
 COPY ./dashboards /var/lib/grafana/dashboards