diff --git a/inventory/inventory b/inventory/inventory
index e5e0306476..cd4c436800 100644
--- a/inventory/inventory
+++ b/inventory/inventory
@@ -506,7 +506,6 @@ openqa01.qa.fedoraproject.org
 
 [openqa-workers]
 qa05.qa.fedoraproject.org
-qa06.qa.fedoraproject.org
 qa14.qa.fedoraproject.org
 
 # openqa-stg and openqa-stg-workers are pseudo-stg, see group_vars/openqa-stg for more details
@@ -514,6 +513,7 @@ qa14.qa.fedoraproject.org
 openqa-stg01.qa.fedoraproject.org
 
 [openqa-stg-workers]
+qa06.qa.fedoraproject.org
 qa07.qa.fedoraproject.org
 
 [packages]
diff --git a/roles/openqa/worker/tasks/main.yml b/roles/openqa/worker/tasks/main.yml
index 3873810f4b..3e109be4ca 100644
--- a/roles/openqa/worker/tasks/main.yml
+++ b/roles/openqa/worker/tasks/main.yml
@@ -74,7 +74,7 @@
   tags:
   - config
 
-- name: openvswitch gre tunnel config
+- name: openvswitch gre tunnel config (prod)
   template: src=ifcfg-gre.j2 dest=/etc/sysconfig/network-scripts/ifcfg-gre{{ item.0 }} owner=root group=root mode=0644
   with_indexed_items: "{{ groups['openqa-workers']|difference([inventory_hostname]) }}"
   when: deployment_type == 'prod'
@@ -83,6 +83,15 @@
   tags:
   - config
 
+- name: openvswitch gre tunnel config (stg)
+  template: src=ifcfg-gre.j2 dest=/etc/sysconfig/network-scripts/ifcfg-gre{{ item.0 }} owner=root group=root mode=0644
+  with_indexed_items: "{{ groups['openqa-stg-workers']|difference([inventory_hostname]) }}"
+  when: deployment_type == 'stg'
+  notify:
+  - restart network
+  tags:
+  - config
+
 - name: Install ifup-pre-local script to create tap devices
   copy: src=ifup-pre-local dest=/sbin/ifup-pre-local owner=root group=root mode=0755