diff --git a/Doku/docker-compose.yaml b/Doku/docker-compose.yaml
index f3b22ec..3f60b79 100644
--- a/Doku/docker-compose.yaml
+++ b/Doku/docker-compose.yaml
@@ -1,9 +1,16 @@
 services:
-  app:
+  doku:
     image: amerkurev/doku:latest
+    container_name: doku
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro \
-      - /:/hostroot:ro \
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - /:/hostroot:ro
     ports:
       - ${DOKU_PORT}:9090
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "wget -qO- http://localhost:9090/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 10s
diff --git a/Draw.io/.env.example b/Draw.io/.env.example
index 43645d8..6e0e878 100644
--- a/Draw.io/.env.example
+++ b/Draw.io/.env.example
@@ -1,2 +1,6 @@
 # Main interface port for accessing the application
-DRAWIO_PORT="8000"
\ No newline at end of file
+DRAWIO_PORT="8000"
+
+# Enable local PDF/image export without relying on an external service
+# Set to 1 to enable, 0 or omit to disable
+DRAWIO_SELF_CONTAINED="0"
diff --git a/Draw.io/docker-compose.yaml b/Draw.io/docker-compose.yaml
index 44c61bc..b3126fb 100644
--- a/Draw.io/docker-compose.yaml
+++ b/Draw.io/docker-compose.yaml
@@ -1,6 +1,15 @@
 services:
-    app:
-        image: jgraph/drawio:latest
-        ports:
-          - ${DRAWIO_PORT}:8080
-        restart: unless-stopped
\ No newline at end of file
+  drawio:
+    image: jgraph/drawio:latest
+    container_name: drawio
+    ports:
+      - ${DRAWIO_PORT}:8080
+    environment:
+      - DRAWIO_SELF_CONTAINED=${DRAWIO_SELF_CONTAINED:-0}
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "curl -f http://localhost:8080/ || exit 1"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
+      start_period: 30s