diff --git a/custom/gatus/config.yaml b/custom/gatus/config.yaml
index f9087ce..96d73dc 100644
--- a/custom/gatus/config.yaml
+++ b/custom/gatus/config.yaml
@@ -16,6 +16,8 @@ x-default-endpoint: &default
   group: misc
   ui: &default-ui
     hide-url: true
+  conditions: &default-conditions
+    - "[CONNECTED] == true"
 
 x-http-endpoint: &default-http
   <<: *default
@@ -25,31 +27,6 @@ x-http-endpoint: &default-http
 
 endpoints:
 
-  # BASE #
-
-  - name: proxy
-    <<: *default-http
-    group: base
-    url: "http://proxy"
-    conditions:
-      - "[STATUS] == 503" # as there is no service hosted @ "proxy"
-
-
-  # CORE #
-
-  - name: ntfy
-    <<: *default-http
-    group: core
-    url: "https://push.ixvd.net"
-  
-  - name: rabbitmq
-    <<: *default
-    group: core
-    url: "tcp://rabbitmq:5672"
-    conditions:
-      - "[CONNECTED] == true"
-
-
   # CLOUD #
 
   - name: cryptpad
@@ -68,10 +45,31 @@ endpoints:
   - name: gitlab
     <<: *default
     group: devops
-    url: "tcp://gitlab:80"
-    conditions:
-      - "[CONNECTED] == true" # because i've implemented something in the gitlab container 
+    url: "tcp://git.ixvd.net:80"
 
+  - name: grafana
+    <<: *default-http
+    group: devops
+    url: "https://grafana.neo.faulty.nl"
+    ui:
+      hide-hostname: true
+
+  # UTILS #
+  
+  - name: prometheus
+    <<: *default-http
+    group: utils
+    url: "http://prometheus"
+
+  - name: shlink
+    <<: *default
+    group: utils
+    url: "tcp://via.ixvd.net:80"
+
+  - name: ntfy
+    <<: *default-http
+    group: utils
+    url: "https://push.ixvd.net"
 
   # GAMES #
 
@@ -79,6 +77,21 @@ endpoints:
     <<: *default
     group: games
     url: "tcp://ixvd.net:25565"
+
+  # internal #
+
+  - name: rabbitmq
+    <<: *default
+    group: internal
+    url: "tcp://rabbitmq:5672"
     conditions:
       - "[CONNECTED] == true"
 
+  - name: proxy
+    <<: *default-http
+    group: internal
+    url: "http://proxy"
+    conditions:
+      - "[STATUS] == 503" # as there is no service hosted @ "proxy"
+
+