diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
index 22a5bde..d80b8a5 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
new file mode 120000
index 0000000..f5d04b1
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-00-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc
new file mode 120000
index 0000000..29084fb
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-00-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
new file mode 100644
index 0000000..1696597
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-00.env
@@ -0,0 +1,34 @@
+parameters:
+
+  keystone_url: http://10.12.25.2:5000
+  openstack_tenant_id: 41d6d38489bd40b09ea8a6b6b852dcbd
+  openstack_tenant_name: Integration-SB-00
+  openstack_username: demo
+  openstack_api_key: onapdemo
+
+  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
+  ubuntu_1604_image: ubuntu-16-04-cloud-amd64
+  centos_7_image: CentOS-7
+
+  lab_name: windriver
+  apt_proxy: 10.12.5.2:3142
+  docker_proxy: 10.12.5.2:5000
+
+  rancher_vm_flavor: m1.large
+  k8s_vm_flavor: m1.xxlarge
+
+  public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
+  public_net_name: external
+
+  oam_network_cidr: 10.0.0.0/16
+  dns_forwarder: 10.12.25.5
+  external_dns: 8.8.8.8
+
+  dnsaas_proxy_enable: "true"
+  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dnsaas_keystone_url: http://10.12.25.5:5000
+  dnsaas_region: RegionOne
+  dnsaas_tenant_id: a813ac529c6d4b44a3308ed38bcd7480
+  dnsaas_tenant_name: Integration-SB-00
+  dnsaas_username: demo
+  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
new file mode 120000
index 0000000..208d760
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-01-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc
new file mode 120000
index 0000000..c33055e
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-01-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
new file mode 100644
index 0000000..8e85191
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-01.env
@@ -0,0 +1,34 @@
+parameters:
+
+  keystone_url: http://10.12.25.2:5000
+  openstack_tenant_id: 087050388b204c73a3e418dd2c1fe30b
+  openstack_tenant_name: Integration-SB-01
+  openstack_username: demo
+  openstack_api_key: onapdemo
+
+  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
+  ubuntu_1604_image: ubuntu-16-04-cloud-amd64
+  centos_7_image: CentOS-7
+
+  lab_name: windriver
+  apt_proxy: 10.12.5.2:3142
+  docker_proxy: 10.12.5.2:5000
+
+  rancher_vm_flavor: m1.large
+  k8s_vm_flavor: m1.xxlarge
+
+  public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
+  public_net_name: external
+
+  oam_network_cidr: 10.0.0.0/16
+  dns_forwarder: 10.12.25.5
+  external_dns: 8.8.8.8
+
+  dnsaas_proxy_enable: "true"
+  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dnsaas_keystone_url: http://10.12.25.5:5000
+  dnsaas_region: RegionOne
+  dnsaas_tenant_id: 4318a6c5788449cc97c88fd745b554b9
+  dnsaas_tenant_name: Integration-SB-01
+  dnsaas_username: demo
+  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
new file mode 120000
index 0000000..814962e
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-DNS-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-02-DNS-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc
new file mode 120000
index 0000000..0180cd5
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-SB-02-openrc
\ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
new file mode 100644
index 0000000..99d267b
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-02.env
@@ -0,0 +1,34 @@
+parameters:
+
+  keystone_url: http://10.12.25.2:5000
+  openstack_tenant_id: ebb0ea7144004bacac1e39ff23105fa7
+  openstack_tenant_name: Integration-SB-02
+  openstack_username: demo
+  openstack_api_key: onapdemo
+
+  ubuntu_1404_image: ubuntu-14-04-cloud-amd64
+  ubuntu_1604_image: ubuntu-16-04-cloud-amd64
+  centos_7_image: CentOS-7
+
+  lab_name: windriver
+  apt_proxy: 10.12.5.2:3142
+  docker_proxy: 10.12.5.2:5000
+
+  rancher_vm_flavor: m1.large
+  k8s_vm_flavor: m1.xxlarge
+
+  public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
+  public_net_name: external
+
+  oam_network_cidr: 10.0.0.0/16
+  dns_forwarder: 10.12.25.5
+  external_dns: 8.8.8.8
+
+  dnsaas_proxy_enable: "true"
+  dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0"
+  dnsaas_keystone_url: http://10.12.25.5:5000
+  dnsaas_region: RegionOne
+  dnsaas_tenant_id: 89fee629f5f044739fb64380be63b6da
+  dnsaas_tenant_name: Integration-SB-02
+  dnsaas_username: demo
+  dnsaas_password: onapdemo
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
index 350bd47..89fc801 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-03.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
index 4e6e1cd..ec4227e 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-04.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
index 47147ed..af6c5fe 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-05.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
index 6cf4053..72ddd41 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
index 10b691e..6c5f23a 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env
@@ -10,6 +10,7 @@
   ubuntu_1604_image: ubuntu-16-04-cloud-amd64
   centos_7_image: CentOS-7
 
+  lab_name: windriver
   apt_proxy: 10.12.5.2:3142
   docker_proxy: 10.12.5.2:5000
 
diff --git a/deployment/heat/onap-oom/env/windriver/integration-override.yaml b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
index edc19f5..31c28fe 100644
--- a/deployment/heat/onap-oom/env/windriver/integration-override.yaml
+++ b/deployment/heat/onap-oom/env/windriver/integration-override.yaml
@@ -32,8 +32,12 @@
   # with other instances running within the same k8s cluster
   nodePortPrefix: 302
 
+  # windriver local nexus proxy - nexus3 default
+  repository: 10.12.5.2:5000
   # image pull policy
-  pullPolicy: Always
+  #pullPolicy: Always
+  pullPolicy: IfNotPresent
+
 
   # default mount path root directory referenced
   # by persistent volumes and log files
@@ -99,6 +103,7 @@
   enabled: true
 robot:
   enabled: true
+  #pullPolicy: Always
 #  config:
     # openstack configuration
 #    openStackUserName: "demo"