diff --git a/roles/openqa/worker/files/ifcfg-br0 b/roles/openqa/worker/files/ifcfg-br0
index 1d068e5711..febc8cc827 100644
--- a/roles/openqa/worker/files/ifcfg-br0
+++ b/roles/openqa/worker/files/ifcfg-br0
@@ -1,7 +1,7 @@
 DEVICETYPE='ovs'
 TYPE='OVSBridge'
 BOOTPROTO='static'
-IPADDR='10.0.2.2'
+IPADDR='172.16.2.2'
 NETMASK='255.254.0.0'
 DEVICE=br0
 STP=on
diff --git a/roles/openqa/worker/files/os-autoinst-openvswitch.sysconfig b/roles/openqa/worker/files/os-autoinst-openvswitch.sysconfig
new file mode 100644
index 0000000000..1631f69c89
--- /dev/null
+++ b/roles/openqa/worker/files/os-autoinst-openvswitch.sysconfig
@@ -0,0 +1,2 @@
+OS_AUTOINST_BRIDGE_LOCAL_IP=172.16.2.2
+OS_AUTOINST_BRIDGE_REWRITE_TARGET=172.17.0.0
diff --git a/roles/openqa/worker/tasks/tap-setup.yml b/roles/openqa/worker/tasks/tap-setup.yml
index 6491b46813..f557200812 100644
--- a/roles/openqa/worker/tasks/tap-setup.yml
+++ b/roles/openqa/worker/tasks/tap-setup.yml
@@ -35,5 +35,8 @@
   tags:
   - config
 
+- name: Install openvswitch sysconfig file
+  copy: src=os-autoinst-openvswitch.sysconfig dest=/etc/sysconfig/os-autoinst-openvswitch owner=root group=root mode=0644
+
 - name: Enable and start os-autoinst openvswitch service
   service: name=os-autoinst-openvswitch enabled=yes state=started