diff --git a/ops/grafana-influxdb/docker-compose.yml b/ops/grafana-influxdb/docker-compose.yml
index f02b153..0a47619 100644
--- a/ops/grafana-influxdb/docker-compose.yml
+++ b/ops/grafana-influxdb/docker-compose.yml
@@ -9,13 +9,11 @@ services:
       GF_SECURITY_ADMIN_PASSWORD__FILE: /run/secrets/grafana_admin_password
       GF_USERS_ALLOW_SIGN_UP: "false"
       GF_AUTH_ANONYMOUS_ENABLED: "false"
-    entrypoint: ["/bin/sh", "-ec"]
-    command: >
-      export GRAFANA_INFLUXDB_TOKEN="$$(cat /run/secrets/grafana_influxdb_token)"
-      && exec /run.sh
+    entrypoint: ["/bin/sh", "/opt/grafana-wrapper/grafana-entrypoint.sh"]
     volumes:
       - /mnt/user/appdata/grafana:/var/lib/grafana
       - ./provisioning:/etc/grafana/provisioning:ro
+      - ./scripts:/opt/grafana-wrapper:ro
     secrets:
       - grafana_admin_password
       - grafana_influxdb_token
@@ -44,6 +42,7 @@ services:
     image: influxdb:3.9.1-core
     container_name: influxdb3-core
     restart: unless-stopped
+    user: "0"
     command:
       - influxdb3
       - serve
diff --git a/ops/grafana-influxdb/scripts/grafana-entrypoint.sh b/ops/grafana-influxdb/scripts/grafana-entrypoint.sh
new file mode 100644
index 0000000..5db9cab
--- /dev/null
+++ b/ops/grafana-influxdb/scripts/grafana-entrypoint.sh
@@ -0,0 +1,4 @@
+set -eu
+
+export GRAFANA_INFLUXDB_TOKEN="$(cat /run/secrets/grafana_influxdb_token)"
+exec /run.sh