diff --git a/docker-backup.sh b/docker-backup.sh
index 0419f3c..b2a5055 100755
--- a/docker-backup.sh
+++ b/docker-backup.sh
@@ -9,11 +9,12 @@ sudo docker run --rm \
   -v docker_admin-data:/source/docker_admin-data:ro \
   -v docker_admin-dkim:/source/docker_admin-dkim:ro \
   -v docker_antispam-filter:/source/docker_antispam-filter:ro \
+  -v docker_fail2ban-config:/source/docker_fail2ban-config:ro \
   -v docker_front-overrides:/source/docker_front-overrides:ro \
   -v docker_ggrav-html:/source/docker_ggrav-html:ro \
   -v docker_imap-mail:/source/docker_imap-mail:ro \
-  -v docker_nextc-db:/source/docker_nextc-db:ro \
-  -v docker_nextc-html:/source/docker_nextc-html:ro \
+  -v docker_nextc-config:/source/docker_nextc-config:ro \
+  -v docker_nextc-db-config:/source/docker_nextc-db-config:ro \
   -v docker_onlyo-ds-font:/source/docker_onlyo-ds-font:ro \
   -v docker_onlyo-ds-lib:/source/docker_onlyo-ds-lib:ro \
   -v docker_onlyo-ds-log:/source/docker_onlyo-ds-log:ro \
@@ -21,7 +22,6 @@ sudo docker run --rm \
   -v docker_onlyo-ds-rb:/source/docker_onlyo-ds-rb:ro \
   -v docker_onlyo-ds-rd:/source/docker_onlyo-ds-rd:ro \
   -v docker_onlyo-ds-www:/source/docker_onlyo-ds-www:ro \
-  -v docker_porta-data:/source/docker_porta-data:ro \
   -v docker_redis-data:/source/docker_redis-data:ro \
   -v docker_smtp-queue:/source/docker_smtp-queue:ro \
   -v docker_swag-config:/source/docker_swag-config:ro \
diff --git a/docker-compose.yml b/docker-compose.yml
index 59184f5..0572fcc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ networks:
 
 volumes:
 
+  fail2ban-config:
   swag-config:
   ggrav-html:
   nextc-html:
@@ -26,6 +27,21 @@ volumes:
 
 services:
 
+  fail2ban:
+    image: lscr.io/linuxserver/fail2ban:latest
+    restart: always
+    cap_add:
+      - NET_ADMIN
+      - NET_RAW
+    network_mode: host
+    environment:
+      - PUID=1000
+      - PGID=2000
+      - TZ=Australia/Perth
+    volumes:
+      - fail2ban-config:/config
+      - /var/log:/var/log:ro
+
   swag:
     image: andrew/swag:1.31.0
     build:
@@ -35,14 +51,14 @@ services:
       - PUID=1000
       - PGID=2000
       - TZ=Australia/Perth
-      - URL=dserver.cherished.me
+      - URL=cherished.me
       - VALIDATION=http
-      - SUBDOMAINS=
+      - SUBDOMAINS=ubu2,dserver
       - CERTPROVIDER=
       - DNSPLUGIN=
       - PROPAGATION=
       - EMAIL=
-      - ONLY_SUBDOMAINS=false
+      - ONLY_SUBDOMAINS=true
       - EXTRA_DOMAINS=
       - STAGING=false
     volumes:
diff --git a/docker-restore.sh b/docker-restore.sh
index 461e9b0..c1b2f65 100755
--- a/docker-restore.sh
+++ b/docker-restore.sh
@@ -9,11 +9,12 @@ sudo docker run --rm \
   -v docker_admin-data:/source/docker_admin-data \
   -v docker_admin-dkim:/source/docker_admin-dkim \
   -v docker_antispam-filter:/source/docker_antispam-filter \
+  -v docker_fail2ban-config:/source/docker_fail2ban-config \
   -v docker_front-overrides:/source/docker_front-overrides \
   -v docker_ggrav-html:/source/docker_ggrav-html \
   -v docker_imap-mail:/source/docker_imap-mail \
-  -v docker_nextc-db:/source/docker_nextc-db \
-  -v docker_nextc-html:/source/docker_nextc-html \
+  -v docker_nextc-config:/source/docker_nextc-config \
+  -v docker_nextc-db-config:/source/docker_nextc-db-config \
   -v docker_onlyo-ds-font:/source/docker_onlyo-ds-font \
   -v docker_onlyo-ds-lib:/source/docker_onlyo-ds-lib \
   -v docker_onlyo-ds-log:/source/docker_onlyo-ds-log \
@@ -21,7 +22,6 @@ sudo docker run --rm \
   -v docker_onlyo-ds-rb:/source/docker_onlyo-ds-rb \
   -v docker_onlyo-ds-rd:/source/docker_onlyo-ds-rd \
   -v docker_onlyo-ds-www:/source/docker_onlyo-ds-www \
-  -v docker_porta-data:/source/docker_porta-data \
   -v docker_redis-data:/source/docker_redis-data \
   -v docker_smtp-queue:/source/docker_smtp-queue \
   -v docker_swag-config:/source/docker_swag-config \