diff --git a/core/core-model-veos.yml b/core/core-model-veos.yml
index fbe9a7d..2035cad 100644
--- a/core/core-model-veos.yml
+++ b/core/core-model-veos.yml
@@ -33,7 +33,7 @@ nodes:
     rid: 10.39.8.55
     sid: 50
     iso: 49.0001.0010.0100.1005.00
-    lu: 163.253.39.165
+#    lu: 163.253.39.165
 
   - name: ansible-veos55
     mgmt: 10.39.0.155
@@ -44,7 +44,7 @@ nodes:
     rid: 10.39.8.56
     sid: 60
     iso: 49.0001.0010.0100.1006.00
-    lu: 163.253.39.165
+#    lu: 163.253.39.165
 
   - name: ansible-veos66
     mgmt: 10.39.0.156
diff --git a/core/core-model.yml b/core/core-model.yml
index c7abdfd..b49d595 100644
--- a/core/core-model.yml
+++ b/core/core-model.yml
@@ -5,25 +5,25 @@ common:
 
 nodes:
   - name: ansible-vmx1
-    mgmt: 10.39.0.41
+    mgmt: 10.39.0.57
     rid: 10.39.8.41
     sid: 10
     iso: 49.0001.0010.0100.1001.00
 
   - name: ansible-vmx2
-    mgmt: 10.39.0.42
+    mgmt: 10.39.0.58
     rid: 10.39.8.42
     sid: 20
     iso: 49.0001.0010.0100.1002.00
 
   - name: ansible-vmx3
-    mgmt: 10.39.0.43
+    mgmt: 10.39.0.59
     rid: 10.39.8.43
     sid: 30
     iso: 49.0001.0010.0100.1003.00
 
   - name: ansible-vmx4
-    mgmt: 10.39.0.44
+    mgmt: 10.39.0.60
     rid: 10.39.8.44
     sid: 40
     iso: 49.0001.0010.0100.1004.00
diff --git a/core_config/ansible-vmx1-config.txt b/core_config/ansible-vmx1-config.txt
index e37c024..0613353 100644
--- a/core_config/ansible-vmx1-config.txt
+++ b/core_config/ansible-vmx1-config.txt
@@ -1,5 +1,5 @@
 
-version 15.1F6.9
+version 17.3R3.9
 system {
     host-name ansible-vmx1;
     no-redirects;
@@ -78,7 +78,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.41/20;
+                address 10.39.0.57/20;
             }
         }
     }
diff --git a/core_config/ansible-vmx2-config.txt b/core_config/ansible-vmx2-config.txt
index 295c263..a5a48de 100644
--- a/core_config/ansible-vmx2-config.txt
+++ b/core_config/ansible-vmx2-config.txt
@@ -1,5 +1,5 @@
 
-version 15.1F6.9
+version 17.3R3.9
 system {
     host-name ansible-vmx2;
     no-redirects;
@@ -78,7 +78,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.42/20;
+                address 10.39.0.58/20;
             }
         }
     }
diff --git a/core_config/ansible-vmx3-config.txt b/core_config/ansible-vmx3-config.txt
index e8a5f29..bffc810 100644
--- a/core_config/ansible-vmx3-config.txt
+++ b/core_config/ansible-vmx3-config.txt
@@ -1,5 +1,5 @@
 
-version 15.1F6.9
+version 17.3R3.9
 system {
     host-name ansible-vmx3;
     no-redirects;
@@ -78,7 +78,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.43/20;
+                address 10.39.0.59/20;
             }
         }
     }
diff --git a/core_config/ansible-vmx4-config.txt b/core_config/ansible-vmx4-config.txt
index 27ba03d..7bada14 100644
--- a/core_config/ansible-vmx4-config.txt
+++ b/core_config/ansible-vmx4-config.txt
@@ -1,5 +1,5 @@
 
-version 15.1F6.9
+version 17.3R3.9
 system {
     host-name ansible-vmx4;
     no-redirects;
@@ -78,7 +78,7 @@ interfaces {
         description "OOB to MGMT Network";
         unit 0 {
             family inet {
-                address 10.39.0.44/20;
+                address 10.39.0.60/20;
             }
         }
     }
diff --git a/hosts b/hosts
index 2f2c9d9..c0f451a 100644
--- a/hosts
+++ b/hosts
@@ -6,13 +6,13 @@ all:
         vmx:
           hosts:
             ansible-vmx1:
-              ansible_host: 10.39.0.41
+              ansible_host: 10.39.0.57
             ansible-vmx2:
-              ansible_host: 10.39.0.42
+              ansible_host: 10.39.0.58
             ansible-vmx3:
-              ansible_host: 10.39.0.43
+              ansible_host: 10.39.0.59
             ansible-vmx4:
-              ansible_host: 10.39.0.44
+              ansible_host: 10.39.0.60
     eos:
       children:
         veos:
diff --git a/nodes.yml b/nodes.yml
index ae0fb44..37dc85c 100644
--- a/nodes.yml
+++ b/nodes.yml
@@ -9,15 +9,15 @@ common:
 
 nodes:
 
-  ansible-veos1:
-    mgmt: 10.39.0.41
+  ansible-vmx1:
+    mgmt: 10.39.0.57
     rid:  10.39.8.41
     sid: 10
     iso: 49.0001.0010.0100.1001.00
     links:
-      Ethernet1.0: { ip: 172.10.12.1, remote: ansible-veos2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet2.0: { ip: 172.10.13.1, remote: ansible-veos3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet4.0: { ip: 172.10.15.1, remote: ansible-veos5 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/0.0: { ip: 172.10.12.1, remote: ansible-vmx2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/1.0: { ip: 172.10.13.1, remote: ansible-vmx3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/3.0: { ip: 172.10.15.1, remote: ansible-veos5 , cost: 10 , vlan: 0 , mpls: True , iso: True}
     bgp:
        ibgp:
          rr: true
@@ -29,15 +29,15 @@ nodes:
             - inet
             - inet-vpn
 
-  ansible-veos2:
-    mgmt: 10.39.0.42
+  ansible-vmx2:
+    mgmt: 10.39.0.58
     rid:  10.39.8.42
     sid: 20
     iso: 49.0001.0010.0100.1002.00
     links:
-      Ethernet1.0: { ip: 172.10.12.2, remote: ansible-veos1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet3.0: { ip: 172.10.24.2, remote: ansible-veos4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet4.0: { ip: 172.10.25.2, remote: ansible-veos5 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/0.0: { ip: 172.10.12.2, remote: ansible-vmx1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/2.0: { ip: 172.10.24.2, remote: ansible-vmx4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/3.0: { ip: 172.10.25.2, remote: ansible-veos5 , cost: 10 , vlan: 0 , mpls: True , iso: True}
     bgp:
        ibgp:
          peers:
@@ -46,15 +46,15 @@ nodes:
             - inet
             - inet-vpn
 
-  ansible-veos3:
-    mgmt: 10.39.0.43
+  ansible-vmx3:
+    mgmt: 10.39.0.59
     rid:  10.39.8.43
     sid: 30
     iso: 49.0001.0010.0100.1003.00
     links:
-      Ethernet1.0: { ip: 172.10.13.3, remote: ansible-veos1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet3.0: { ip: 172.10.34.3, remote: ansible-veos4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet4.0: { ip: 172.10.36.3, remote: ansible-veos6 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/0.0: { ip: 172.10.13.3, remote: ansible-vmx1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/2.0: { ip: 172.10.34.3, remote: ansible-vmx4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/3.0: { ip: 172.10.36.3, remote: ansible-veos6 , cost: 10 , vlan: 0 , mpls: True , iso: True}
     bgp:
        ibgp:
          peers:
@@ -63,15 +63,15 @@ nodes:
             - inet
             - inet-vpn
 
-  ansible-veos4:
-    mgmt: 10.39.0.44
+  ansible-vmx4:
+    mgmt: 10.39.0.60
     rid:  10.39.8.44
     sid: 40
     iso: 49.0001.0010.0100.1004.00
     links:
-      Ethernet2.0: { ip: 172.10.24.4, remote: ansible-veos2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet3.0: { ip: 172.10.34.4, remote: ansible-veos3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet4.0: { ip: 172.10.46.4, remote: ansible-veos6 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/1.0: { ip: 172.10.24.4, remote: ansible-vmx2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/2.0: { ip: 172.10.34.4, remote: ansible-vmx3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      ge-0/0/3.0: { ip: 172.10.46.4, remote: ansible-veos6 , cost: 10 , vlan: 0 , mpls: True , iso: True}
     bgp:
        ibgp:
          peers:
@@ -86,8 +86,8 @@ nodes:
     sid: 50
     iso: 49.0001.0010.0100.1005.00
     links:
-      Ethernet1.0: { ip: 172.10.15.5, remote: ansible-veos1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet2.0: { ip: 172.10.25.5, remote: ansible-veos2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      Ethernet1.0: { ip: 172.10.15.5, remote: ansible-vmx1 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      Ethernet2.0: { ip: 172.10.25.5, remote: ansible-vmx2 , cost: 10 , vlan: 0 , mpls: True , iso: True}
       Ethernet3.0: { ip: 172.10.55.5, remote: ansible-veos55  , vlan: 0  }
     bgp:
        ibgp:
@@ -118,8 +118,8 @@ nodes:
     sid: 60
     iso: 49.0001.0010.0100.1006.00
     links:
-      Ethernet1.0: { ip: 172.10.36.6, remote: ansible-veos3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
-      Ethernet2.0: { ip: 172.10.46.6, remote: ansible-veos4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      Ethernet1.0: { ip: 172.10.36.6, remote: ansible-vmx3 , cost: 10 , vlan: 0 , mpls: True , iso: True}
+      Ethernet2.0: { ip: 172.10.46.6, remote: ansible-vmx4 , cost: 10 , vlan: 0 , mpls: True , iso: True}
       Ethernet3.0: { ip: 172.10.66.6, remote: ansible-veos66  , vlan: 0  }
     bgp:
        ibgp: