diff --git a/adguardhome-sync/docker-compose.yaml b/adguardhome-sync/docker-compose.yml
similarity index 100%
rename from adguardhome-sync/docker-compose.yaml
rename to adguardhome-sync/docker-compose.yml
diff --git a/adguardhome/docker-compose-sync.yaml b/adguardhome/docker-compose-sync.yml
similarity index 100%
rename from adguardhome/docker-compose-sync.yaml
rename to adguardhome/docker-compose-sync.yml
diff --git a/adguardhome/docker-compose.yaml b/adguardhome/docker-compose.yml
similarity index 100%
rename from adguardhome/docker-compose.yaml
rename to adguardhome/docker-compose.yml
diff --git a/airsonic-advanced/docker-compose.yaml b/airsonic-advanced/docker-compose.yml
similarity index 100%
rename from airsonic-advanced/docker-compose.yaml
rename to airsonic-advanced/docker-compose.yml
diff --git a/authelia/docker-compose.yaml b/authelia/docker-compose.yml
similarity index 100%
rename from authelia/docker-compose.yaml
rename to authelia/docker-compose.yml
diff --git a/bookstack/docker-compose.yaml b/bookstack/docker-compose.yml
similarity index 100%
rename from bookstack/docker-compose.yaml
rename to bookstack/docker-compose.yml
diff --git a/caddy-reverse-proxy/docker-compose-dns.yaml b/caddy-reverse-proxy/docker-compose-dns.yaml
deleted file mode 100644
index 63e6cfa..0000000
--- a/caddy-reverse-proxy/docker-compose-dns.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "3.8"
-services:
-  caddy-reverse-proxy:
-    image: "slothcroissant/caddy-cloudflaredns:2.10.0"
-    container_name: "caddy-reverse-proxy"
-    cap_add:
-      - NET_ADMIN
-    environment:
-      - "CLOUDFLARE_EMAIL=${CLOUDFLARE_EMAIL}"
-      - "CLOUDFLARE_API_TOKEN=${CLOUDFLARE_API_TOKEN}"
-      - "ACME_AGREE=true"
-    volumes:
-      - "${CADDYFILE_PATH}:/etc/caddy/Caddyfile"
-      - "${CONF_PATH}:/config"
-      - "${DATA_PATH}:/data"
-      - "${LOG_PATH}:/var/log/caddy"
-      - "${SITE_PATH}:/srv"
-    ports:
-      - "${HTTP}:80"
-      - "${HTTPS}:443"
-    restart: "unless-stopped"
diff --git a/caddy-reverse-proxy/docker-compose.yaml b/caddy-reverse-proxy/docker-compose.yml
similarity index 100%
rename from caddy-reverse-proxy/docker-compose.yaml
rename to caddy-reverse-proxy/docker-compose.yml
diff --git a/changedetection/docker-compose.yaml b/changedetection/docker-compose.yml
similarity index 100%
rename from changedetection/docker-compose.yaml
rename to changedetection/docker-compose.yml
diff --git a/cloudflare-ddns/docker-compose.yaml b/cloudflare-ddns/docker-compose.yml
similarity index 100%
rename from cloudflare-ddns/docker-compose.yaml
rename to cloudflare-ddns/docker-compose.yml
diff --git a/dockerproxy/docker-compose.yaml b/dockerproxy/docker-compose.yml
similarity index 100%
rename from dockerproxy/docker-compose.yaml
rename to dockerproxy/docker-compose.yml
diff --git a/duplicati/docker-compose.yaml b/duplicati/docker-compose.yml
similarity index 100%
rename from duplicati/docker-compose.yaml
rename to duplicati/docker-compose.yml
diff --git a/ferdium-server/docker-compose.yaml b/ferdium-server/docker-compose.yml
similarity index 100%
rename from ferdium-server/docker-compose.yaml
rename to ferdium-server/docker-compose.yml
diff --git a/forgejo/docker-compose.yaml b/forgejo/docker-compose.yml
similarity index 100%
rename from forgejo/docker-compose.yaml
rename to forgejo/docker-compose.yml
diff --git a/glances/docker-compose-rayquaza.yaml b/glances/docker-compose-rayquaza.yaml
deleted file mode 100644
index c02aa39..0000000
--- a/glances/docker-compose-rayquaza.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "3.8"
-services:
-  glances:
-    image: "nicolargo/glances:4.3.0.8"
-    container_name: "glances"
-    hostname: "Rayquaza"
-    pid: "host"
-    environment:
-      - "GLANCES_OPT=-w"
-    ports:
-      - "${PORT}:61208"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "/:/mnt/root"
-    restart: "unless-stopped"
diff --git a/glances/docker-compose.yaml b/glances/docker-compose.yaml
deleted file mode 100644
index e123046..0000000
--- a/glances/docker-compose.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "3.8"
-services:
-  glances:
-    image: "nicolargo/glances:4.3.0.8"
-    container_name: "glances"
-    hostname: "Hostname"
-    pid: "host"
-    environment:
-      - "GLANCES_OPT=-w"
-    ports:
-      - "${PORT}:61208"
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "/:/mnt/root"
-    restart: "unless-stopped"
diff --git a/glances/docker-compose-cosmoem.yaml b/glances/docker-compose.yml
similarity index 91%
rename from glances/docker-compose-cosmoem.yaml
rename to glances/docker-compose.yml
index e555243..a63d71a 100644
--- a/glances/docker-compose-cosmoem.yaml
+++ b/glances/docker-compose.yml
@@ -3,7 +3,7 @@ services:
   glances:
     image: "nicolargo/glances:4.3.0.8"
     container_name: "glances"
-    hostname: "Cosmoem"
+    hostname: "${HOSTNAME}"
     pid: "host"
     environment:
       - "GLANCES_OPT=-w"
diff --git a/gotify/docker-compose-arm64.yaml b/gotify/docker-compose-arm64.yml
similarity index 87%
rename from gotify/docker-compose-arm64.yaml
rename to gotify/docker-compose-arm64.yml
index d4e2cf7..c901359 100644
--- a/gotify/docker-compose-arm64.yaml
+++ b/gotify/docker-compose-arm64.yml
@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   gotify:
-    image: "gotify/server-arm64:2.6.3"
+    image: "gotify/server:2.6.3"
     container_name: "gotify"
     environment:
       - "TZ=${TZ}"
diff --git a/healthchecks/docker-compose.yaml b/healthchecks/docker-compose.yml
similarity index 100%
rename from healthchecks/docker-compose.yaml
rename to healthchecks/docker-compose.yml
diff --git a/homeassistant/docker-compose-ls.yaml b/homeassistant/docker-compose-ls.yaml
deleted file mode 100644
index d32f660..0000000
--- a/homeassistant/docker-compose-ls.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "3.8"
-services:
-  homeassistant:
-    image: "linuxserver/homeassistant:2025.5.3"
-    container_name: "homeassistant"
-    environment:
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "TZ=${TZ}"
-    network_mode: "host"
-    volumes:
-      - "${CONFIG_PATH}:/config"
-    restart: "unless-stopped"
diff --git a/homeassistant/docker-compose.yaml b/homeassistant/docker-compose.yml
similarity index 100%
rename from homeassistant/docker-compose.yaml
rename to homeassistant/docker-compose.yml
diff --git a/homepage/docker-compose.yaml b/homepage/docker-compose.yml
similarity index 100%
rename from homepage/docker-compose.yaml
rename to homepage/docker-compose.yml
diff --git a/immich/docker-compose.yaml b/immich/docker-compose.yml
similarity index 100%
rename from immich/docker-compose.yaml
rename to immich/docker-compose.yml
diff --git a/joplin/docker-compose.yaml b/joplin/docker-compose.yml
similarity index 100%
rename from joplin/docker-compose.yaml
rename to joplin/docker-compose.yml
diff --git a/komga/docker-compose.yaml b/komga/docker-compose.yml
similarity index 100%
rename from komga/docker-compose.yaml
rename to komga/docker-compose.yml
diff --git a/kopia/docker-compose.yaml b/kopia/docker-compose.yml
similarity index 100%
rename from kopia/docker-compose.yaml
rename to kopia/docker-compose.yml
diff --git a/letsencrypt-cloudflare/docker-compose-dry.yaml b/letsencrypt-cloudflare/docker-compose-dry.yaml
deleted file mode 100644
index 4c4f82b..0000000
--- a/letsencrypt-cloudflare/docker-compose-dry.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-services:
-  letsencrypt-cloudflare:
-    image: "certbot/dns-cloudflare:v4.0.0"
-    container_name: "letsencrypt-cloudflare"
-
-    # Dry Run 
-    command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION} --dry-run
-
-    # Issue certificate
-    # command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    # Renew certificate
-    # command: renew --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    volumes:
-      - "${CLOUDFLARE_PATH}:/opt/cloudflare"
-      - "${LETSENCRYPT_PATH}:/etc/letsencrypt"
-      - "${LETSENCRYPT_LOG_PATH}:/var/log/letsencrypt"
-      - "${LETSENCRYPT_LIB_PATH}:/var/lib/letsencrypt"
diff --git a/letsencrypt-cloudflare/docker-compose-issue.yaml b/letsencrypt-cloudflare/docker-compose-issue.yaml
deleted file mode 100644
index cfd1adf..0000000
--- a/letsencrypt-cloudflare/docker-compose-issue.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-services:
-  letsencrypt-cloudflare:
-    image: "certbot/dns-cloudflare:v4.0.0"
-    container_name: "letsencrypt-cloudflare"
-
-    # Dry Run 
-    # command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION} --dry-run
-
-    # Issue certificate
-    command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    # Renew certificate
-    # command: renew --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    volumes:
-      - "${CLOUDFLARE_PATH}:/opt/cloudflare"
-      - "${LETSENCRYPT_PATH}:/etc/letsencrypt"
-      - "${LETSENCRYPT_LOG_PATH}:/var/log/letsencrypt"
-      - "${LETSENCRYPT_LIB_PATH}:/var/lib/letsencrypt"
diff --git a/letsencrypt-cloudflare/docker-compose-renew.yaml b/letsencrypt-cloudflare/docker-compose-renew.yaml
deleted file mode 100644
index eb0a8ed..0000000
--- a/letsencrypt-cloudflare/docker-compose-renew.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "3"
-services:
-  letsencrypt-cloudflare:
-    image: "certbot/dns-cloudflare:v4.0.0"
-    container_name: "letsencrypt-cloudflare"
-
-    # Dry Run 
-    # command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION} --dry-run
-
-    # Issue certificate
-    # command: certonly --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --email ${EMAIL} -d ${DOMAIN} -d *.${DOMAIN} --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    # Renew certificate
-    command: renew --non-interactive --dns-cloudflare --dns-cloudflare-credentials /opt/cloudflare/cloudflare.ini --agree-tos --server https://acme-v02.api.letsencrypt.org/directory --dns-cloudflare-propagation-seconds ${PROPAGATION}
-
-    volumes:
-      - "${CLOUDFLARE_PATH}:/opt/cloudflare"
-      - "${LETSENCRYPT_PATH}:/etc/letsencrypt"
-      - "${LETSENCRYPT_LOG_PATH}:/var/log/letsencrypt"
-      - "${LETSENCRYPT_LIB_PATH}:/var/lib/letsencrypt"
diff --git a/mailrise/docker-compose.yaml b/mailrise/docker-compose.yml
similarity index 100%
rename from mailrise/docker-compose.yaml
rename to mailrise/docker-compose.yml
diff --git a/minio/docker-compose.yaml b/minio/docker-compose.yml
similarity index 100%
rename from minio/docker-compose.yaml
rename to minio/docker-compose.yml
diff --git a/nextcloud/docker-compose-ls.yaml b/nextcloud/docker-compose-ls.yaml
deleted file mode 100644
index 9d2ac9f..0000000
--- a/nextcloud/docker-compose-ls.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-version: "3.8"
-services:
-  nextcloud_app:
-    image: "linuxserver/nextcloud:31.0.5"
-    container_name: "nextcloud_app"
-    depends_on:
-      - "nextcloud_db"
-      - "nextcloud_redis"
-    environment:
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "TZ=${TZ}"
-    volumes:
-      - "${CONFIG_PATH}:/config"
-      - "${DATA_PATH}:/data"
-      - "${HDD_DATA_PATH}:/hdd"
-    ports:
-      - "${APP_PORT}:443"
-    restart: "unless-stopped"
-
-  nextcloud_db:
-    image: "linuxserver/mariadb:11.4.5"
-    container_name: "nextcloud_db"
-    environment:
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "TZ=${TZ}"
-      - "MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}"
-      - "MYSQL_DATABASE=${MYSQL_DATABASE}"
-      - "MYSQL_USER=${MYSQL_USER}"
-      - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
-    volumes:
-      - "${DB_PATH}:/config"
-    ports:
-      - "${DB_PORT}:3306"
-    restart: "unless-stopped"
-    
-  nextcloud_redis:
-    image: "redis:8.0.2"
-    container_name: "nextcloud_redis"
-    command: redis-server --requirepass ${REDIS_PASSWORD}
-    volumes:
-      - "${REDIS_PATH}:/data"
-    ports:
-      - "${REDIS_PORT}:6379"
-    restart: "unless-stopped"
diff --git a/nextcloud/docker-compose.yaml b/nextcloud/docker-compose.yml
similarity index 100%
rename from nextcloud/docker-compose.yaml
rename to nextcloud/docker-compose.yml
diff --git a/nginx-proxy-manager/docker-compose.yaml b/nginx-proxy-manager/docker-compose.yml
similarity index 100%
rename from nginx-proxy-manager/docker-compose.yaml
rename to nginx-proxy-manager/docker-compose.yml
diff --git a/nginx-reverse-proxy/docker-compose.yaml b/nginx-reverse-proxy/docker-compose.yml
similarity index 100%
rename from nginx-reverse-proxy/docker-compose.yaml
rename to nginx-reverse-proxy/docker-compose.yml
diff --git a/paperless-ngx/docker-compose.yaml b/paperless-ngx/docker-compose.yml
similarity index 100%
rename from paperless-ngx/docker-compose.yaml
rename to paperless-ngx/docker-compose.yml
diff --git a/picsur/docker-compose.yaml b/picsur/docker-compose.yml
similarity index 100%
rename from picsur/docker-compose.yaml
rename to picsur/docker-compose.yml
diff --git a/pihole-unbound/docker-compose.yaml b/pihole-unbound/docker-compose.yml
similarity index 100%
rename from pihole-unbound/docker-compose.yaml
rename to pihole-unbound/docker-compose.yml
diff --git a/pihole/docker-compose.yaml b/pihole/docker-compose.yml
similarity index 100%
rename from pihole/docker-compose.yaml
rename to pihole/docker-compose.yml
diff --git a/portainer-agent/docker-compose.yaml b/portainer-agent/docker-compose.yml
similarity index 100%
rename from portainer-agent/docker-compose.yaml
rename to portainer-agent/docker-compose.yml
diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yml
similarity index 100%
rename from portainer/docker-compose.yaml
rename to portainer/docker-compose.yml
diff --git a/qbittorrent/docker-compose.yaml b/qbittorrent/docker-compose.yml
similarity index 100%
rename from qbittorrent/docker-compose.yaml
rename to qbittorrent/docker-compose.yml
diff --git a/radicale/docker-compose.yaml b/radicale/docker-compose.yml
similarity index 100%
rename from radicale/docker-compose.yaml
rename to radicale/docker-compose.yml
diff --git a/stirling-pdf/docker-compose.yaml b/stirling-pdf/docker-compose.yml
similarity index 100%
rename from stirling-pdf/docker-compose.yaml
rename to stirling-pdf/docker-compose.yml
diff --git a/uptime-kuma/docker-compose.yaml b/uptime-kuma/docker-compose.yml
similarity index 100%
rename from uptime-kuma/docker-compose.yaml
rename to uptime-kuma/docker-compose.yml
diff --git a/vaultwarden/docker-compose.yaml b/vaultwarden/docker-compose.yml
similarity index 100%
rename from vaultwarden/docker-compose.yaml
rename to vaultwarden/docker-compose.yml
diff --git a/wallos/docker-compose.yaml b/wallos/docker-compose.yml
similarity index 100%
rename from wallos/docker-compose.yaml
rename to wallos/docker-compose.yml