diff --git a/arr/docker-compose.yml b/arr/docker-compose.yml
index a2dc731..bd876b6 100644
--- a/arr/docker-compose.yml
+++ b/arr/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+---
 services:
   ### Downloader - Usenet
   sabnzbd:
@@ -91,4 +91,4 @@ services:
       - ./volumes/jellyseerr/config:/app/config
     ports:
       - 127.0.0.1:25055:5055
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/arr_stack/docker-compose.yml b/arr_stack/docker-compose.yml
index 4d9baf5..d2f970e 100644
--- a/arr_stack/docker-compose.yml
+++ b/arr_stack/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+---
 services:
   ### Downloader - Usenet
   sabnzbd:
@@ -16,7 +16,7 @@ services:
     ports:
       - 8080:8080
     restart: unless-stopped
-  
+
   ### Media Manager
   filebot:
     image: jlesage/filebot
@@ -51,7 +51,7 @@ services:
     restart: unless-stopped
 
   ### Content Request Management
-  #jellyseerr:
+  # jellyseerr:
   #  image: fallenbagel/jellyseerr:latest
   #  container_name: jellyseerr
   #  environment:
@@ -63,4 +63,3 @@ services:
   #  ports:
   #    - 5055:5055
   #  restart: unless-stopped
-
diff --git a/forgejo/docker-compose.yml b/forgejo/docker-compose.yml
index ceb5f7c..d81fcdf 100644
--- a/forgejo/docker-compose.yml
+++ b/forgejo/docker-compose.yml
@@ -1,3 +1,4 @@
+---
 # Copyright 2023 The Forgejo Authors.
 # SPDX-License-Identifier: MIT
 
@@ -12,15 +13,12 @@
 #       as a shared secret.
 #
 # Replace {ROOT_PASSWORD} with a secure password
-version: "3"
-
 services:
-  
   # https://code.forgejo.org/forgejo/runner/src/branch/main/examples/docker-compose
   docker-in-docker:
     image: docker:dind
     privileged: true
-    command: [ "dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false" ]
+    command: ["dockerd", "-H", "tcp://0.0.0.0:2375", "--tls=false"]
 
   forgejo:
     image: codeberg.org/forgejo/forgejo:1.21
diff --git a/homeassistant/docker-compose.yml b/homeassistant/docker-compose.yml
index 8578e95..39ace74 100644
--- a/homeassistant/docker-compose.yml
+++ b/homeassistant/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.8'
+---
 services:
   homeassistant:
     image: ghcr.io/home-assistant/home-assistant:stable
@@ -40,4 +40,4 @@ services:
       - ./volumes/mosquitto/logs:/mosquitto/log
     environment:
       - TZ=Europe/Berlin
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/homepage/docker-compose.yml b/homepage/docker-compose.yml
index e5b6ee2..29f397d 100644
--- a/homepage/docker-compose.yml
+++ b/homepage/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.6"
+---
 services:
   homepage:
     image: ghcr.io/gethomepage/homepage:latest
diff --git a/minio/docker-compose.yml b/minio/docker-compose.yml
index 9f3ade5..d1c1573 100644
--- a/minio/docker-compose.yml
+++ b/minio/docker-compose.yml
@@ -1,6 +1,4 @@
 ---
-version: '3.7'
-
 services:
   minio:
     image: quay.io/minio/minio
@@ -19,4 +17,4 @@ services:
       interval: 30s
       timeout: 20s
       retries: 3
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
index 9d62250..32d3512 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@@ -27,7 +27,7 @@ services:
     volumes:
       - ./volumes/nextcloud:/var/www/html
     ports:
-      -  "127.0.0.1:28080:80"
+      - "127.0.0.1:28080:80"
     environment:
       - MYSQL_HOST=nc_db
       - REDIS_HOST=nc_redis
diff --git a/ntfy/README.md b/ntfy/README.md
index c0e4974..9088cf8 100644
--- a/ntfy/README.md
+++ b/ntfy/README.md
@@ -1,8 +1,29 @@
 # ntfy
 
-After container startup place server.yml into volumes/ntfy:
-```
-mv server.yml voluems/ntfy
+- [ntfy](#ntfy)
+  - [Directory structure](#directory-structure)
+  - [Config](#config)
 
-docker compose restart
+## Directory structure
+```
+/opt/docker/ntfy
+.
+├── docker-compose.yml
+└── volumes
+    ├── cache
+    └── ntfy
+        └── server.yml
+```
+
+
+## Config
+```
+# Edit ntfy config
+vi server.yml
+
+# Move file into ntfy directory
+mv server.yml volumes/ntfy
+
+# Start ntfy container
+docker compose up -d
 ```
diff --git a/ntfy/docker-compose.yml b/ntfy/docker-compose.yml
index 81af4fb..726b2b4 100644
--- a/ntfy/docker-compose.yml
+++ b/ntfy/docker-compose.yml
@@ -1,7 +1,7 @@
+---
 services:
-
-  # https://docs.ntfy.sh/install/#docker
   ntfy:
+    # https://docs.ntfy.sh/install/#docker
     image: binwiederhier/ntfy
     container_name: ntfy
     command:
@@ -15,9 +15,9 @@ services:
     ports:
       - "127.0.0.1:11080:80"
     healthcheck: # optional: remember to adapt the host:port to your environment
-        test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
-        interval: 60s
-        timeout: 10s
-        retries: 3
-        start_period: 40s
+      test: ["CMD-SHELL", "wget -q --tries=1 http://localhost:80/v1/health -O - | grep -Eo '\"healthy\"\\s*:\\s*true' || exit 1"]
+      interval: 60s
+      timeout: 10s
+      retries: 3
+      start_period: 40s
     restart: unless-stopped
diff --git a/ntfy/server.yml b/ntfy/server.yml
index fec33e8..8ca5b4a 100644
--- a/ntfy/server.yml
+++ b/ntfy/server.yml
@@ -167,7 +167,7 @@ attachment-cache-dir: /var/cache/ntfy/attachments
 #   ntfy webpush keys
 web-push-public-key:
 web-push-private-key:
-web-push-file:  /var/cache/ntfy/webpush.db
+web-push-file: /var/cache/ntfy/webpush.db
 web-push-email-address: hostmaster@exmaple.com
 # web-push-startup-queries:
 
diff --git a/paperless-ngx/docker-compose.yml b/paperless-ngx/docker-compose.yml
index b9e829b..ececcc4 100644
--- a/paperless-ngx/docker-compose.yml
+++ b/paperless-ngx/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3.4"
+---
 services:
   broker:
     image: redis:6.0
@@ -27,4 +27,4 @@ services:
     env_file: docker-compose.env
     restart: unless-stopped
     environment:
-      PAPERLESS_REDIS: redis://broker:6379
\ No newline at end of file
+      PAPERLESS_REDIS: redis://broker:6379
diff --git a/pihole-unbound-hyperlocal/docker-compose.yml b/pihole-unbound-hyperlocal/docker-compose.yml
index 43ee76a..ff04391 100644
--- a/pihole-unbound-hyperlocal/docker-compose.yml
+++ b/pihole-unbound-hyperlocal/docker-compose.yml
@@ -28,9 +28,9 @@ services:
       - ./etc-pihole/:/etc/pihole/
       - ./etc-dnsmasq.d/:/etc/dnsmasq.d/
       # You'll need this, if you are using a self-created network
-      #- ./resolv.conf:/etc/resolv.conf
+      # - ./resolv.conf:/etc/resolv.conf
     # Recommended but not required (DHCP needs NET_ADMIN)
     # https://github.com/pi-hole/docker-pi-hole#note-on-capabilities
-    #cap_add:
-      #- NET_ADMIN
-    restart: unless-stopped
\ No newline at end of file
+    # cap_add:
+      # - NET_ADMIN
+    restart: unless-stopped
diff --git a/speedtest/docker-compose.yml b/speedtest/docker-compose.yml
index f7deab0..1f9910c 100644
--- a/speedtest/docker-compose.yml
+++ b/speedtest/docker-compose.yml
@@ -1,6 +1,5 @@
-version: '3.7'
+---
 services:
-    
   # https://github.com/librespeed/speedtest/blob/master/doc_docker.md
   speedtest:
     image: ghcr.io/librespeed/speedtest:latest
@@ -9,13 +8,13 @@ services:
       MODE: standalone
       TITLE: "LibreSpeed"
       TELEMETRY: "false"
-      #ENABLE_ID_OBFUSCATION: "false"
-      #REDACT_IP_ADDRESSES: "false"
-      #PASSWORD:
-      #EMAIL:
-      #DISABLE_IPINFO: "false"
-      #DISTANCE: "km"
-      #WEBPORT: 80
+      # ENABLE_ID_OBFUSCATION: "false"
+      # REDACT_IP_ADDRESSES: "false"
+      # PASSWORD:
+      # EMAIL:
+      # DISABLE_IPINFO: "false"
+      # DISTANCE: "km"
+      # WEBPORT: 80
     ports:
       - "127.0.0.1:8082:80" # webport mapping (host:container)
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/tandoor/docker-compose.yml b/tandoor/docker-compose.yml
index 297bd98..665b539 100644
--- a/tandoor/docker-compose.yml
+++ b/tandoor/docker-compose.yml
@@ -1,6 +1,5 @@
-version: "3"
+---
 services:
-
   # https://docs.tandoor.dev/install/docker/
   tandoor:
     image: vabene1111/recipes
@@ -15,4 +14,4 @@ services:
       # When using PostgreSQL
       # - ./volumes/staticfiles:/opt/recipes/staticfiles
       # - ./volumes/mediafiles:/opt/recipes/mediafiles
-    restart: unless-stopped
\ No newline at end of file
+    restart: unless-stopped
diff --git a/template/docker-compose.yml b/template/docker-compose.yml
new file mode 100644
index 0000000..4da25f2
--- /dev/null
+++ b/template/docker-compose.yml
@@ -0,0 +1,12 @@
+---
+services:
+  service_name:
+    image:
+    container_name:
+    environment:
+    env_file:
+    command:
+    ports:
+    volumes:
+    depends_on:
+    restart: unless-stopped
diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/docker-compose.yml
index 32a7d7e..bc3cad8 100644
--- a/uptime-kuma/docker-compose.yml
+++ b/uptime-kuma/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.3'
+---
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:latest
@@ -7,4 +7,4 @@ services:
       - ./volumes/data:/app/data
     ports:
       - 127.0.0.1:13001:3001
-    restart: always
\ No newline at end of file
+    restart: unless-stopped
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/docker-compose.yml
index c163aba..b6b8892 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3'
+---
 services:
   vaultwarden:
     image: vaultwarden/server:latest
@@ -16,5 +16,5 @@ services:
       ICON_CACHE_TTL: 0
       ICON_SERVICE: 'internal'
       DISABLE_ICON_DOWNLOAD: 'true'
-      #LOG_LEVEL: 'debug'
-    restart: unless-stopped
\ No newline at end of file
+      # LOG_LEVEL: 'debug'
+    restart: unless-stopped