diff --git a/templates/compose/4get.yaml.j2 b/templates/compose/4get.yaml.j2
index ad484a2..131b5a3 100644
--- a/templates/compose/4get.yaml.j2
+++ b/templates/compose/4get.yaml.j2
@@ -20,9 +20,8 @@ services:
     ports:
       - '8907:80'
     networks:
-      - IPv4
+      - 4get
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  4get:
+    name: 4get
\ No newline at end of file
diff --git a/templates/compose/anonymousoverflow.yaml.j2 b/templates/compose/anonymousoverflow.yaml.j2
index 1367c55..397fdde 100644
--- a/templates/compose/anonymousoverflow.yaml.j2
+++ b/templates/compose/anonymousoverflow.yaml.j2
@@ -18,9 +18,8 @@ services:
     ports:
       - '8898:8080'
     networks:
-      - IPv4
+      - anonymousoverflow
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  anonymousoverflow:
+    name: anonymousoverflow
\ No newline at end of file
diff --git a/templates/compose/authelia.yaml.j2 b/templates/compose/authelia.yaml.j2
index 439ceb1..9d3eacd 100644
--- a/templates/compose/authelia.yaml.j2
+++ b/templates/compose/authelia.yaml.j2
@@ -16,9 +16,8 @@ services:
       - {{ docker_dir }}/authelia:/config
     restart: unless-stopped
     networks:
-      - IPv4
+      - authelia
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  authelia:
+    name: authelia
\ No newline at end of file
diff --git a/templates/compose/binternet.yaml.j2 b/templates/compose/binternet.yaml.j2
index 1c4e5fb..38a154e 100644
--- a/templates/compose/binternet.yaml.j2
+++ b/templates/compose/binternet.yaml.j2
@@ -14,9 +14,8 @@ services:
     ports:
       - '8896:80'
     networks:
-      - IPv4
+      - binternet
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  binternet:
+    name: binternet
\ No newline at end of file
diff --git a/templates/compose/breezewiki.yaml.j2 b/templates/compose/breezewiki.yaml.j2
index e941ff8..f138d70 100644
--- a/templates/compose/breezewiki.yaml.j2
+++ b/templates/compose/breezewiki.yaml.j2
@@ -16,9 +16,8 @@ services:
     volumes:
       - {{ docker_dir }}/breezewiki/config.ini:/app/config.ini
     networks:
-      - IPv4
+      - breezewiki
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  breezewiki:
+    name: breezewiki
\ No newline at end of file
diff --git a/templates/compose/cinny.yaml.j2 b/templates/compose/cinny.yaml.j2
index 1630d41..c2f5c0a 100644
--- a/templates/compose/cinny.yaml.j2
+++ b/templates/compose/cinny.yaml.j2
@@ -14,9 +14,8 @@ services:
       - 8901:80
     restart: unless-stopped
     networks:
-      - IPv4
+      - cinny
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  cinny:
+    name: cinny
\ No newline at end of file
diff --git a/templates/compose/etherpad.yaml.j2 b/templates/compose/etherpad.yaml.j2
index 8731bf3..d868195 100644
--- a/templates/compose/etherpad.yaml.j2
+++ b/templates/compose/etherpad.yaml.j2
@@ -40,7 +40,7 @@ services:
       - 8891:9001
     restart: unless-stopped
     networks:
-      - IPv4
+      - etherpad
       
   etherpaddb:
     image: postgres:16-alpine
@@ -60,9 +60,8 @@ services:
       - {{ docker_dir }}/etherpad/dump:/dump
     restart: unless-stopped
     networks:
-      - IPv4
+      - etherpad
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  etherpad:
+    name: etherpad
\ No newline at end of file
diff --git a/templates/compose/firefox.yaml.j2 b/templates/compose/firefox.yaml.j2
index a1bf1a9..480904f 100644
--- a/templates/compose/firefox.yaml.j2
+++ b/templates/compose/firefox.yaml.j2
@@ -28,11 +28,10 @@ services:
     shm_size: "2gb"
     restart: unless-stopped
     networks:
-      - IPv4
+      - firefox
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  firefox:
+    name: firefox
 
 
diff --git a/templates/compose/geoipupdate.yaml.j2 b/templates/compose/geoipupdate.yaml.j2
index 463219e..1089c08 100644
--- a/templates/compose/geoipupdate.yaml.j2
+++ b/templates/compose/geoipupdate.yaml.j2
@@ -18,8 +18,8 @@ services:
     volumes:
       - {{ docker_dir }}/caddy/:/usr/share/GeoIP/
     networks:
-      - IPv4
+      - geoipupdate
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  geoipupdate:
+    name: geoipupdate
\ No newline at end of file
diff --git a/templates/compose/gitea.yaml.j2 b/templates/compose/gitea.yaml.j2
index ac73913..b77cd9f 100644
--- a/templates/compose/gitea.yaml.j2
+++ b/templates/compose/gitea.yaml.j2
@@ -30,7 +30,7 @@ services:
     ports:
       - "3000:3000"
     networks:
-      - IPv4
+      - gitea
 
   gitea-db:
     image: postgres:14
@@ -48,12 +48,10 @@ services:
       - {{ docker_dir }}/gitea/data/postgres:/var/lib/postgresql/data
     restart: always
     networks:
-      - IPv4
+      - gitea
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
-
+  gitea:
+    name: gitea
 
 # Cron in Gitea Action only works in Nightly for now
\ No newline at end of file
diff --git a/templates/compose/gothub.yaml.j2 b/templates/compose/gothub.yaml.j2
index d9b4f83..f77eb2b 100644
--- a/templates/compose/gothub.yaml.j2
+++ b/templates/compose/gothub.yaml.j2
@@ -30,9 +30,8 @@ services:
     ports:
       - '8900:3000'
     networks:
-      - IPv4
+      - gothub
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  gothub:
+    name: gothub
\ No newline at end of file
diff --git a/templates/compose/imgin.yaml.j2 b/templates/compose/imgin.yaml.j2
index 3672427..9a1a1ce 100644
--- a/templates/compose/imgin.yaml.j2
+++ b/templates/compose/imgin.yaml.j2
@@ -15,9 +15,8 @@ services:
     ports:
       - '8899:8080'
     networks:
-      - IPv4
+      - imgin
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  imgin:
+    name: imgin
\ No newline at end of file
diff --git a/templates/compose/it-tools.yaml.j2 b/templates/compose/it-tools.yaml.j2
index 0155fea..e662459 100644
--- a/templates/compose/it-tools.yaml.j2
+++ b/templates/compose/it-tools.yaml.j2
@@ -14,9 +14,8 @@ services:
     ports:
       - 8892:80
     networks:
-      - IPv4
+      - it-tools
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  it-tools:
+    name: it-tools
\ No newline at end of file
diff --git a/templates/compose/libreddit.yaml.j2 b/templates/compose/libreddit.yaml.j2
index faef06d..cce385c 100644
--- a/templates/compose/libreddit.yaml.j2
+++ b/templates/compose/libreddit.yaml.j2
@@ -20,9 +20,8 @@ services:
     ports:
       - 8882:8080
     networks:
-      - IPv4
+      - libreddit
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  libreddit:
+    name: libreddit
\ No newline at end of file
diff --git a/templates/compose/libredditarm.yaml.j2 b/templates/compose/libredditarm.yaml.j2
index 0065879..ecc714b 100644
--- a/templates/compose/libredditarm.yaml.j2
+++ b/templates/compose/libredditarm.yaml.j2
@@ -20,9 +20,8 @@ services:
     ports:
       - 8882:8080
     networks:
-      - IPv4
+      - libreddit
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  libreddit:
+    name: libreddit
\ No newline at end of file
diff --git a/templates/compose/libremdb.yaml.j2 b/templates/compose/libremdb.yaml.j2
index 4bb0983..fd15b72 100644
--- a/templates/compose/libremdb.yaml.j2
+++ b/templates/compose/libremdb.yaml.j2
@@ -19,9 +19,8 @@ services:
       - 8905:3000
     restart: unless-stopped 
     networks:
-      - IPv4
+      - libremdb
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  libremdb:
+    name: libremdb
\ No newline at end of file
diff --git a/templates/compose/mlmym.yaml.j2 b/templates/compose/mlmym.yaml.j2
index 2f6e32f..6e20bcd 100644
--- a/templates/compose/mlmym.yaml.j2
+++ b/templates/compose/mlmym.yaml.j2
@@ -20,9 +20,8 @@ services:
     ports:
       - '8902:8080'
     networks:
-      - IPv4
+      - mlmym
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  mlmym:
+    name: mlmym
\ No newline at end of file
diff --git a/templates/compose/nitter.yaml.j2 b/templates/compose/nitter.yaml.j2
index dd6a0cd..0aab7f7 100644
--- a/templates/compose/nitter.yaml.j2
+++ b/templates/compose/nitter.yaml.j2
@@ -26,7 +26,7 @@ services:
       timeout: 5s
       retries: 2
     networks:
-      - IPv4
+      - nitter
 
   nitter-redis:
     image: redis:alpine
@@ -47,9 +47,8 @@ services:
       timeout: 5s
       retries: 2
     networks:
-      - IPv4
+      - nitter
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  nitter:
+    name: nitter
diff --git a/templates/compose/ntfy.yaml.j2 b/templates/compose/ntfy.yaml.j2
index 0058cee..1cb1e6a 100644
--- a/templates/compose/ntfy.yaml.j2
+++ b/templates/compose/ntfy.yaml.j2
@@ -31,12 +31,11 @@ services:
         retries: 3
         start_period: 40s
     networks:
-      - IPv4
+      - ntfy
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  ntfy:
+    name: ntfy
 
 # touch {{ docker_dir }}/ntfy/cache.db && touch {{ docker_dir }}/ntfy/user.db
 # docker exec -it ntfy ntfy user add --role=admin opnxng
diff --git a/templates/compose/photon.yaml.j2 b/templates/compose/photon.yaml.j2
index 443c693..13eca41 100644
--- a/templates/compose/photon.yaml.j2
+++ b/templates/compose/photon.yaml.j2
@@ -19,9 +19,8 @@ services:
     ports:
       - '8903:3000'
     networks:
-      - IPv4
+      - photon
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  photon:
+    name: photon
\ No newline at end of file
diff --git a/templates/compose/privatebin.yaml.j2 b/templates/compose/privatebin.yaml.j2
index 5b5f6d6..79b00cf 100644
--- a/templates/compose/privatebin.yaml.j2
+++ b/templates/compose/privatebin.yaml.j2
@@ -14,11 +14,10 @@ services:
     volumes:
       - {{ docker_dir }}/privatebin/data:/srv/data
     networks:
-      - IPv4
+      - privatebin
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  privatebin:
+    name: privatebin
 
 # sudo chown 65534:82 {{ docker_dir }}/privatebin/data
\ No newline at end of file
diff --git a/templates/compose/proxigram.yaml.j2 b/templates/compose/proxigram.yaml.j2
index 10fc2e6..e07e9de 100644
--- a/templates/compose/proxigram.yaml.j2
+++ b/templates/compose/proxigram.yaml.j2
@@ -32,7 +32,7 @@ services:
     ports:
       - 8908:3000
     networks:
-      - IPv4
+      - proxigram
       
   proxigram-redis:
     container_name: proxigram-redis
@@ -45,9 +45,8 @@ services:
       - REDIS_URL=redis:6379
     restart: unless-stopped
     networks:
-      - IPv4
+      - proxigram
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  proxigram:
+    name: proxigram
\ No newline at end of file
diff --git a/templates/compose/proxitok.yaml.j2 b/templates/compose/proxitok.yaml.j2
index cbc6f15..6f40529 100644
--- a/templates/compose/proxitok.yaml.j2
+++ b/templates/compose/proxitok.yaml.j2
@@ -30,7 +30,7 @@ services:
       - proxitok-redis
       - signer
     networks:
-      - IPv4
+      - proxitok
       
   proxitok-redis:
     container_name: proxitok-redis
@@ -50,7 +50,7 @@ services:
       - ALL
     restart: unless-stopped
     networks:
-      - IPv4
+      - proxitok
 
   signer:
     container_name: proxitok-signer
@@ -67,8 +67,8 @@ services:
     cap_drop:
       - ALL
     networks:
-      - IPv4
+      - proxitok
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  proxitok:
+    name: proxitok
\ No newline at end of file
diff --git a/templates/compose/quetre.yaml.j2 b/templates/compose/quetre.yaml.j2
index a5b2eed..3742705 100644
--- a/templates/compose/quetre.yaml.j2
+++ b/templates/compose/quetre.yaml.j2
@@ -16,8 +16,8 @@ services:
       - 8904:3000
     restart: unless-stopped 
     networks:
-      - IPv4
+      - quetre
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  quetre:
+    name: quetre
\ No newline at end of file
diff --git a/templates/compose/rat-aint-tieba.yaml.j2 b/templates/compose/rat-aint-tieba.yaml.j2
index f2348b5..bf2b1d5 100644
--- a/templates/compose/rat-aint-tieba.yaml.j2
+++ b/templates/compose/rat-aint-tieba.yaml.j2
@@ -14,8 +14,8 @@ services:
     ports:
       - '8910:8886'
     networks:
-      - IPv4
+      - rat-aint-tieba
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  rat-aint-tieba:
+    name: rat-aint-tieba
\ No newline at end of file
diff --git a/templates/compose/runner.yaml.j2 b/templates/compose/runner.yaml.j2
index 4e1fd91..cab0313 100755
--- a/templates/compose/runner.yaml.j2
+++ b/templates/compose/runner.yaml.j2
@@ -22,11 +22,11 @@ services:
       - GITEA_RUNNER_REGISTRATION_TOKEN={{ gitea_runner_registration_token }}
       - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:16-bullseye,ubuntu-22.04:docker://node:16-bullseye,ubuntu-20.04:docker://node:16-bullseye,ubuntu-18.04:docker://node:16-buster,runner:host
     networks:
-      - IPv4
+      - runner
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  runner:
+    name: runner
 
 # DinD containers cannot resolve *.github.com unless daemon.json is mounted
 # https://gitea.com/gitea/act_runner/issues/381#issuecomment-755182
\ No newline at end of file
diff --git a/templates/compose/scribe.yaml.j2 b/templates/compose/scribe.yaml.j2
index beda320..caa0e69 100644
--- a/templates/compose/scribe.yaml.j2
+++ b/templates/compose/scribe.yaml.j2
@@ -21,8 +21,8 @@ services:
     ports:
       - 8890:8088
     networks:
-      - IPv4
+      - scribe
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  scribe:
+    name: scribe
\ No newline at end of file
diff --git a/templates/compose/send.yaml.j2 b/templates/compose/send.yaml.j2
index b3c5256..5f24b07 100644
--- a/templates/compose/send.yaml.j2
+++ b/templates/compose/send.yaml.j2
@@ -28,7 +28,7 @@ services:
     ports:
       - 8886:1443
     networks:
-      - IPv4
+      - send
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
       
@@ -48,13 +48,11 @@ services:
     labels:
       - "com.centurylinklabs.watchtower.enable=false"
     networks:
-      - IPv4
+      - send
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
-
+  send:
+    name: send
 
 # Clear expired uploads
 # 0 */3 * * *  find {{ docker_dir }}/send/uploads/ -name 7-\* -mmin +10130 -exec rm {} \;
diff --git a/templates/compose/simplytranslate.yaml.j2 b/templates/compose/simplytranslate.yaml.j2
index 1601340..35e3a58 100644
--- a/templates/compose/simplytranslate.yaml.j2
+++ b/templates/compose/simplytranslate.yaml.j2
@@ -22,8 +22,8 @@ services:
       - 8889:5000
     restart: unless-stopped 
     networks:
-      - IPv4
+      - simplytranslate
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  simplytranslate:
+    name: simplytranslate
\ No newline at end of file
diff --git a/templates/compose/stirling-pdf.yaml.j2 b/templates/compose/stirling-pdf.yaml.j2
index b2bc0db..29a2320 100644
--- a/templates/compose/stirling-pdf.yaml.j2
+++ b/templates/compose/stirling-pdf.yaml.j2
@@ -20,8 +20,8 @@ services:
     ports:
       - 8887:8080
     networks:
-      - IPv4
+      - stirling-pdf
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  stirling-pdf:
+    name: stirling-pdf
\ No newline at end of file
diff --git a/templates/compose/teddit.yaml.j2 b/templates/compose/teddit.yaml.j2
index 1f68574..c49c5eb 100644
--- a/templates/compose/teddit.yaml.j2
+++ b/templates/compose/teddit.yaml.j2
@@ -33,7 +33,7 @@ services:
     logging:
         driver: none
     networks:
-      - IPv4
+      - teddit
 
   teddit-redis:
     container_name: teddit-redis
@@ -46,9 +46,8 @@ services:
       - REDIS_REPLICATION_MODE=master
     restart: unless-stopped
     networks:
-      - IPv4
+      - teddit
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
+  teddit:
+    name: teddit
\ No newline at end of file
diff --git a/templates/compose/voyager.yaml.j2 b/templates/compose/voyager.yaml.j2
index d37ab6f..f233442 100644
--- a/templates/compose/voyager.yaml.j2
+++ b/templates/compose/voyager.yaml.j2
@@ -15,9 +15,8 @@ services:
     ports:
       - '8895:5314'
     networks:
-      - IPv4
+      - voyager
 
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  voyager:
+    name: voyager
\ No newline at end of file
diff --git a/templates/compose/wolfree.yaml.j2 b/templates/compose/wolfree.yaml.j2
index caa6026..bd39496 100644
--- a/templates/compose/wolfree.yaml.j2
+++ b/templates/compose/wolfree.yaml.j2
@@ -14,8 +14,8 @@ services:
     ports:
       - '8906:80'
     networks:
-      - IPv4
+      - wolfree
+
 networks:
-  IPv4:
-    external:
-      name: IPv4
\ No newline at end of file
+  wolfree:
+    name: wolfree
\ No newline at end of file
diff --git a/vars/services.yml b/vars/services.yml
index bf6c5be..058a8b1 100644
--- a/vars/services.yml
+++ b/vars/services.yml
@@ -1,9 +1,6 @@
-saetup:
-  oracle3:
-    - runner
 compose:
-  oracle3:
-    - runner
+  oracle4:
+    - caddy
 
 # ----------------------------------------------------------------------------------------------------