diff --git a/home-server/.env b/home-server/.env
index 29cf304..62502c9 100644
--- a/home-server/.env
+++ b/home-server/.env
@@ -8,9 +8,3 @@ MARIADB_ROOT_PASSWORD=testing
 MARIADB_DATABASE=homeassistant
 MARIADB_USER=homeassistant_user
 MARIADB_PASSWORD=homeassistant_pw
-
-
-# Grafana settings
-GF_SECURITY_ADMIN_USER=test
-GF_SECURITY_ADMIN_PASSWORD=test
-GF_USERS_ALLOW_SIGN_UP=false
diff --git a/home-server/docker-compose.yml b/home-server/docker-compose.yml
index 88a286c..4f45c6e 100644
--- a/home-server/docker-compose.yml
+++ b/home-server/docker-compose.yml
@@ -50,7 +50,7 @@ services:
       - '--path.sysfs=/host/sys'
       - '--collector.filesystem.mount-points-exclude=^/(sys|proc|dev|host|etc)($$|/)'
     ports:
-      - 9100:9100
+      - ${INTERNAL_IP}:9100:9100
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
@@ -65,15 +65,13 @@ services:
       - '--web.console.templates=/etc/prometheus/consoles'
       - '--web.enable-lifecycle'
     ports:
-      - 9090:9090
-    user: "1000:1000"
+      - ${INTERNAL_IP}:9090:9090
   grafana:
     image: grafana/grafana:latest
+    ports:
+      - ${INTERNAL_IP}:3000:3000
+    volumes:
+      - /home/willem/grafana:/var/lib/grafana
     env_file:
       - .env
       - .env.production
-    ports:
-      - 3000:3000
-    user: "1000:1000"
-    volumes:
-      - /home/willem/grafana:/var/lib/grafana