diff --git a/scripts/services/Mistborn-bitwarden.service b/scripts/services/Mistborn-bitwarden.service
index 8b0c8de..4ba99ae 100644
--- a/scripts/services/Mistborn-bitwarden.service
+++ b/scripts/services/Mistborn-bitwarden.service
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh bitwarden docker-comp
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3012 -j MISTBORN_LOG_DROP
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-elasticsearch.service b/scripts/services/Mistborn-elasticsearch.service
index 63933c7..efc5740 100644
--- a/scripts/services/Mistborn-elasticsearch.service
+++ b/scripts/services/Mistborn-elasticsearch.service
@@ -19,4 +19,4 @@ ExecStart=/opt/mistborn/scripts/wrappers/mistborn_docker.sh elasticsearch docker
 ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh elasticsearch docker-compose -f /opt/mistborn/extra/elasticsearch.yml down
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-guacamole.service b/scripts/services/Mistborn-guacamole.service
index 1c193e8..8d62780 100644
--- a/scripts/services/Mistborn-guacamole.service
+++ b/scripts/services/Mistborn-guacamole.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh guacamole docker-comp
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-homeassistant.service b/scripts/services/Mistborn-homeassistant.service
index 6ca8cc1..90c7841 100644
--- a/scripts/services/Mistborn-homeassistant.service
+++ b/scripts/services/Mistborn-homeassistant.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh homeassistant docker-
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-jellyfin.service b/scripts/services/Mistborn-jellyfin.service
index 270769c..5cc6e48 100644
--- a/scripts/services/Mistborn-jellyfin.service
+++ b/scripts/services/Mistborn-jellyfin.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jellyfin docker-compo
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-jitsi.service b/scripts/services/Mistborn-jitsi.service
index d99aa81..a52775b 100644
--- a/scripts/services/Mistborn-jitsi.service
+++ b/scripts/services/Mistborn-jitsi.service
@@ -24,4 +24,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi docker-compose
 ExecStopPost=-/opt/mistborn/scripts/wrappers/mistborn_docker.sh jitsi /opt/mistborn/scripts/services/jitsi/iptables_down.sh
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-nextcloud.service b/scripts/services/Mistborn-nextcloud.service
index 01f0132..361c200 100644
--- a/scripts/services/Mistborn-nextcloud.service
+++ b/scripts/services/Mistborn-nextcloud.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh nextcloud docker-comp
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-onlyoffice.service b/scripts/services/Mistborn-onlyoffice.service
index 16f0010..891181e 100644
--- a/scripts/services/Mistborn-onlyoffice.service
+++ b/scripts/services/Mistborn-onlyoffice.service
@@ -20,4 +20,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh onlyoffice docker-com
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-raspap.service b/scripts/services/Mistborn-raspap.service
index bb62297..f77b31a 100644
--- a/scripts/services/Mistborn-raspap.service
+++ b/scripts/services/Mistborn-raspap.service
@@ -22,4 +22,4 @@ ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 8095 -j MIS
 # Post stop
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-rocketchat.service b/scripts/services/Mistborn-rocketchat.service
index 8106fc9..5673d36 100644
--- a/scripts/services/Mistborn-rocketchat.service
+++ b/scripts/services/Mistborn-rocketchat.service
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh rocketchat docker-com
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 3001 -j MISTBORN_LOG_DROP
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-syncthing.service b/scripts/services/Mistborn-syncthing.service
index 0399dec..f658293 100644
--- a/scripts/services/Mistborn-syncthing.service
+++ b/scripts/services/Mistborn-syncthing.service
@@ -24,4 +24,4 @@ ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p udp --dport 21027 -j MI
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 22000 -j MISTBORN_LOG_DROP
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-tor.service b/scripts/services/Mistborn-tor.service
index 43b8c42..4b0afcb 100644
--- a/scripts/services/Mistborn-tor.service
+++ b/scripts/services/Mistborn-tor.service
@@ -22,4 +22,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh tor docker-compose -f
 ExecStopPost=-/sbin/iptables -D DOCKER-USER -i DIFACE -p tcp --dport 9150 -j MISTBORN_LOG_DROP
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/services/Mistborn-wazuh.service b/scripts/services/Mistborn-wazuh.service
index b4cac82..13fedeb 100644
--- a/scripts/services/Mistborn-wazuh.service
+++ b/scripts/services/Mistborn-wazuh.service
@@ -23,4 +23,4 @@ ExecStop=/opt/mistborn/scripts/wrappers/mistborn_docker.sh wazuh docker-compose
 
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=Mistborn-base.service
diff --git a/scripts/subinstallers/extra/wazuh.sh b/scripts/subinstallers/extra/wazuh.sh
index 1a7b6f7..2959629 100755
--- a/scripts/subinstallers/extra/wazuh.sh
+++ b/scripts/subinstallers/extra/wazuh.sh
@@ -23,14 +23,14 @@ import secrets
 import random
 import string
 
-random_pass = ([secrets.choice("@$!%*?-_"),
+random_pass = ([secrets.choice("@$!*?-_"),
                            secrets.choice(string.digits),
                            secrets.choice(string.ascii_lowercase),
                            secrets.choice(string.ascii_uppercase),
                            ]
                           + [secrets.choice(string.ascii_lowercase
                                            + string.ascii_uppercase
-                                           + "@$!%*?-_"
+                                           + "@$!*?-_"
                                            + string.digits) for i in range(12)])
 
 random.shuffle(random_pass)
diff --git a/scripts/subinstallers/iptables.sh b/scripts/subinstallers/iptables.sh
index 84aada7..ba7784e 100755
--- a/scripts/subinstallers/iptables.sh
+++ b/scripts/subinstallers/iptables.sh
@@ -6,7 +6,7 @@ figlet "Mistborn: Configuring Firewall"
 
 echo "stop iptables wrappers"
 if [ "$DISTRO" == "ubuntu" ]; then
-    # Disable UFW
+    echo "Disabling UFW"
     sudo systemctl stop ufw || true
     sudo systemctl disable ufw || true
 fi