diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index c78e208032..78bb8e9ccd 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -29,7 +29,7 @@ clouds:
       password: '<%= @tripleo_password %>'
       project_name: '<%= tripleo_project %>'
       auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0'
-    floating_ip_source: nova
+    floating_ip_source: neutron
   tripleo-test-cloud-rh2:
     region_name: regionOne
     auth:
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index cbd34fd081..d173379d27 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -109,7 +109,7 @@ clouds:
       username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %>
       password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %>
       project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %>
-    floating_ip_source: nova
+    floating_ip_source: neutron
   openstackjenkins-osic-cloud1:
     region_name: RegionOne
     auth: