diff --git a/namespaces/monitoring/gatus/base-config.yaml b/namespaces/monitoring/gatus/base-config.yaml
index b0c17c1..449c0b6 100644
--- a/namespaces/monitoring/gatus/base-config.yaml
+++ b/namespaces/monitoring/gatus/base-config.yaml
@@ -22,6 +22,7 @@ alerting:
       failure-threshold: 3
 
 endpoints:
+  # Self
   - name: Gatus
     url: http://gatus-svc.monitoring.svc.cluster.local:8080/health
     group: Internal/Monitoring
@@ -30,6 +31,7 @@ endpoints:
       - "[STATUS] == 200"
     alerts:
       - type: ntfy
+  # Static Sites
   - name: Blog
     url: https://blog.leechpepin.com
     group: Static Pages
@@ -46,3 +48,60 @@ endpoints:
       - "[STATUS] == 200"
     alerts:
       - type: ntfy
+  # Server pings
+  - name: Arthur
+    url: "icmp://arthur.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: Blackstaff
+    url: "icmp://blackstaff.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: dresden
+    url: "icmp://dresden.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: jlpgreencloud
+    url: "icmp://jlpgreencloud.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: jlpks8888
+    url: "icmp://jlpks8888.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: jlpatl
+    url: "icmp://jlpatl.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
+  - name: Headscale
+    url: "icmp://headscale.leechpepin.tailnet"
+    group: Servers
+    interval: 5m
+    conditions:
+      - "[CONNECTED] == true"
+    alerts:
+      - type: ntfy
diff --git a/namespaces/monitoring/gatus/patches/deployment.yaml b/namespaces/monitoring/gatus/patches/deployment.yaml
index 1185fc8..60148a6 100644
--- a/namespaces/monitoring/gatus/patches/deployment.yaml
+++ b/namespaces/monitoring/gatus/patches/deployment.yaml
@@ -74,8 +74,10 @@ spec:
               subPath: base-config.yaml
             - name: collected
               mountPath: /config/
+      initContainers:
         - name: config-collector
           image: kiwigrid/k8s-sidecar:1.30.3
+          restartPolicy: Always
           volumeMounts:
             - name: collected
               mountPath: /config/
@@ -85,6 +87,17 @@ spec:
           envFrom:
             - configMapRef:
                 name: k8s-sidecar-settings
+          startupProbe:
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - '[ $(find /config -name "*-gatus-endpoints.yaml" | wc -l) -gt 0 ]'
+            initialDelaySeconds: 2
+            periodSeconds: 5
+            timeoutSeconds: 1
+            successThreshold: 1
+            failureThreshold: 3
       volumes:
         - configMap:
             name: base-config