diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
index fdc36f5939..99efa59108 100644
--- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb
@@ -115,13 +115,11 @@ labels:
     image: tripleo-precise
     min-ready: 10
     providers:
-      - name: tripleo-test-cloud
       - name: tripleo-test-cloud-rh1
   - name: tripleo-f20
     image: tripleo-f20
     min-ready: 5
     providers:
-      - name: tripleo-test-cloud
       - name: tripleo-test-cloud-rh1
 
 providers:
@@ -666,7 +664,7 @@ providers:
     project-id: '<%= tripleo_project %>'
     auth-url: 'https://ci-overcloud.tripleo.org:13000/v2.0'
     boot-timeout: 120
-    max-servers: 40
+    max-servers: 0
     rate: 0.001
     networks:
       - net-id: a395fac5-adec-4ab9-a605-963558349cfd