diff --git a/booksonic/docker-compose.yml b/booksonic/docker-compose.yml
deleted file mode 100644
index e67d488..0000000
--- a/booksonic/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-version: "2.1"
-services:
-  booksonic-air:
-    image: linuxserver/booksonic-air
-    container_name: booksonic-air
-    environment:
-      - PUID=1000
-      - PGID=100
-      - TZ=Asia/Kuala_Lumpur
-      #- CONTEXT_PATH=athena.local
-    volumes:
-      - ./config:/config
-      - /Media/Audiobooks:/audiobooks
-      - /Media/Podcasts:/podcasts
-      - /Media/othermedia:/othermedia
-    ports:
-      - 4040:4040
-    restart: unless-stopped
\ No newline at end of file
diff --git a/checkmk/docker-compose.yml b/checkmk/docker-compose.yml
deleted file mode 100644
index ab93ae4..0000000
--- a/checkmk/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-#-p 8080:5000 
-#--ulimit nofile=1024 
-#--tmpfs /opt/omd/sites/cmk/tmp:
-#uid=1000,gid=1000 -v monitoring:/omd/sites 
-#--name monitoring -v /etc/localtime:/etc/localtime:ro 
-#--restart always 
-#checkmk/check-mk-raw:1.6.0-latest
-
-version: "3.6"
-
-services:
-    check-mk:
-        image: checkmk/check-mk-raw:1.6.0-latest
-        container_name: check-mk
-        ports: 
-            - "8222:5000"            
-        environment:
-            - PUID=1000
-            - PGID=100
-        ulimits:          
-          nofile: 1024  
-        
-        volumes:
-            - type: tmpfs
-              target: /opt/omd/sites/cmk/tmp
-            - /etc/localtime:/etc/localtime:ro
-    #restart always
\ No newline at end of file
diff --git a/droppy/#docker-compose.yml b/droppy/#docker-compose.yml
deleted file mode 100644
index 8956e68..0000000
--- a/droppy/#docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '2'
-services:
-  droppy:
-    container_name: droppy
-    image: silverwind/droppy
-    ports:
-      - 9989:8989
-    volumes:
-      - ./config:/config
-      - /dockermount:/files
-    restart: unless-stopped
diff --git a/droppy/docker-compose.yml b/droppy/docker-compose.yml
deleted file mode 100644
index 2083705..0000000
--- a/droppy/docker-compose.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '2'
-services:
-  droppy:
-    container_name: droppy
-    image: silverwind/droppy
-    ports:
-      - 9999:8989
-    volumes:
-      - ./config:/config
-      - /dockermount/plex:/files
-    #sysctls:
-    #  - fs.inotify.max_user_watches=524288
-    restart: unless-stopped
diff --git a/filestash/docker-compose.yml b/filestash/docker-compose.yml
deleted file mode 100644
index 5386371..0000000
--- a/filestash/docker-compose.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: '2'
-services:
-  app:
-    container_name: filestash
-    image: machines/filestash
-    restart: always
-    environment:
-    - APPLICATION_URL=
-    - GDRIVE_CLIENT_ID=<gdrive_client>
-    - GDRIVE_CLIENT_SECRET=<gdrive_secret>
-    - DROPBOX_CLIENT_ID=<dropbox_key>
-    - ONLYOFFICE_URL=http://onlyoffice
-    ports:
-    - "8334:8334"
-    extra_hosts:
-    - "host.docker.internal:host-gateway"
-  onlyoffice:
-    container_name: filestash_oods
-    image: onlyoffice/documentserver
-    restart: always
diff --git a/firefly/docker-compose.yml b/firefly/docker-compose.yml
deleted file mode 100644
index adcfe80..0000000
--- a/firefly/docker-compose.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: '3.3'
-
-services:
-  app:
-    image: fireflyiii/core:latest
-    restart: always
-    volumes:
-      - firefly_iii_upload:/var/www/html/storage/upload
-    env_file: .env
-    ports:
-      - 80:8080
-    depends_on:
-      - db
-  db:
-    image: mariadb    
-    hostname: fireflyiiidb
-    restart: always
-    environment:
-      - MYSQL_RANDOM_ROOT_PASSWORD=yes
-      - MYSQL_USER=firefly
-      - MYSQL_PASSWORD=secret_firefly_password
-      - MYSQL_DATABASE=firefly
-    volumes:
-      - firefly_iii_db:/var/lib/mysql
-volumes:
-   firefly_iii_upload:
-   firefly_iii_db:
\ No newline at end of file
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
deleted file mode 100644
index 5cc8f1c..0000000
--- a/gitea/docker-compose.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-version: "3"
-
-networks:
-  gitea:
-    external: false
-
-services:
-  server:
-    image: gitea/gitea
-    container_name: gitea
-    environment:
-      - USER_UID=1000
-      - USER_GID=100
-      - GITEA__database__DB_TYPE=postgres
-      - GITEA__database__HOST=db:5432
-      - GITEA__database__NAME=gitea
-      - GITEA__database__USER=gitea
-      - GITEA__database__PASSWD=gitea
-    restart: always
-    networks:
-      - gitea
-    volumes:
-      - ./gitea:/data
-      - /etc/timezone:/etc/timezone:ro
-      - /etc/localtime:/etc/localtime:ro
-    ports:
-      - "3434:3000"
-      - "2222:22"
-    depends_on:
-      - db
-
-  db:
-    image: postgres
-    restart: always
-    environment:
-      - POSTGRES_USER=gitea
-      - POSTGRES_PASSWORD=gitea
-      - POSTGRES_DB=gitea
-    networks:
-      - gitea
-    volumes:
-      - ./postgres:/var/lib/postgresql/data
\ No newline at end of file
diff --git a/heimdall/docker-compose.yml b/heimdall/docker-compose.yml
deleted file mode 100755
index 6fa0dc8..0000000
--- a/heimdall/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-version: "2.1"
-services:
-  heimdall:
-    image: linuxserver/heimdall
-    container_name: heimdall
-    environment:
-      - PUID=1000
-      - PGID=100
-      - TZ=Asia/Kuala_Lumpur
-    volumes:
-      - ./config:/config
-    ports:
-      - 9999:80
-      #- 443:443
-    restart: unless-stopped
\ No newline at end of file
diff --git a/librenms/.env b/librenms/.env
deleted file mode 100755
index 1531062..0000000
--- a/librenms/.env
+++ /dev/null
@@ -1,7 +0,0 @@
-TZ="Asia/Kuala_Lumpur"
-PUID=1000
-PGID=100
-
-MYSQL_DATABASE=librenms
-MYSQL_USER=librenms
-MYSQL_PASSWORD=asupersecretpassword
diff --git a/librenms/docker-compose.yml b/librenms/docker-compose.yml
deleted file mode 100755
index 5c91348..0000000
--- a/librenms/docker-compose.yml
+++ /dev/null
@@ -1,143 +0,0 @@
-version: "3.5"
-
-services:
-  db:
-    image: mariadb:10.4
-    container_name: librenms_db
-    command:
-      - "mysqld"
-      - "--innodb-file-per-table=1"
-      - "--lower-case-table-names=1"
-      - "--character-set-server=utf8"
-      - "--collation-server=utf8_unicode_ci"
-    volumes:
-      - "./db:/var/lib/mysql"
-    environment:
-      - "TZ=${TZ}"
-      - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
-      - "MYSQL_DATABASE=${MYSQL_DATABASE}"
-      - "MYSQL_USER=${MYSQL_USER}"
-      - "MYSQL_PASSWORD=${MYSQL_PASSWORD}"
-    restart: always
-
-  memcached:
-    image: memcached:alpine
-    container_name: librenms_memcached
-    environment:
-      - "TZ=${TZ}"
-    restart: always
-
-  redis:
-    image: redis:5.0-alpine
-    container_name: librenms_redis
-    environment:
-      - "TZ=${TZ}"
-    restart: always
-
-  rrdcached:
-    image: crazymax/rrdcached
-    container_name: librenms_rrdcached
-    volumes:
-      - "./librenms/rrd:/data/db"
-      - "./rrd-journal:/data/journal"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "LOG_LEVEL=LOG_INFO"
-      - "WRITE_TIMEOUT=1800"
-      - "WRITE_JITTER=1800"
-      - "WRITE_THREADS=4"
-      - "FLUSH_DEAD_DATA_INTERVAL=3600"
-    restart: always
-
-  msmtpd:
-    image: crazymax/msmtpd:latest
-    container_name: librenms_msmtpd
-    env_file:
-      - "./msmtpd.env"
-    restart: always
-
-  librenms:
-    image: librenms/librenms:latest
-    container_name: librenms
-    hostname: librenms
-    ports:
-      - target: 8000
-        published: 8800
-        protocol: tcp
-    depends_on:
-      - db
-      - memcached
-      - rrdcached
-      - msmtpd
-    volumes:
-      - "./librenms:/data"
-    env_file:
-      - "./librenms.env"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "DB_HOST=db"
-      - "DB_NAME=${MYSQL_DATABASE}"
-      - "DB_USER=${MYSQL_USER}"
-      - "DB_PASSWORD=${MYSQL_PASSWORD}"
-      - "DB_TIMEOUT=60"
-    restart: always
-
-  dispatcher:
-    image: librenms/librenms:latest
-    container_name: librenms_dispatcher
-    hostname: librenms-dispatcher
-    depends_on:
-      - librenms
-      - redis
-    volumes:
-      - "./librenms:/data"
-    env_file:
-      - "./librenms.env"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "DB_HOST=db"
-      - "DB_NAME=${MYSQL_DATABASE}"
-      - "DB_USER=${MYSQL_USER}"
-      - "DB_PASSWORD=${MYSQL_PASSWORD}"
-      - "DB_TIMEOUT=60"
-      - "DISPATCHER_NODE_ID=dispatcher1"
-      - "REDIS_HOST=redis"
-      - "REDIS_PORT=6379"
-      - "REDIS_DB=0"
-      - "SIDECAR_DISPATCHER=1"
-    restart: always
-
-  syslogng:
-    image: librenms/librenms:latest
-    container_name: librenms_syslogng
-    hostname: librenms-syslogng
-    depends_on:
-      - librenms
-    ports:
-      - target: 514
-        published: 514
-        protocol: tcp
-      - target: 514
-        published: 514
-        protocol: udp
-    volumes:
-      - "./librenms:/data"
-    env_file:
-      - "./librenms.env"
-    environment:
-      - "TZ=${TZ}"
-      - "PUID=${PUID}"
-      - "PGID=${PGID}"
-      - "DB_HOST=db"
-      - "DB_NAME=${MYSQL_DATABASE}"
-      - "DB_USER=${MYSQL_USER}"
-      - "DB_PASSWORD=${MYSQL_PASSWORD}"
-      - "DB_TIMEOUT=60"
-      - "SIDECAR_SYSLOGNG=1"
-    restart: always
diff --git a/ll/docker-compose.yml b/ll/docker-compose.yml
deleted file mode 100755
index 199ce20..0000000
--- a/ll/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-version: "2.1"
-services:
-  lazylibrarian:
-    image: linuxserver/lazylibrarian
-    container_name: lazylibrarian
-    environment:
-      - TZ=Asia/Kuala Lumpur
-      - DOCKER_MODS=linuxserver/calibre-web:calibre|linuxserver/mods:lazylibrarian-ffmpeg #optional
-    volumes:
-      - e:/dockermount/ll/config:/config
-      - e:/dockermount/ll/downloads:/downloads
-      - e:/dockermount/ll/books:/books 
-    ports:
-      - 5299:5299
-    restart: unless-stopped
\ No newline at end of file
diff --git a/navidrome/docker-compose.yaml b/navidrome/docker-compose.yaml
new file mode 100644
index 0000000..14cf44e
--- /dev/null
+++ b/navidrome/docker-compose.yaml
@@ -0,0 +1,17 @@
+version: "3"
+services:
+  navidrome:
+    image: deluan/navidrome:latest
+    user: 1000:100 # should be owner of volumes
+    ports:
+      - "4533:4533"
+    restart: unless-stopped
+    environment:
+      # Optional: put your config options customization here. Examples:
+      ND_SCANSCHEDULE: 1h
+      ND_LOGLEVEL: info  
+      ND_SESSIONTIMEOUT: 24h
+      ND_BASEURL: ""
+    volumes:
+      - "./data:/data"
+      - "/Media/Music:/music:ro"
\ No newline at end of file
diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
deleted file mode 100755
index e08cf53..0000000
--- a/nextcloud/docker-compose.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: '2'
-
-volumes:
-  nextcloud:
-  db:
-
-
-services:
-  mariadb:
-    container_name: mariadb
-    image: mariadb
-    command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
-    restart: always
-    volumes:
-      #- ./db:/var/lib/mysql:cached
-      - db:/var/lib/mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=secretpassword
-      - MYSQL_PASSWORD=secretpassword
-      - MYSQL_DATABASE=nextcloud
-      - MYSQL_USER=nextcloud
-
-  app:
-    container_name: nextcloud
-    build: .
-    ports:
-      - 8282:80
-    links:
-      - mariadb
-    volumes:
-      #- ./nextcloud:/var/www/html:cached
-      - nextcloud:/var/www/html
-    restart: always
-    
-    
-    
\ No newline at end of file
diff --git a/photoprism/docker-compose.yml b/photoprism/docker-compose.yml
index 622e99b..a8d6830 100755
--- a/photoprism/docker-compose.yml
+++ b/photoprism/docker-compose.yml
@@ -41,7 +41,7 @@ services:
       PHOTOPRISM_HTTP_PORT: 2342
       PHOTOPRISM_SETTINGS_HIDDEN: "false"            # Users can not view or change settings
       PHOTOPRISM_ADMIN_PASSWORD: "photoprism"        # Initial admin password (can be changed in settings)
-      PHOTOPRISM_DATABASE_DRIVER: "sqlite"           # Change to "mysql" for external MySQL or MariaDB
+      #PHOTOPRISM_DATABASE_DRIVER: "sqlite"           # Change to "mysql" for external MySQL or MariaDB
       PHOTOPRISM_DATABASE_DRIVER: "mysql"          # Using MariaDB or MySQL instead of SQLite is optional
       PHOTOPRISM_DATABASE_DSN: "user:passwd@tcp(photoprism-db:3306)/photoprism?charset=utf8mb4,utf8&parseTime=true"
       PHOTOPRISM_SIDECAR_JSON: "true"                # Read metadata from JSON sidecar files created by exiftool
diff --git a/piwigo/docker-compose.yml b/piwigo/docker-compose.yml
deleted file mode 100755
index 75a2ff8..0000000
--- a/piwigo/docker-compose.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-version: "2.1"
-services:
-  piwigo_db:
-    image: linuxserver/mariadb
-    container_name: piwigo_db
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - MYSQL_ROOT_PASSWORD=secretpassword
-      - TZ=Asia/Kuala_Lumpur      
-    volumes:
-      - ./db/config:/config  
-    restart: unless-stopped
-  piwigo:
-    image: linuxserver/piwigo
-    container_name: piwigo
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ="Asia/Kuala_Lumpur"
-    volumes:
-      - ./config:/config      
-    ports:
-      - 86:80
-    restart: unless-stopped
\ No newline at end of file
diff --git a/plex/docker-compose.yml b/plex/docker-compose.yml
index 4c917f1..1b7c7b0 100644
--- a/plex/docker-compose.yml
+++ b/plex/docker-compose.yml
@@ -44,7 +44,8 @@ services:
       - TZ=Asia/Kuala_Lumpur
       #- UMASK_SET=022 #optional
     volumes:
-      - ./sonarr/data:/config
+      #- ./sonarr/data:/config
+      - /fast/sonarr:/config
       - /Media/TV:/tv
       #- ./transmission/downloads:/downloads
       - ./qBittorrent/downloads:/downloads
diff --git a/xandikos/docker-compose.yml b/xandikos/docker-compose.yml
deleted file mode 100644
index 7401c48..0000000
--- a/xandikos/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "3.4"
-
-services:
-  xandikos:
-    image: ghcr.io/jelmer/xandikos
-    ports:
-      - 5566:8000
-    volumes:
-      - ./data:/data
-    restart: unless-stopped