diff --git a/docker-compose.yml b/docker-compose.yml
index aef3e98..96d0b01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,7 @@ include:
 
   - path:
       - ${INFRA_PATH}/authelia/authelia.yml
+      - ${INFRA_PATH}/beszel/beszel.yml
       - ${INFRA_PATH}/homepage/homepage.yml
       - ${INFRA_PATH}/ntfy/ntfy.yml
       - ${INFRA_PATH}/speedtest/speedtest.yml
diff --git a/project/infrastructure/beszel/beszel.yml b/project/infrastructure/beszel/beszel.yml
new file mode 100644
index 0000000..412b741
--- /dev/null
+++ b/project/infrastructure/beszel/beszel.yml
@@ -0,0 +1,40 @@
+services:
+  beszel:
+    extends:
+      file: ${TEMPLATES_PATH}
+      service: default
+    image: henrygd/beszel:0.18.7
+    container_name: beszel
+    environment:
+      APP_URL: http://localhost:8090
+    ports:
+      - 3004:8090
+    volumes:
+      - ${INFRA_PATH}/beszel/data/service:/beszel_data
+      - ${INFRA_PATH}/beszel/socket:/beszel_socket
+    networks:
+      - ip4net
+    labels:
+      # Traefik
+      - "traefik.enable=true"
+      - "traefik.http.routers.beszel.rule=Host(`beszel.${LOCAL_DOMAIN}`)"
+      - "traefik.http.routers.beszel.entrypoints=https"
+      - "traefik.http.routers.beszel.tls=true"
+
+  beszel-agent:
+    extends:
+      file: ${TEMPLATES_PATH}
+      service: default
+    image: henrygd/beszel-agent:0.18.7
+    container_name: beszel-agent
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - ${INFRA_PATH}/beszel/data/agent:/var/lib/beszel-agent
+      - ${INFRA_PATH}/beszel/socket:/beszel_socket
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      LISTEN: /beszel_socket/beszel.sock
+      HUB_URL: http://localhost:8090
+      TOKEN: ${BESZEL_CRESCENTEC_TOKEN} 
+      KEY: ${BESZEL_CRESCENTEC_KEY}