diff --git a/flake.nix b/flake.nix
index ab07b87..cfbc900 100644
--- a/flake.nix
+++ b/flake.nix
@@ -104,7 +104,6 @@
               # to set UCI configuration, create a uci-defauts scripts as per
               # official OpenWRT ImageBuilder recommendation.
               files = pkgs.runCommand "image-files" { } ''
-                echo "root:newpassword" | chpasswd
 
                 mkdir -p $out/etc/uci-defaults
                 cat > $out/etc/uci-defaults/99-custom <<EOF
@@ -132,8 +131,6 @@
                 uci set network.relay.network='lan wwan'     # bridges LAN and upstream
                 uci commit network
 
-                uci show wireless | grep wifi-iface
-
                 # Edit the existing AP or add a new one:
                 uci set wireless.default_radio0.ssid='YourRepeaterSSID'
                 uci set wireless.default_radio0.encryption='psk2'
@@ -143,16 +140,17 @@
                 uci set dhcp.lan.ignore='1'
                 uci commit dhcp
 
+                uci set firewall.@zone[1].network='wan wan6 wwan'
+                uci commit firewall
+
                 /etc/init.d/relayd enable
                 /etc/init.d/relayd start
                 /etc/init.d/network restart
+
+                /etc/init.d/firewall restart
                 wifi
 
-                uci set firewall.@zone[1].network='wan wan6 wwan'
-                uci commit firewall
-                /etc/init.d/firewall restart
-
-                                EOF
+                EOF
               '';
             };
           in