diff --git a/.gitignore b/.gitignore
index 5c2ef0c..79cf84a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@
 !caddy/site/**
 !homepage/config/*
 !filebrowser/branding/**
-!grafana/prometheus.yml
 !.gitignore
+!monitoring/grafana/prometheus.yml
\ No newline at end of file
diff --git a/grafana/docker-compose.yml b/grafana/docker-compose.yml
deleted file mode 100644
index 609b95d..0000000
--- a/grafana/docker-compose.yml
+++ /dev/null
@@ -1,89 +0,0 @@
-networks:
-  grafana:
-
-services:
-  loki:
-    container_name: loki
-    image: grafana/loki:latest
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
-    networks:
-      - grafana
-
-  promtail:
-    container_name: promtail
-    image: grafana/promtail:latest
-    volumes:
-      - /var/log:/var/log
-    command: -config.file=/etc/promtail/config.yml
-    networks:
-      - grafana
-
-  alloy:
-    container_name: alloy
-    image: grafana/alloy:latest
-    profiles: ['alloy']
-    volumes:
-      - ./config/alloy:/etc/alloy
-
-  grafana:
-    environment:
-      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
-#      - GF_AUTH_ANONYMOUS_ENABLED=true
-#      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
-      - GF_SECURITY_ADMIN_USER=ccalifice
-      - GF_SECURITY_ADMIN_PASSWORD=asdf1234
-      - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode
-    entrypoint:
-      - sh
-      - -euc
-      - |
-        mkdir -p /etc/grafana/provisioning/datasources
-        cat <<EOF > /etc/grafana/provisioning/datasources/ds.yaml
-        apiVersion: 1
-        datasources:
-        - name: Loki
-          type: loki
-          access: proxy
-          orgId: 1
-          url: http://loki:3100
-          basicAuth: false
-          isDefault: true
-          version: 1
-          editable: false
-        EOF
-        /run.sh
-    image: grafana/grafana:latest
-    ports:
-      - "3003:3000"
-    networks:
-      - grafana
-    volumes:
-      - ./data:/var/lib/grafana
-    user: "1000:1002"
-    container_name: grafana
-
-  prometheus:
-    image: prom/prometheus
-    volumes:
-      - "./prometheus.yml:/etc/prometheus/prometheus.yml"
-      - ./prometheus-data:/prometheus
-    networks:
-      - grafana
-    ports:
-      - 9090:9090
-    user: "1000:1002"
-    container_name: prometheus
-
-
-#sudo docker plugin install grafana/loki-docker-driver:3.3.2-amd64 --alias loki --grant-all-permissions
-# {
-#     "debug" : true,
-#     "log-driver": "loki",
-#     "log-opts": {
-#         "loki-url": "http://192.168.1.202:3100/loki/api/v1/push",
-#         "loki-batch-size": "400"
-#     },
-# "insecure-registries":["192.168.1.202:6610"]
-# }
diff --git a/monitoring/docker-compose.yml b/monitoring/docker-compose.yml
index c3e95a0..fff27f6 100644
--- a/monitoring/docker-compose.yml
+++ b/monitoring/docker-compose.yml
@@ -108,11 +108,100 @@ services:
       - /mnt/hdd_1tb:/hdd_1tb
     restart: unless-stopped
 
+
+##### Grafana 
+
+  loki:
+      container_name: loki
+      image: grafana/loki:latest
+      ports:
+        - "3100:3100"
+      command: -config.file=/etc/loki/local-config.yaml
+      networks:
+        - grafana
+
+  promtail:
+    container_name: promtail
+    image: grafana/promtail:latest
+    volumes:
+      - /grafana/var/log:/var/log
+    command: -config.file=/etc/promtail/config.yml
+    networks:
+      - grafana
+
+  alloy:
+    container_name: alloy
+    image: grafana/alloy:latest
+    profiles: ['alloy']
+    volumes:
+      - ./grafana/config/alloy:/etc/alloy
+
+  grafana:
+    environment:
+      - GF_PATHS_PROVISIONING=/etc/grafana/provisioning
+#      - GF_AUTH_ANONYMOUS_ENABLED=true
+#      - GF_AUTH_ANONYMOUS_ORG_ROLE=Admin
+      - GF_SECURITY_ADMIN_USER=ccalifice
+      - GF_SECURITY_ADMIN_PASSWORD=asdf1234
+      - GF_FEATURE_TOGGLES_ENABLE=alertingSimplifiedRouting,alertingQueryAndExpressionsStepMode
+    entrypoint:
+      - sh
+      - -euc
+      - |
+        mkdir -p /etc/grafana/provisioning/datasources
+        cat <<EOF > /etc/grafana/provisioning/datasources/ds.yaml
+        apiVersion: 1
+        datasources:
+        - name: Loki
+          type: loki
+          access: proxy
+          orgId: 1
+          url: http://loki:3100
+          basicAuth: false
+          isDefault: true
+          version: 1
+          editable: false
+        EOF
+        /run.sh
+    image: grafana/grafana:latest
+    ports:
+      - "3003:3000"
+    networks:
+      - grafana
+    volumes:
+      - ./grafana/data:/var/lib/grafana
+    user: "1000:1002"
+    container_name: grafana
+
+  prometheus:
+    image: prom/prometheus
+    volumes:
+      - "./grafana/prometheus.yml:/etc/prometheus/prometheus.yml"
+      - ./grafana/prometheus-data:/prometheus
+    networks:
+      - grafana
+    ports:
+      - 9090:9090
+    user: "1000:1002"
+    container_name: prometheus
+
+
+#sudo docker plugin install grafana/loki-docker-driver:3.3.2-amd64 --alias loki --grant-all-permissions
+# {
+#     "debug" : true,
+#     "log-driver": "loki",
+#     "log-opts": {
+#         "loki-url": "http://192.168.1.202:3100/loki/api/v1/push",
+#         "loki-batch-size": "400"
+#     },
+# "insecure-registries":["192.168.1.202:6610"]
+# }
+
+
 networks:
   caddy-net:
     external: true
     name: caddy-net
-  monitoring: # A common network for all monitoring services to communicate into
-#    external: true
-#  notifications: # To Gotify or another Notification service
-#    external: true    
\ No newline at end of file
+  monitoring:
+  grafana:
+  
\ No newline at end of file
diff --git a/grafana/prometheus.yml b/monitoring/grafana/prometheus.yml
similarity index 100%
rename from grafana/prometheus.yml
rename to monitoring/grafana/prometheus.yml