diff --git a/templates/nix-config/configuration.nix b/templates/nix-config/configuration.nix
index 1ee6b21..85a74c5 100644
--- a/templates/nix-config/configuration.nix
+++ b/templates/nix-config/configuration.nix
@@ -145,7 +145,7 @@
     if [ "$(id -u)" -eq 1000 ]; then
       if [ -n "$SSH_TTY" ]; then
         fastfetch
-	      echo -e "\n\nWelcome to numbus.eu server !\n\n- This system is managed by NixOS\n- All changes are futile\n- Please consider buying support if you can't get your server running\n- Have a nice day and enjoy !"
+	      echo -e "\n\nWelcome to your Numbus-Server !\n\n- This system is managed by NixOS\n- All changes are futile\n- Please consider buying support if you can't get your server running\n- Have a nice day and enjoy !"
       fi
     fi
   '';
diff --git a/templates/nix-config/misc/activation.nix b/templates/nix-config/misc/activation.nix
index 2dc5273..1bc24ad 100644
--- a/templates/nix-config/misc/activation.nix
+++ b/templates/nix-config/misc/activation.nix
@@ -77,16 +77,20 @@ PODMAN_NETWORKS
 
       DOMAIN_NAME="$(cat /run/secrets/domain_name)"
 
-      if [[ ! -e /etc/nixos/podman/pi-hole.nix ]]; then
-        until curl -s "https://pi-hole.$DOMAIN_NAME/admin/login" | grep -q "Pi-hole"; do
+      if [[ -e /etc/nixos/podman/pi-hole.nix ]]; then
+        mkdir -p /mnt/config/pi-hole/
+        until [[ -e /mnt/config/pi-hole/pihole-FTL.db ]]; do
           echo "Waiting for Pi-hole to be ready..."
           sleep 15
         done
+        sleep 60
+        podman exec pi-hole pihole -g
+        sleep 60
         systemctl restart pi-hole.service
         echo "Pi-Hole quirk applied and service ready !"
       fi
 
-      if [[ ! -e /etc/nixos/podman/home-assistant.nix ]]; then
+      if [[ -e /etc/nixos/podman/home-assistant.nix ]]; then
         mkdir -p /mnt/config/home-assistant/
         until [[ -e /mnt/config/home-assistant/configuration.yaml ]]; do
           echo "Waiting for Home Assistant to be ready..."
@@ -106,7 +110,7 @@ EOF
         echo "Home Assistant quirk applied and service ready !"
       fi
 
-      if [[ ! -e /etc/nixos/podman/frigate.nix ]]; then
+      if [[ -e /etc/nixos/podman/frigate.nix ]]; then
         mkdir -p /mnt/config/frigate/
         until [[ -e /mnt/config/frigate/config.yaml ]]; do
           echo "Waiting for Frigate to be ready..."