diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index c0a511d7..f2a390ea 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -33,6 +33,7 @@ jobs:
         continue-on-error: true
         run: |
           tea login add --name gitea-rinoa --url "${{ secrets.RINOA_GITEA_URL }}" --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }}
+          tea pr list --repo ${{ github.repository }} --state all
           pr_exists=$(tea pr list --repo ${{ github.repository }} --state open --fields index,title,head | egrep ${{ github.ref_name }} | tail -1 | wc -l)
           echo ${pr_exists}
           echo "exists=$pr_exists" >> $GITHUB_OUTPUT
diff --git a/docker-compose.yml b/docker-compose.yml
index 37132251..aad7f52a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -335,6 +335,36 @@ services:
         source: /rinoa-storage
         target: /storage
         type: bind
+  beszel:
+    container_name: beszel
+    extra_hosts:
+      - host.docker.internal:host-gateway
+    image: henrygd/beszel:latest
+    ports:
+      - 22220:8090
+    restart: unless-stopped
+    volumes:
+      - ${DOCKER_VOLUME_CONFIG}/beszel:/beszel_data
+  beszel-agent:
+    container_name: beszel-agent
+    depends_on:
+      - beszel
+    environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
+      PORT: 45876
+      # Do not remove quotes around the key
+      KEY: 'UPDATE WITH YOUR PUBLIC KEY (copy from "Add system" dialog)'
+    image: henrygd/beszel-agent:latest
+    network_mode: host
+    restart: unless-stopped
+    volumes:
+      - /dev/sda:/extra-filesystems/sda:ro
+      - /dev/sdb:/extra-filesystems/sdb:ro
+      - /dev/sdc:/extra-filesystems/sdc:ro
+      - /dev/sdd:/extra-filesystems/sdd:ro
+      - /dev/sde:/extra-filesystems/sde:ro
+      - /dev/sdf:/extra-filesystems/sdf:ro
+      - /dev/nvme0n1:/extra-filesystems/nvme0n1:ro
   bitmagnet:
     command:
       - worker
@@ -3504,50 +3534,6 @@ services:
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/privkey.pem:/etc/coturn/private/privkey.pem:ro
     #      - ${DOCKER_VOLUME_CONFIG}/netbird/cert.pem:/etc/coturn/certs/cert.pem:ro
     network_mode: host
-  netdata:
-    cap_add:
-      - SYS_PTRACE
-      - SYS_ADMIN
-    container_name: netdata
-    depends_on:
-      docker-socket-proxy:
-        condition: service_started
-        required: true
-    environment:
-      DOCKER_HOST: tcp://dockerproxy:2375
-    image: netdata/netdata:stable
-    labels:
-      homepage.group: Infrastructure/App Performance Monitoring
-      homepage.name: Netdata
-      homepage.href: https://netdata.${MY_TLD}
-      homepage.icon: netdata.svg
-      homepage.description: Real-time monitoring/observcability platform
-      homepage.widget.type: netdata
-      homepage.widget.url: http://netdata:19999
-      swag: enable
-      swag_port: 19999
-      swag_proto: http
-      swag_url: netdata.${MY_TLD}
-      swag.uptime-kuma.enabled: true
-      swag.uptime-kuma.monitor.url: https://netdata.${MY_TLD}
-    pid: host
-    ports:
-      - 19999:19999
-    restart: unless-stopped
-    security_opt:
-      - apparmor:unconfined
-    volumes:
-      - ${DOCKER_VOLUME_CONFIG}/netdata:/etc/netdata
-      - netdata-lib:/var/lib/netdata
-      - netdata-cache:/var/cache/netdata
-      - /:/host/root:ro,rslave
-      - /etc/passwd:/host/etc/passwd:ro
-      - /etc/group:/host/etc/group:ro
-      - /etc/localtime:/etc/localtime:ro
-      - /proc:/host/proc:ro
-      - /sys:/host/sys:ro
-      - /etc/os-release:/host/etc/os-release:ro
-      - /var/log:/host/var/log:ro
   nextcloud:
     container_name: nextcloud-aio-mastercontainer
     environment: