diff --git a/nextcloud/docker-compose.yml b/cloud/docker-compose.yml
similarity index 55%
rename from nextcloud/docker-compose.yml
rename to cloud/docker-compose.yml
index 6d754e0..ba9ef1f 100644
--- a/nextcloud/docker-compose.yml
+++ b/cloud/docker-compose.yml
@@ -20,7 +20,7 @@ services:
         depends_on:
             - db
 
-    db:
+    nextcloud_db:
         image: mariadb:10.5
         container_name: nextcloud_db
         restart: unless-stopped
@@ -35,9 +35,40 @@ services:
             - nextcloud
         user: '1000:1000'
 
+    yourls:
+        build: https://git.karaolidis.com/Nikas36/yourls-plugins.git
+        image: yourls:custom
+        container_name: yourls
+        restart: unless-stopped
+        environment:
+            - 'YOURLS_DB_HOST=yourls_db:3306'
+            - 'YOURLS_DB_PASS=${YOURLS_DB_PASS}'
+            - 'YOURLS_SITE=${YOURLS_URL}'
+            - 'YOURLS_USER=${YOURLS_USER}'
+            - 'YOURLS_PASS=${YOURLS_PASS}'
+        networks:
+            - yourls
+            - proxy
+        depends_on:
+            - yourls_db
+
+    yourls_db:
+        image: mysql
+        container_name: yourls_db
+        restart: unless-stopped
+        volumes:
+            - '/home/nick/configs/routing/yourls:/var/lib/mysql'
+        environment:
+            - 'MYSQL_ROOT_PASSWORD=${YOURLS_DB_PASS}'
+        networks:
+            - yourls
+        user: '1000:1000'
+
 networks:
     nextcloud:
         name: nextcloud
+    yourls:
+        name: yourls
     proxy:
         external: true
         name: proxy
diff --git a/home/docker-compose.yml b/home/docker-compose.yml
new file mode 100644
index 0000000..796e363
--- /dev/null
+++ b/home/docker-compose.yml
@@ -0,0 +1,33 @@
+version: '3.9'
+
+services:
+    homer_private:
+        image: b4bz/homer
+        container_name: homer_private
+        restart: unless-stopped
+        volumes:
+            - '/home/nick/configs/routing/homer:/www/assets'
+        environment:
+            - UID=1000
+            - GID=1000
+        networks:
+            - proxy
+
+    homer_social:
+        image: b4bz/homer
+        container_name: homer_social
+        restart: unless-stopped
+        volumes:
+            - '/home/nick/configs/routing/social:/www/assets'
+        environment:
+            - UID=1000
+            - GID=1000
+        networks:
+            - proxy
+
+networks:
+    proxy:
+        external: true
+        name: proxy
+    yourls:
+        name: yourls
diff --git a/routing/docker-compose.yml b/routing/docker-compose.yml
index 617d366..830bf88 100644
--- a/routing/docker-compose.yml
+++ b/routing/docker-compose.yml
@@ -47,20 +47,6 @@ services:
             - PROXIED=false
         network_mode: bridge
 
-    tor:
-        image: dperson/torproxy
-        container_name: tor
-        restart: unless-stopped
-        environment:
-            - TZ=Europe/Athens
-            - USERID=1000
-            - GROUPID=1000
-        ports:
-            - '8118:8118'
-            - '9050:9050'
-        networks:
-            - tor
-
     homer_private:
         image: b4bz/homer
         container_name: homer_private
@@ -92,41 +78,8 @@ services:
         networks:
             - proxy
 
-    yourls:
-        build: https://git.karaolidis.com/Nikas36/yourls-plugins.git
-        image: yourls:custom
-        container_name: yourls
-        restart: unless-stopped
-        environment:
-            - 'YOURLS_DB_HOST=yourls_db:3306'
-            - 'YOURLS_DB_PASS=${YOURLS_DB_PASS}'
-            - 'YOURLS_SITE=${YOURLS_URL}'
-            - 'YOURLS_USER=${YOURLS_USER}'
-            - 'YOURLS_PASS=${YOURLS_PASS}'
-        networks:
-            - yourls
-            - proxy
-        depends_on:
-            - yourls_db
-
-    yourls_db:
-        image: mysql
-        container_name: yourls_db
-        restart: unless-stopped
-        volumes:
-            - '/home/nick/configs/routing/yourls:/var/lib/mysql'
-        environment:
-            - 'MYSQL_ROOT_PASSWORD=${YOURLS_DB_PASS}'
-        networks:
-            - yourls
-        user: '1000:1000'
-
 networks:
     proxy:
         external: true
         name: proxy
-    tor:
-        external: true
-        name: proxy
-    yourls:
-        name: yourls
+
diff --git a/vpn/docker-compose.yml b/vpn/docker-compose.yml
index 7857394..69241c6 100644
--- a/vpn/docker-compose.yml
+++ b/vpn/docker-compose.yml
@@ -40,6 +40,20 @@ services:
             - NET_ADMIN
             - SYS_MODULE
 
+    tor:
+        image: dperson/torproxy
+        container_name: tor
+        restart: unless-stopped
+        environment:
+            - TZ=Europe/Athens
+            - USERID=1000
+            - GROUPID=1000
+        ports:
+            - '8118:8118'
+            - '9050:9050'
+        networks:
+            - tor
+
 networks:
     vpn:
         name: vpn
@@ -47,3 +61,5 @@ networks:
             driver: default
             config:
                 - subnet: "172.20.0.0/16"
+    tor:
+        name: tor
\ No newline at end of file