diff --git a/Compose/calibre.yaml b/Compose/calibre.yaml
index b7abd84..82bc1db 100644
--- a/Compose/calibre.yaml
+++ b/Compose/calibre.yaml
@@ -20,7 +20,7 @@ services:
     security_opt:
       - seccomp=unconfined
    # deploy:
-    # labels:
+    labels:
       # - homepage.group=Library
       # - homepage.name=Calibre
       # - homepage.icon=calibre.png
@@ -28,9 +28,9 @@ services:
       # - homepage.description=Calibre Library
       # - kuma.calibre.http.name="Calibre"
       # - kuma.calibre.http.url=http://calibre:8080
-      # - caddy=calibre.netgrimoire.com
-      # - caddy.import=authentik
-      # - caddy.reverse_proxy="{{upstreams 8080}}"
+      - caddy=calibre.netgrimoire.com
+      - caddy.import=authentik
+      - caddy.reverse_proxy="{{upstreams 8080}}"
       # placement:
       #   constraints:
       #     - node.hostname == nas
diff --git a/Compose/monitor.yaml b/Compose/monitor.yaml
new file mode 100644
index 0000000..9a63a7a
--- /dev/null
+++ b/Compose/monitor.yaml
@@ -0,0 +1,49 @@
+services:  
+  scrutiny:  
+      image: ghcr.io/analogj/scrutiny:master-omnibus
+      container_name: scrutiny
+      hostname: scrutiny
+      networks:
+        - netgrimoire
+      ports:
+        - 8081:8080   
+        - 8086:8086
+      cap_add:    
+        - SYS_RAWIO
+      devices:
+        - "/dev/sda"
+        # - "/dev/sdb"
+        - "/dev/sdc"
+        - "/dev/sdd"
+        - "/dev/sde"
+        - "/dev/sdf"
+        - "/dev/sdg"
+        - "/dev/sdh"
+        - "/dev/sdi"
+        - "/dev/sdj"
+      volumes:
+        - /run/udev:/run/udev:ro
+        - /DockerVol/scrutiny/config:/opt/scrutiny/config
+        - /DockerVol/scrutiny/influxdb:/opt/scrutiny/influxdb
+
+
+  glances:
+    image: nicolargo/glances
+    container_name: glances
+    hostname: glances
+    restart: always
+    network_mode: host
+    privileged: true
+    pid: host
+    volumes:
+      - /docker/volumes/glances/config:/glances/conf
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - TZ=America/Chicago
+      - "GLANCES_OPT=-w"
+    ports:
+      - 61208-61209:61208-61209
+
+networks:
+  netgrimoire:
+    external: true   
\ No newline at end of file
diff --git a/NG-Mgmt-Tools.yaml b/NG-Mgmt-Tools.yaml
index f1c9ffd..a5dce3f 100755
--- a/NG-Mgmt-Tools.yaml
+++ b/NG-Mgmt-Tools.yaml
@@ -1,50 +1,50 @@
 version: "3.3"
 services:
 
-  scrutiny:  
-      image: ghcr.io/analogj/scrutiny:master-omnibus
-      container_name: scrutiny
-      hostname: scrutiny
-      networks:
-        - netgrimoire
-      ports:
-        - 8081:8080   
-        - 8086:8086
-      cap_add:    
-        - SYS_RAWIO
-      devices:
-        - "/dev/sda"
-        # - "/dev/sdb"
-        - "/dev/sdc"
-        - "/dev/sdd"
-        - "/dev/sde"
-        - "/dev/sdf"
-        - "/dev/sdg"
-        - "/dev/sdh"
-        - "/dev/sdi"
-        - "/dev/sdj"
-      volumes:
-        - /run/udev:/run/udev:ro
-        - /DockerVol/scrutiny/config:/opt/scrutiny/config
-        - /DockerVol/scrutiny/influxdb:/opt/scrutiny/influxdb
+  # scrutiny:  
+  #     image: ghcr.io/analogj/scrutiny:master-omnibus
+  #     container_name: scrutiny
+  #     hostname: scrutiny
+  #     networks:
+  #       - netgrimoire
+  #     ports:
+  #       - 8081:8080   
+  #       - 8086:8086
+  #     cap_add:    
+  #       - SYS_RAWIO
+  #     devices:
+  #       - "/dev/sda"
+  #       # - "/dev/sdb"
+  #       - "/dev/sdc"
+  #       - "/dev/sdd"
+  #       - "/dev/sde"
+  #       - "/dev/sdf"
+  #       - "/dev/sdg"
+  #       - "/dev/sdh"
+  #       - "/dev/sdi"
+  #       - "/dev/sdj"
+  #     volumes:
+  #       - /run/udev:/run/udev:ro
+  #       - /DockerVol/scrutiny/config:/opt/scrutiny/config
+  #       - /DockerVol/scrutiny/influxdb:/opt/scrutiny/influxdb
 
 
-  glances:
-    image: nicolargo/glances
-    container_name: glances
-    hostname: glances
-    restart: always
-    network_mode: host
-    privileged: true
-    pid: host
-    volumes:
-      - /docker/volumes/glances/config:/glances/conf
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - TZ=Europe/Brussels
-      - "GLANCES_OPT=-w"
-    ports:
-      - 61208-61209:61208-61209
+  # glances:
+  #   image: nicolargo/glances
+  #   container_name: glances
+  #   hostname: glances
+  #   restart: always
+  #   network_mode: host
+  #   privileged: true
+  #   pid: host
+  #   volumes:
+  #     - /docker/volumes/glances/config:/glances/conf
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #   environment:
+  #     - TZ=Europe/Brussels
+  #     - "GLANCES_OPT=-w"
+  #   ports:
+  #     - 61208-61209:61208-61209
 
   lldap:
     image: lldap/lldap:stable