diff --git a/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml b/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
index c384a38..ae103d3 100644
--- a/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
+++ b/de/heat-templates/env/migration-mstr1-wrkr5-cmp2-gtw0-vbmc3.yaml
@@ -48,6 +48,8 @@
   vbmcs_flavor: 'system.compact.openstack.control'
   storage_frontend_network_cidr: '10.12.1.0/24'
   storage_backend_network_cidr: '10.12.0.0/24'
+  # Needed for OVN+VTEP jobs
+  docker_ucp_swarm_data_port: 4791
   hardware_metadata: |
     '00:00:00:00:00:00':
       write_files:
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-vbmc2.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-vbmc2.yaml
index e106da5..c072d86 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-vbmc2.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp0-gtw0-vbmc2.yaml
@@ -45,6 +45,8 @@
   storage_frontend_network_ipam_pool_start: '10.12.1.3'
   storage_frontend_network_ipam_pool_end: '10.12.1.254'
   storage_backend_network_cidr: '10.12.0.0/24'
+  # Needed for OVN+VTEP jobs
+  docker_ucp_swarm_data_port: 4791
   hardware_metadata: |
     '00:00:00:00:00:00':
       write_files:
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vbmc5.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vbmc5.yaml
index 601fb0c..2142463 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vbmc5.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-gtw0-vbmc5.yaml
@@ -48,6 +48,8 @@
   storage_frontend_network_ipam_pool_start: '10.12.1.3'
   storage_frontend_network_ipam_pool_end: '10.12.1.254'
   storage_backend_network_cidr: '10.12.0.0/24'
+  # Needed for OVN+VTEP jobs
+  docker_ucp_swarm_data_port: 4791
   hardware_metadata: |
     '00:00:00:00:00:00':
       write_files:
diff --git a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
index 3c74544..b2aa17d 100644
--- a/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
+++ b/de/heat-templates/env/mstr1-wrkr3-cmp2-ntw3-vbmc2.yaml
@@ -49,6 +49,8 @@
   storage_frontend_network_ipam_pool_start: '10.12.1.3'
   storage_frontend_network_ipam_pool_end: '10.12.1.254'
   storage_backend_network_cidr: '10.12.0.0/24'
+  # Needed for OVN+VTEP jobs
+  docker_ucp_swarm_data_port: 4791
   hardware_metadata: |
     '00:00:00:00:00:00':
       write_files: