diff --git a/lab-vqfx-vxlan/README.md b/lab-vqfx-vxlan/README.md
index 2ba2a10..c5ffd60 100644
--- a/lab-vqfx-vxlan/README.md
+++ b/lab-vqfx-vxlan/README.md
@@ -3,4 +3,5 @@
 This is a tentative, but unfortunately, Cumulus FRR is discarding BGP
 updates when they contain an ESI tag. Therefore, this doesn't
 work. Also, Juniper says the VRF target of received BGP updates are
-invalid. This should be solvable, but didn't investigate more.
+invalid. FRR needs to be patched for this... See the vxlan lab which
+includes an option to use a vQFX instead.
diff --git a/lab-vxlan/junos-S4.conf b/lab-vxlan/junos-S4.conf
new file mode 100644
index 0000000..e4fa369
--- /dev/null
+++ b/lab-vxlan/junos-S4.conf
@@ -0,0 +1,111 @@
+# -*- junos -*-
+system {
+    host-name S3;
+    syslog  {
+        file messages {
+            any notice;
+        }
+    }
+}
+interfaces {
+    lo0 {
+        unit 0 {
+            family inet {
+                address 203.0.113.3/32;
+            }
+            family inet6 {
+                address 2001:db8:3::1/128;
+            }
+        }
+    }
+    xe-0/0/0 {
+        unit 0 {
+            family inet {
+                address 169.254.15.3/24;
+            }
+            family inet6;
+        }
+    }
+    xe-0/0/1 {
+        unit 0 {
+            family ethernet-switching {
+                interface-mode trunk;
+                vlan {
+                    members [ vlan100 vlan200 ];
+                }
+            }
+        }
+    }
+}
+
+protocols {
+    ospf {
+        area 0.0.0.0 {
+            interface xe-0/0/0.0;
+            interface lo0.0 {
+                passive;
+            }
+        }
+    }
+    ospf3 {
+        area 0.0.0.0 {
+            interface xe-0/0/0.0;
+            interface lo0.0 {
+                passive;
+            }
+        }
+    }
+    bgp {
+        group evpn {
+            type internal;
+            multipath;
+            multihop;
+            family evpn signaling;
+            local-address 203.0.113.3;
+            neighbor 203.0.113.254;
+        }
+    }
+    evpn {
+        encapsulation vxlan;
+        extended-vni-list all;
+        multicast-mode ingress-replication;
+    }
+}
+
+vlans {
+    vlan100 {
+        vlan-id 100;
+        vxlan {
+            vni 100;
+            ingress-node-replication;
+        }
+    }
+    vlan200 {
+        vlan-id 200;
+        vxlan {
+            vni 200;
+            ingress-node-replication;
+        }
+    }
+}
+
+switch-options {
+    vtep-source-interface lo0.0;
+    route-distinguisher 203.0.113.3:1;
+    vrf-import EVPN-VRF-VXLAN;
+    vrf-target {
+        target:65000:1;
+        auto;
+    }
+}
+
+routing-options {
+    router-id 203.0.113.3;
+    autonomous-system 65000;
+}
+
+policy-options {
+    policy-statement EVPN-VRF-VXLAN {
+        then accept;
+    }
+}
diff --git a/lab-vxlan/setup b/lab-vxlan/setup
index ec18bbd..1209380 100755
--- a/lab-vxlan/setup
+++ b/lab-vxlan/setup
@@ -14,7 +14,8 @@ LABNAME="vxlan"
 #VARIANT=cumulus-vxfld-her     # Head end replication
 #VARIANT=cumulus-vxfld-snr     # Service node replication
 #VARIANT=bgp-evpn-cumulus+rr:gobgp
-VARIANT=bgp-evpn-cumulus+junos+rr:gobgp
+#VARIANT=bgp-evpn-cumulus+vmx+rr:gobgp
+VARIANT=bgp-evpn-cumulus+vqfx+rr:gobgp
 #VARIANT=bgp-evpn-cumulus+rr:quagga
 #VARIANT=bgp-evpn-cumulus+rr:junos
 #VARIANT=bgp-evpn-cumulus+junos+rr:junos
@@ -38,9 +39,12 @@ spawn vm H4 network 5
 spawn vm S1 networks 1,2
 spawn vm S2 networks 1,3,4
 case $VARIANT in
-    bgp-evpn-cumulus+junos+rr:*)
+    bgp-evpn-cumulus+vmx+rr:*)
         spawn juniper-vmx S3 networks 1,5
         ;;
+    bgp-evpn-cumulus+vqfx+rr:*)
+        spawn juniper-vqfx S4 networks 1,5
+        ;;
     *)
         spawn vm S3 networks 1,5
         ;;