diff --git a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
index 34616ca8e6..903d41ce97 100644
--- a/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/fed-cloud09.cloud.fedoraproject.org.yml
@@ -232,14 +232,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=cloudintern
-      name=ext-to-int
+      name=ext-to-cloudintern
     register: ROUTER_ID
-  - debug: msg="{{ ROUTER_ID.id }}"
-  - debug: var=ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-cloudintern"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for cloudintern
     neutron_network:
@@ -267,12 +265,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=copr
-      name=ext-to-int
+      name=ext-to-copr
     register: ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-copr"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for copr
     neutron_network:
@@ -300,12 +298,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=infrastructure
-      name=ext-to-int
+      name=ext-to-infrastructure
     register: ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-infrastructure"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for infrastructure
     neutron_network:
@@ -333,12 +331,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=persistent
-      name=ext-to-int
+      name=ext-to-persistent
     register: ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-persistent"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for persistent
     neutron_network:
@@ -366,12 +364,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=transient
-      name=ext-to-int
+      name=ext-to-transient
     register: ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-transient"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for transient
     neutron_network:
@@ -399,12 +397,12 @@
     neutron_router:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
       tenant_name=scratch
-      name=ext-to-int
+      name=ext-to-scratch
     register: ROUTER_ID
   - name: Connect router's gateway to the external network
     neutron_router_gateway:
       login_username="admin" login_password="{{ ADMIN_PASS }}" login_tenant_name="admin"
-      router_name="{{ ROUTER_ID.id }}"
+      router_name="ext-to-scratch"
       network_name="{{ EXTERNAL_ID.id }}"
   - name: Create a private network for scratch
     neutron_network: