Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10646)
+++ /tools/gformat.py	(revision 10649)
@@ -543,8 +543,11 @@
     pf_flags="$pf_flags -D publicnat=80,443"
   {% elif service_proxy_normal %}
-    pf_rules="/etc/pf.proxy.conf"
+    pf_rules="/etc/pf.hybrid.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') }}"}"
+    pf_flags="$pf_flags -D publicnat=0"
     lvrouted_flags="$lvrouted_flags -z `make_list "$list_ileiden_proxies" ","`"
+    named_setfib="1"
+    tinyproxy_setfib="1"
+    dnsmasq_setfib="1"
   {% else %}
     pf_rules="/etc/pf.node.conf"