diff --git a/README.md b/README.md
index 8db116d..cf5eada 100644
--- a/README.md
+++ b/README.md
@@ -113,3 +113,8 @@ docker compose rm -f
 # Rebuild containers with updated images
 docker compose up -d --build
 ```
+
+--- 
+## Docker Compose specifications
+
+Read more about the `compose.yaml` file specifications at - https://docs.docker.com/compose/compose-file/
\ No newline at end of file
diff --git a/adguard-home/docker-compose.yml b/adguard-home/compose.yaml
similarity index 99%
rename from adguard-home/docker-compose.yml
rename to adguard-home/compose.yaml
index c0e3161..31581bc 100644
--- a/adguard-home/docker-compose.yml
+++ b/adguard-home/compose.yaml
@@ -1,4 +1,3 @@
-version: '3.3'
 services:
   adguard-home:
     image: adguard/adguardhome
diff --git a/audiobookshelf/docker-compose.yml b/audiobookshelf/compose.yaml
similarity index 97%
rename from audiobookshelf/docker-compose.yml
rename to audiobookshelf/compose.yaml
index b7bddbd..101ef1f 100644
--- a/audiobookshelf/docker-compose.yml
+++ b/audiobookshelf/compose.yaml
@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   audiobookshelf:
     image: ghcr.io/advplyr/audiobookshelf:latest
diff --git a/calibre-web/docker-compose.yml b/calibre-web/compose.yaml
similarity index 97%
rename from calibre-web/docker-compose.yml
rename to calibre-web/compose.yaml
index 703299d..e4af42d 100644
--- a/calibre-web/docker-compose.yml
+++ b/calibre-web/compose.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   calibre-web:
     image: linuxserver/calibre-web:latest
diff --git a/cloudflare-ddns/docker-compose.yml b/cloudflare-ddns/compose.yaml
similarity index 97%
rename from cloudflare-ddns/docker-compose.yml
rename to cloudflare-ddns/compose.yaml
index 3d8891c..3d75ff2 100644
--- a/cloudflare-ddns/docker-compose.yml
+++ b/cloudflare-ddns/compose.yaml
@@ -1,4 +1,3 @@
-version: '2'
 services:
   cloudflare-ddns:
     container_name: cloudflare-ddns
diff --git a/code-server/docker-compose.yml b/code-server/compose.yaml
similarity index 97%
rename from code-server/docker-compose.yml
rename to code-server/compose.yaml
index 1dc9d02..26a2a7b 100644
--- a/code-server/docker-compose.yml
+++ b/code-server/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   code-server:
     image: linuxserver/code-server
diff --git a/dockprom/docker-compose.yml b/dockprom/compose.yaml
similarity index 99%
rename from dockprom/docker-compose.yml
rename to dockprom/compose.yaml
index f51dac5..9a88df0 100644
--- a/dockprom/docker-compose.yml
+++ b/dockprom/compose.yaml
@@ -1,5 +1,3 @@
-version: '2.1'
-
 networks:
   monitor-net:
     driver: bridge
diff --git a/dockprom/docker-compose.exporters.yml b/dockprom/docker-compose.exporters.yml
index f0b9b95..1fa002d 100644
--- a/dockprom/docker-compose.exporters.yml
+++ b/dockprom/docker-compose.exporters.yml
@@ -1,5 +1,3 @@
-version: '2.1'
-
 services:
 
   nodeexporter:
diff --git a/duplicati/docker-compose.yml b/duplicati/compose.yaml
similarity index 97%
rename from duplicati/docker-compose.yml
rename to duplicati/compose.yaml
index 7361636..403e44e 100644
--- a/duplicati/docker-compose.yml
+++ b/duplicati/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   duplicati:
     image: linuxserver/duplicati
diff --git a/gitea/docker-compose.yml b/gitea/compose.yaml
similarity index 98%
rename from gitea/docker-compose.yml
rename to gitea/compose.yaml
index 20fc5c7..93acb8d 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/compose.yaml
@@ -1,9 +1,3 @@
-version: "3"
-
-networks:
-  gitea:
-    external: false
-
 services:
   server:
     image: gitea/gitea:1.15.0
@@ -42,3 +36,7 @@ services:
       - gitea
     volumes:
       - ./mysql:/var/lib/mysql
+
+networks:
+  gitea:
+    external: false
diff --git a/gotify/docker-compose.yml b/gotify/compose.yaml
similarity index 97%
rename from gotify/docker-compose.yml
rename to gotify/compose.yaml
index ab47b83..1925cf6 100644
--- a/gotify/docker-compose.yml
+++ b/gotify/compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 services:
   gotify:
     image: gotify/server-arm64
diff --git a/grocy/docker-compose.yml b/grocy/compose.yaml
similarity index 85%
rename from grocy/docker-compose.yml
rename to grocy/compose.yaml
index 1dad806..6c5fe39 100644
--- a/grocy/docker-compose.yml
+++ b/grocy/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   grocy:
     image: linuxserver/grocy
@@ -7,9 +5,9 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Amrerica/Chicago                                             # Change this
+      - TZ=Amrerica/Chicago                                       # Change this
     volumes:
       - /home/pi/home-server/grocy/config:/config                 # Change this
     ports:
-      - 80:80                                                           # Change this
+      - 80:80                                                     # Change this
     restart: unless-stopped
\ No newline at end of file
diff --git a/guacamole/docker-compose.yml b/guacamole/compose.yaml
similarity index 97%
rename from guacamole/docker-compose.yml
rename to guacamole/compose.yaml
index 04f1179..8c57592 100644
--- a/guacamole/docker-compose.yml
+++ b/guacamole/compose.yaml
@@ -1,9 +1,3 @@
-version: '2.0'
-
-networks:
-  guacnetwork_compose:
-    driver: bridge
-
 services:
   guacd:
     container_name: guacamole_guacd
@@ -49,3 +43,7 @@ services:
     ports:
       - 9628:8080/tcp # Guacamole is on :8080/guacamole, not /.
     restart: always
+
+networks:
+  guacnetwork_compose:
+    driver: bridge
\ No newline at end of file
diff --git a/home-assistant/docker-compose.yml b/home-assistant/compose.yaml
similarity index 96%
rename from home-assistant/docker-compose.yml
rename to home-assistant/compose.yaml
index 4873bd7..6b39d83 100644
--- a/home-assistant/docker-compose.yml
+++ b/home-assistant/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   homeassistant:
     image: linuxserver/homeassistant
diff --git a/homer/docker-compose.yml b/homer/compose.yaml
similarity index 94%
rename from homer/docker-compose.yml
rename to homer/compose.yaml
index e3e08f4..7390fad 100644
--- a/homer/docker-compose.yml
+++ b/homer/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2"
 services:
   homer:
     image: b4bz/homer
diff --git a/immich/docker-compose.yml b/immich/compose.yaml
similarity index 51%
rename from immich/docker-compose.yml
rename to immich/compose.yaml
index a664c71..927a95f 100644
--- a/immich/docker-compose.yml
+++ b/immich/compose.yaml
@@ -1,5 +1,3 @@
-version: "3.8"
-
 #
 # WARNING: Make sure to use the docker-compose.yml of the current release:
 #
@@ -8,13 +6,18 @@ version: "3.8"
 # The compose file on main may not be compatible with the latest release.
 #
 
+name: immich
+
 services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    command: [ "start.sh", "immich" ]
+    # extends:
+    #   file: hwaccel.transcoding.yml
+    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload              # defined in .env file
+      # Do not edit the next line. If you want to change the media storage location on your system, edit the value of UPLOAD_LOCATION in the .env file
+      - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro
     env_file:
       - .env
@@ -24,26 +27,8 @@ services:
       - redis
       - database
     restart: always
-
-  immich-microservices:
-    container_name: immich_microservices
-    image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    # extends: # uncomment this section for hardware acceleration - see https://immich.app/docs/features/hardware-transcoding
-    #   file: hwaccel.transcoding.yml 
-    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
-    # extends:
-    #   file: hwaccel.yml
-    #   service: hwaccel
-    command: [ "start.sh", "microservices" ]
-    volumes:
-      - ${UPLOAD_LOCATION}:/usr/src/app/upload             # defined in .env file
-      - /etc/localtime:/etc/localtime:ro
-    env_file:
-      - .env
-    depends_on:
-      - redis
-      - database
-    restart: always
+    healthcheck:
+      disable: false
 
   immich-machine-learning:
     container_name: immich_machine_learning
@@ -58,25 +43,34 @@ services:
     env_file:
       - .env
     restart: always
+    healthcheck:
+      disable: false
 
   redis:
     container_name: immich_redis
-    image: redis:6.2-alpine@sha256:70a7a5b641117670beae0d80658430853896b5ef269ccf00d1827427e3263fa3
+    image: docker.io/redis:6.2-alpine@sha256:e3b17ba9479deec4b7d1eeec1548a253acc5374d68d3b27937fcfe4df8d18c7e
+    healthcheck:
+      test: redis-cli ping || exit 1
     restart: always
 
   database:
     container_name: immich_postgres
-    image: tensorchord/pgvecto-rs:pg15-v0.2.0               # Default installation uses pg14
-    env_file:
-      - .env
+    image: docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0@sha256:90724186f0a3517cf6914295b5ab410db9ce23190a2d9d0b9dd6463e3fa298f0
     environment:
       POSTGRES_PASSWORD: ${DB_PASSWORD}
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_DB: ${DB_DATABASE_NAME}
+      POSTGRES_INITDB_ARGS: '--data-checksums'
     volumes:
-      - pgdata:/var/lib/postgresql/data
+      # Do not edit the next line. If you want to change the database storage location on your system, edit the value of DB_DATA_LOCATION in the .env file
+      - ${DB_DATA_LOCATION}:/var/lib/postgresql/data
+    healthcheck:
+      test: pg_isready --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' || exit 1; Chksum="$$(psql --dbname='${DB_DATABASE_NAME}' --username='${DB_USERNAME}' --tuples-only --no-align --command='SELECT COALESCE(SUM(checksum_failures), 0) FROM pg_stat_database')"; echo "checksum failure count is $$Chksum"; [ "$$Chksum" = '0' ] || exit 1
+      interval: 5m
+      start_interval: 30s
+      start_period: 5m
+    command: ["postgres", "-c", "shared_preload_libraries=vectors.so", "-c", 'search_path="$$user", public, vectors', "-c", "logging_collector=on", "-c", "max_wal_size=2GB", "-c", "shared_buffers=512MB", "-c", "wal_compression=on"]
     restart: always
 
 volumes:
-  pgdata:
-  model-cache:
\ No newline at end of file
+  model-cache:
diff --git a/joplin/docker-compose.yml b/joplin/compose.yaml
similarity index 98%
rename from joplin/docker-compose.yml
rename to joplin/compose.yaml
index 6c4bafc..2b65501 100644
--- a/joplin/docker-compose.yml
+++ b/joplin/compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
     app:
         environment:
diff --git a/mealie/docker-compose.yml b/mealie/compose.yaml
similarity index 97%
rename from mealie/docker-compose.yml
rename to mealie/compose.yaml
index cd74629..0e66f05 100644
--- a/mealie/docker-compose.yml
+++ b/mealie/compose.yaml
@@ -1,4 +1,3 @@
-version: "3.1"
 services:
   mealie:
     container_name: mealie
diff --git a/nextcloud/docker-compose.yml b/nextcloud/compose.yaml
similarity index 98%
rename from nextcloud/docker-compose.yml
rename to nextcloud/compose.yaml
index 95f929e..3ca9570 100644
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/compose.yaml
@@ -1,9 +1,3 @@
-version: '3.8'
-
-volumes:
-  nextcloud:
-  db:
-
 services:
   db:
     image: arm64v8/mariadb:10.5
@@ -71,4 +65,8 @@ services:
     entrypoint: /cron.sh
     depends_on:
       - db
-      - redis
\ No newline at end of file
+      - redis
+
+volumes:
+  nextcloud:
+  db:
diff --git a/nextcloud/docker-compose-ffmpeg.yml b/nextcloud/docker-compose-ffmpeg.yaml
similarity index 98%
rename from nextcloud/docker-compose-ffmpeg.yml
rename to nextcloud/docker-compose-ffmpeg.yaml
index de5a70d..56ab434 100644
--- a/nextcloud/docker-compose-ffmpeg.yml
+++ b/nextcloud/docker-compose-ffmpeg.yaml
@@ -1,9 +1,3 @@
-version: '3.8'
-
-volumes:
-  nextcloud:
-  db:
-
 services:
   db:
     image: arm64v8/mariadb:10.5
@@ -75,4 +69,8 @@ services:
     entrypoint: /cron.sh
     depends_on:
       - db
-      - redis
\ No newline at end of file
+      - redis
+
+volumes:
+  nextcloud:
+  db:
\ No newline at end of file
diff --git a/nginx-proxy-manager/docker-compose.yml b/nginx-proxy-manager/compose.yaml
similarity index 98%
rename from nginx-proxy-manager/docker-compose.yml
rename to nginx-proxy-manager/compose.yaml
index 1aa7d35..67184bd 100644
--- a/nginx-proxy-manager/docker-compose.yml
+++ b/nginx-proxy-manager/compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   app:
     image: 'jc21/nginx-proxy-manager:latest'
diff --git a/overseerr/docker-compose.yml b/overseerr/compose.yaml
similarity index 94%
rename from overseerr/docker-compose.yml
rename to overseerr/compose.yaml
index e46d9f7..505894d 100644
--- a/overseerr/docker-compose.yml
+++ b/overseerr/compose.yaml
@@ -1,6 +1,3 @@
----
-version: '3'
-
 services:
   overseerr:
     image: sctx/overseerr:latest
diff --git a/pairdrop/docker-compose.yml b/pairdrop/compose.yaml
similarity index 96%
rename from pairdrop/docker-compose.yml
rename to pairdrop/compose.yaml
index 830bbbe..29a9794 100644
--- a/pairdrop/docker-compose.yml
+++ b/pairdrop/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   pairdrop:
     image: lscr.io/linuxserver/pairdrop:latest
diff --git a/paperless-ng/docker-compose.yml b/paperless-ng/compose.yaml
similarity index 99%
rename from paperless-ng/docker-compose.yml
rename to paperless-ng/compose.yaml
index d29ea2d..9f25d32 100644
--- a/paperless-ng/docker-compose.yml
+++ b/paperless-ng/compose.yaml
@@ -31,7 +31,6 @@
 # For more extensive installation and update instructions, refer to the
 # documentation.
 
-version: "3.4"
 services:
   broker:
     container_name: paperless_broker
diff --git a/photoprism/docker-compose.yml b/photoprism/compose.yaml
similarity index 99%
rename from photoprism/docker-compose.yml
rename to photoprism/compose.yaml
index cdd8541..394cf49 100644
--- a/photoprism/docker-compose.yml
+++ b/photoprism/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.5'
-
 # Example Docker Compose config file for PhotoPrism (Raspberry Pi / ARM64)
 #
 # Documentation : https://docs.photoprism.org/getting-started/raspberry-pi/
diff --git a/pihole/docker-compose.yml b/pihole/compose.yaml
similarity index 98%
rename from pihole/docker-compose.yml
rename to pihole/compose.yaml
index b1bf46d..7e61271 100644
--- a/pihole/docker-compose.yml
+++ b/pihole/compose.yaml
@@ -1,5 +1,3 @@
-version: "3"
-
 # More info at https://github.com/pi-hole/docker-pi-hole/ and https://docs.pi-hole.net/
 services:
   pihole:
diff --git a/plex/docker-compose.yml b/plex/compose.yaml
similarity index 98%
rename from plex/docker-compose.yml
rename to plex/compose.yaml
index 73049b3..823bedb 100644
--- a/plex/docker-compose.yml
+++ b/plex/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   plex:
     image: ghcr.io/linuxserver/plex
diff --git a/podgrab/docker-compose.yml b/podgrab/compose.yaml
similarity index 96%
rename from podgrab/docker-compose.yml
rename to podgrab/compose.yaml
index 340d9ce..1dfb061 100644
--- a/podgrab/docker-compose.yml
+++ b/podgrab/compose.yaml
@@ -1,4 +1,3 @@
-version: "2.1"
 services:
   podgrab:
     image: akhilrex/podgrab
diff --git a/snapdrop/docker-compose.yml b/snapdrop/compose.yaml
similarity index 96%
rename from snapdrop/docker-compose.yml
rename to snapdrop/compose.yaml
index aca852d..bdd91ee 100644
--- a/snapdrop/docker-compose.yml
+++ b/snapdrop/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   snapdrop:
     image: linuxserver/snapdrop
diff --git a/surfshark/docker-compose.yml b/surfshark/compose.yaml
similarity index 99%
rename from surfshark/docker-compose.yml
rename to surfshark/compose.yaml
index 5d38960..3103dc0 100644
--- a/surfshark/docker-compose.yml
+++ b/surfshark/compose.yaml
@@ -1,5 +1,3 @@
-version: "2"
-
 services: 
     surfshark:
         # Image from https://github.com/ilteoood/docker-surfshark
diff --git a/traggo/docker-compose.yml b/traggo/compose.yaml
similarity index 94%
rename from traggo/docker-compose.yml
rename to traggo/compose.yaml
index c12ec13..c3cc5d0 100644
--- a/traggo/docker-compose.yml
+++ b/traggo/compose.yaml
@@ -1,4 +1,3 @@
-version: "3.7"
 services:
   traggo:
     image: traggo/server:latest
diff --git a/tube-archivist/docker-compose.yml b/tube-archivist/compose.yaml
similarity index 99%
rename from tube-archivist/docker-compose.yml
rename to tube-archivist/compose.yaml
index 1581ba5..08e2d3e 100644
--- a/tube-archivist/docker-compose.yml
+++ b/tube-archivist/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.3'
-
 services:
   tubearchivist:
     container_name: tubearchivist
diff --git a/uptime-kuma/docker-compose.yml b/uptime-kuma/compose.yaml
similarity index 93%
rename from uptime-kuma/docker-compose.yml
rename to uptime-kuma/compose.yaml
index 2e302e9..0f0ebf5 100644
--- a/uptime-kuma/docker-compose.yml
+++ b/uptime-kuma/compose.yaml
@@ -1,5 +1,3 @@
-version: '3.3'
-
 services:
   uptime-kuma:
     image: louislam/uptime-kuma
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/compose.yaml
similarity index 77%
rename from vaultwarden/docker-compose.yml
rename to vaultwarden/compose.yaml
index a898520..f328556 100644
--- a/vaultwarden/docker-compose.yml
+++ b/vaultwarden/compose.yaml
@@ -1,5 +1,3 @@
-version: '3'
-
 services:
   vaultwarden:
     image: vaultwarden/server:latest
@@ -10,4 +8,4 @@ services:
     volumes:
       - ./vw-data:/data
     ports:
-      - 8080:80                                 # Change this
+      - 8080:80                                 # Change this
\ No newline at end of file
diff --git a/vikunja/docker-compose.yml b/vikunja/compose.yaml
similarity index 98%
rename from vikunja/docker-compose.yml
rename to vikunja/compose.yaml
index 4ed3862..8f3d268 100644
--- a/vikunja/docker-compose.yml
+++ b/vikunja/compose.yaml
@@ -14,7 +14,7 @@ services:
       VIKUNJA_CACHE_ENABLED: 1
       VIKUNJA_CACHE_TYPE: 'redis'
       VIKUNJA_SERVICE_ROOTPATH: '/home/pi/vikunja'                                         # Change this
-      VIKUNJA_SERVICE_FRONTENDURL: 'https://vikunja.example.com' .                         # Change this
+      VIKUNJA_SERVICE_FRONTENDURL: 'https://vikunja.example.com'                           # Change this
       VIKUNJA_SERVICE_ENABLECALDAV: 'true'
       VIKUNJA_SERVICE_ENABLELINKSHARING: 'true'
       VIKUNJA_SERVICE_ENABLETASKATTACHMENTS: 'true'
diff --git a/wallabag/docker-compose.yml b/wallabag/compose.yaml
similarity index 99%
rename from wallabag/docker-compose.yml
rename to wallabag/compose.yaml
index 315359e..02ed450 100644
--- a/wallabag/docker-compose.yml
+++ b/wallabag/compose.yaml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   wallabag:
     image: abhilesh7/wallabag-arm
diff --git a/watchtower/docker-compose.yml b/watchtower/compose.yaml
similarity index 99%
rename from watchtower/docker-compose.yml
rename to watchtower/compose.yaml
index abf22ba..a7392c8 100644
--- a/watchtower/docker-compose.yml
+++ b/watchtower/compose.yaml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   watchtower:
     image: containrrr/watchtower:latest
diff --git a/wireguard/docker-compose.yml b/wireguard/compose.yaml
similarity index 98%
rename from wireguard/docker-compose.yml
rename to wireguard/compose.yaml
index 99ea440..442ec47 100644
--- a/wireguard/docker-compose.yml
+++ b/wireguard/compose.yaml
@@ -1,5 +1,3 @@
----
-version: "2.1"
 services:
   wireguard:
     image: linuxserver/wireguard
diff --git a/wordpress/docker-compose.yml b/wordpress/compose.yaml
similarity index 100%
rename from wordpress/docker-compose.yml
rename to wordpress/compose.yaml