Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10585)
+++ /tools/gformat.py	(revision 10587)
@@ -538,20 +538,16 @@
   #
 
-  {% if service_proxy_ileiden or service_proxy_normal %}
+  {% if service_proxy_ileiden %}
     pf_rules="/etc/pf.hybrid.conf"
     pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
-   
-    {% if service_proxy_ileiden %}
-      pf_flags="$pf_flags -D publicnat=80,443"
-    {% else %}
-      pf_flags="$pf_flags -D publicnat=0"
-    {% endif %}
-
-    {% if service_proxy_normal %}
-      pf_flags="$pf_flags -D ext_if_default_route={{ gateway|default('127.127.127.127') }}"
-      lvrouted_flags="$lvrouted_flags -z $list_ileiden_proxies"
-    {% endif %}
+    pf_flags="$pf_flags -D publicnat=80,443"
+  {% elif service_proxy_normal %}
+    pf_rules="/etc/pf.proxy_normal.conf"
+    pf_flags="-D ext_if=$externalif -D ext_if_net=$externalif:network -D masterip=$masterip"
+    pf_flags="$pf_flags -D ext_if_gw=${ext_if_gw:-"{{ gateway|default('127.127.127.127') }}"}"
+    lvrouted_flags="$lvrouted_flags -z $list_ileiden_proxies"
   {% else %}
     pf_rules="/etc/pf.node.conf"
+    pf_flags=""
   {% endif %}