diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 04a443480a..b091afd4d6 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -237,7 +237,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=cloudintern
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for cloudintern
@@ -271,7 +270,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=copr
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for copr
@@ -305,7 +303,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=infrastructure
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for infrastructure
@@ -339,7 +336,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=persistent
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for persistent
@@ -373,7 +369,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=transient
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for transient
@@ -407,7 +402,6 @@
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      login_tenant_name=scratch
       router_name="{{ ROUTER_ID.id }}"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for scratch