diff --git a/docker-compose.yml b/docker-compose.yml
index 124583018f4b15de082f5a7b2b4b510855951e26..f940e7befa1818567f2fab7ac45f564c64a2bba3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,12 +14,13 @@ services:
   grafana:
     env_file: .env
     restart: ${RESTART_POLICY-unless-stopped}
-    image: grafana/grafana:5.4.3
+    image: ${GRAFANA_IMAGE-grafana/grafana:6.2.0-beta2}
     environment:
-      - "GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL-%(protocol)s://%(domain)s/dashboards/}"
+      - "GF_SERVER_ROOT_URL=${GF_SERVER_ROOT_URL-%(protocol)s://%(domain)s/dashboards}"
       - "GF_SERVER_DOMAIN=${GF_SERVER_DOMAIN}"
       - "GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}"
       - "GF_DEFAULT_INSTANCE_NAME=Funkwhale Network"
+      - "GF_AUTH_ANONYMOUS_ENABLED=true"
     depends_on:
       - db
     ports: