diff --git a/.gitignore b/.gitignore
index 5c93185..084e7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 **/data/
+nginx-proxy-manager/letsencrypt
diff --git a/docker b/docker
deleted file mode 160000
index 2d7c90d..0000000
--- a/docker
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d7c90de46c2047161a7a8ce97565d7ea32551f0
diff --git a/it-tools/docker-compose.yml b/it-tools/docker-compose.yml
old mode 100755
new mode 100644
diff --git a/nginx-proxy-manager/compose.yml b/nginx-proxy-manager/compose.yml
old mode 100755
new mode 100644
diff --git a/nginx/compose.yml b/nginx/compose.yml
old mode 100755
new mode 100644
diff --git a/ntfy/compose.yml b/ntfy/compose.yml
old mode 100755
new mode 100644
index 8d2d8bb..f371c8e
--- a/ntfy/compose.yml
+++ b/ntfy/compose.yml
@@ -10,8 +10,8 @@ services:
       - TZ=Europe/Oslo    # optional: set desired timezone
     #user: UID:GID # optional: replace with your own user/group or uid/gid
     volumes:
-      - /home/rcadmin/ntfy/cache_ntfy:/var/cache/ntfy
-      - /home/rcadmin/ntfy/etc_ntfy:/etc/ntfy
+      - /home/rcadmin/docker/ntfy/data/cache_ntfy:/var/cache/ntfy
+      - /home/rcadmin/docker/ntfy/data/etc_ntfy:/etc/ntfy
     ports:
       - 80:80
     healthcheck: # optional: remember to adapt the host:port to your environment
diff --git a/pihole/compose.yml b/pihole/compose.yml
index 8c3c2ea..78ab1c1 100644
--- a/pihole/compose.yml
+++ b/pihole/compose.yml
@@ -18,11 +18,12 @@ services:
       # Set the appropriate timezone for your location (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones), e.g:
       TZ: 'Europe/Oslo'
       # Set a password to access the web interface. Not setting one will result in a random password being assigned
-      FTLCONF_webserver_api_password: 'correct horse battery staple'
+      FTLCONF_webserver_api_password: 'homekbr1998'
     # Volumes store your data between container upgrades
     volumes:
       # For persisting Pi-hole's databases and common configuration file
-      - './etc-pihole:/etc/pihole'
+      #- '/home/rcadmin/docker/pihole/etc-pihole:/etc/pihole'
+      - '/home/rcadmin/docker/pihole/data:/etc/pihole'
       # Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards
       #- './etc-dnsmasq.d:/etc/dnsmasq.d'
     cap_add:
diff --git a/portainer/docker-compose.yml b/portainer/compose.yml
similarity index 66%
rename from portainer/docker-compose.yml
rename to portainer/compose.yml
index 9b9f10d..950a473 100644
--- a/portainer/docker-compose.yml
+++ b/portainer/compose.yml
@@ -1,4 +1,5 @@
-#name: <your project name>
+#name: Portainer
+
 services:
     portainer-ce:
         ports:
@@ -8,8 +9,13 @@ services:
         restart: always
         volumes:
             - /var/run/docker.sock:/var/run/docker.sock
-            - ./portainer_data:/data
+            - /home/rcadmin/docker/portainer/data:/data
         image: portainer/portainer-ce:lts
+        deploy:
+          placement:
+            constraints:
+              - node.role == manager
+
 #volumes:
 #    portainer_data:
 #        external: true
diff --git a/portainer/portainer_data/.emptyFile b/portainer/portainer_data/.emptyFile
deleted file mode 100644
index e69de29..0000000
diff --git a/qbittorrent/appdata/config/.emptyFile b/qbittorrent/appdata/config/.emptyFile
old mode 100755
new mode 100644
diff --git a/qbittorrent/docker-compose.yml b/qbittorrent/compose.yml
old mode 100755
new mode 100644
similarity index 100%
rename from qbittorrent/docker-compose.yml
rename to qbittorrent/compose.yml
diff --git a/qbittorrent/downloads/.emptyFile b/qbittorrent/downloads/.emptyFile
old mode 100755
new mode 100644
diff --git a/uptime_kuma/compose.yml b/uptime_kuma/compose.yml
old mode 100755
new mode 100644
index c1b3669..2ea0368
--- a/uptime_kuma/compose.yml
+++ b/uptime_kuma/compose.yml
@@ -6,7 +6,7 @@ services:
         image: 'louislam/uptime-kuma:1'
         container_name: uptime-kuma
         volumes:
-            - '/home/rcadmin/uptime_kuma/data:/app/data'
+            - '/home/rcadmin/docker/uptime_kuma/data:/app/data'
             - /var/run/docker.sock:/var/run/docker.sock
         ports:
             - '127.0.0.1:3001:3001'
diff --git a/vaultwarden/.env b/vaultwarden/.env.old
old mode 100755
new mode 100644
similarity index 100%
rename from vaultwarden/.env
rename to vaultwarden/.env.old
diff --git a/vaultwarden/compose.yml b/vaultwarden/compose.yml
new file mode 100644
index 0000000..e8d0d63
--- /dev/null
+++ b/vaultwarden/compose.yml
@@ -0,0 +1,16 @@
+# Service Name: VaultWarden
+# Description : Open source server for bitwarden clients
+# Homepage    : https://github.com/dani-garcia/vaultwarden
+
+services:
+  vaultwarden:
+    image: vaultwarden/server:latest
+    container_name: vaultwarden
+    restart: unless-stopped
+    environment:
+      DOMAIN: "https://vaultwarden.ramberg.net"
+    volumes:
+      - /home/rcadmin/docker/vaultwarden/data/:/data/
+    ports:
+      - 127.0.0.1:8000:80
+#      - 8000:80
diff --git a/vaultwarden/docker-compose.yml b/vaultwarden/compose.yml.old
old mode 100755
new mode 100644
similarity index 100%
rename from vaultwarden/docker-compose.yml
rename to vaultwarden/compose.yml.old
diff --git a/watchtower/docker-compose.yml b/watchtower/compose.yml
similarity index 100%
rename from watchtower/docker-compose.yml
rename to watchtower/compose.yml