diff --git a/resources/apache_puppet/1.0.0/meta.yaml b/resources/apache_puppet/1.0.0/meta.yaml
index bdfdc14..a9b88a2 100644
--- a/resources/apache_puppet/1.0.0/meta.yaml
+++ b/resources/apache_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: apache
 version: 1.0.0
 input:
     apache_name:
diff --git a/resources/cinder_api_puppet/1.0.0/meta.yaml b/resources/cinder_api_puppet/1.0.0/meta.yaml
index e0317d9..b609605 100644
--- a/resources/cinder_api_puppet/1.0.0/meta.yaml
+++ b/resources/cinder_api_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: cinder
 version: 1.0.0
 input:
     keystone_password:
diff --git a/resources/cinder_glance_puppet/1.0.0/meta.yaml b/resources/cinder_glance_puppet/1.0.0/meta.yaml
index 11c732b..c6a3087 100644
--- a/resources/cinder_glance_puppet/1.0.0/meta.yaml
+++ b/resources/cinder_glance_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: cinder
 version: 1.0.0
 input:
     glance_api_version:
diff --git a/resources/cinder_scheduler_puppet/1.0.0/meta.yaml b/resources/cinder_scheduler_puppet/1.0.0/meta.yaml
index c36c023..88c3e65 100644
--- a/resources/cinder_scheduler_puppet/1.0.0/meta.yaml
+++ b/resources/cinder_scheduler_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: cinder
 version: 1.0.0
 input:
     scheduler_driver:
diff --git a/resources/cinder_volume_puppet/1.0.0/meta.yaml b/resources/cinder_volume_puppet/1.0.0/meta.yaml
index 4ffb543..1ef6657 100644
--- a/resources/cinder_volume_puppet/1.0.0/meta.yaml
+++ b/resources/cinder_volume_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: cinder
 version: 1.0.0
 input:
     package_ensure:
diff --git a/resources/glance_puppet/1.0.0/meta.yaml b/resources/glance_puppet/1.0.0/meta.yaml
index 2601953..49edbd1 100644
--- a/resources/glance_puppet/1.0.0/meta.yaml
+++ b/resources/glance_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: glance
 version: 1.0.0
 input:
     package_ensure:
diff --git a/resources/glance_registry_puppet/1.0.0/meta.yaml b/resources/glance_registry_puppet/1.0.0/meta.yaml
index b1d6452..3ad1b83 100644
--- a/resources/glance_registry_puppet/1.0.0/meta.yaml
+++ b/resources/glance_registry_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: glance
 version: 1.0.0
 input:
     package_ensure:
diff --git a/resources/keystone_puppet/1.0.0/meta.yaml b/resources/keystone_puppet/1.0.0/meta.yaml
index 1744a95..e395c31 100644
--- a/resources/keystone_puppet/1.0.0/meta.yaml
+++ b/resources/keystone_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: keystone
 version: 1.0.0
 input:
     admin_token:
diff --git a/resources/neutron_agents_dhcp_puppet/1.0.0/meta.yaml b/resources/neutron_agents_dhcp_puppet/1.0.0/meta.yaml
index 59c785c..bce2698 100644
--- a/resources/neutron_agents_dhcp_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_agents_dhcp_puppet/1.0.0/meta.yaml
@@ -51,6 +51,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_agents_dhcp]
 version: 1.0.0
diff --git a/resources/neutron_agents_l3_puppet/1.0.0/meta.yaml b/resources/neutron_agents_l3_puppet/1.0.0/meta.yaml
index 862da47..e425381 100644
--- a/resources/neutron_agents_l3_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_agents_l3_puppet/1.0.0/meta.yaml
@@ -78,6 +78,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_agents_l3]
 version: 1.0.0
diff --git a/resources/neutron_agents_metadata_puppet/1.0.0/meta.yaml b/resources/neutron_agents_metadata_puppet/1.0.0/meta.yaml
index 385c2be..500b5c4 100644
--- a/resources/neutron_agents_metadata_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_agents_metadata_puppet/1.0.0/meta.yaml
@@ -64,6 +64,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_agents_metadata]
 version: 1.0.0
diff --git a/resources/neutron_agents_ml2_ovs_puppet/1.0.0/meta.yaml b/resources/neutron_agents_ml2_ovs_puppet/1.0.0/meta.yaml
index 6d8f6db..75c54d4 100644
--- a/resources/neutron_agents_ml2_ovs_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_agents_ml2_ovs_puppet/1.0.0/meta.yaml
@@ -60,6 +60,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_agents_ml2_ovs]
 version: 1.0.0
diff --git a/resources/neutron_plugins_ml2_puppet/1.0.0/meta.yaml b/resources/neutron_plugins_ml2_puppet/1.0.0/meta.yaml
index f301984..76d44f8 100644
--- a/resources/neutron_plugins_ml2_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_plugins_ml2_puppet/1.0.0/meta.yaml
@@ -51,6 +51,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_plugins_ml2]
 version: 1.0.0
diff --git a/resources/neutron_puppet/1.0.0/meta.yaml b/resources/neutron_puppet/1.0.0/meta.yaml
index 2c9239a..969482f 100644
--- a/resources/neutron_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_puppet/1.0.0/meta.yaml
@@ -183,6 +183,5 @@ input:
     schema: {name: str!, type: str, url: str, ref: str}
     value: {name: neutron, type: 'git', url: 'https://github.com/openstack/puppet-neutron', ref: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron]
 version: 1.0.0
diff --git a/resources/neutron_server_puppet/1.0.0/meta.yaml b/resources/neutron_server_puppet/1.0.0/meta.yaml
index ecf89e1..976110b 100644
--- a/resources/neutron_server_puppet/1.0.0/meta.yaml
+++ b/resources/neutron_server_puppet/1.0.0/meta.yaml
@@ -142,6 +142,5 @@ input:
     schema: {repository: str!, branch: str!}
     value: {repository: 'https://github.com/openstack/puppet-neutron', branch: '5.1.0'}
 
-puppet_module: 'neutron'
 tags: [resource/neutron, resource/neutron_service, resource/neutron_server, resource/neutron_api]
 version: 1.0.0
diff --git a/resources/node_network_puppet/1.0.0/meta.yaml b/resources/node_network_puppet/1.0.0/meta.yaml
index f6878d1..ff97ab2 100644
--- a/resources/node_network_puppet/1.0.0/meta.yaml
+++ b/resources/node_network_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: l23network
 version: 1.0.0
 input:
     package_ensure:
diff --git a/resources/nova_api_puppet/1.0.0/meta.yaml b/resources/nova_api_puppet/1.0.0/meta.yaml
index 7936bde..bd88082 100644
--- a/resources/nova_api_puppet/1.0.0/meta.yaml
+++ b/resources/nova_api_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     ensure_package:
diff --git a/resources/nova_compute_libvirt_puppet/1.0.0/meta.yaml b/resources/nova_compute_libvirt_puppet/1.0.0/meta.yaml
index 4540de8..f907303 100644
--- a/resources/nova_compute_libvirt_puppet/1.0.0/meta.yaml
+++ b/resources/nova_compute_libvirt_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     libvirt_virt_type:
diff --git a/resources/nova_compute_puppet/1.0.0/meta.yaml b/resources/nova_compute_puppet/1.0.0/meta.yaml
index c4aa0be..3100d9b 100644
--- a/resources/nova_compute_puppet/1.0.0/meta.yaml
+++ b/resources/nova_compute_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     ensure_package:
diff --git a/resources/nova_conductor_puppet/1.0.0/meta.yaml b/resources/nova_conductor_puppet/1.0.0/meta.yaml
index 8c210a3..3b9a622 100644
--- a/resources/nova_conductor_puppet/1.0.0/meta.yaml
+++ b/resources/nova_conductor_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     ensure_package:
diff --git a/resources/nova_generic_service_puppet/1.0.0/meta.yaml b/resources/nova_generic_service_puppet/1.0.0/meta.yaml
index c6044b0..0afe1e9 100644
--- a/resources/nova_generic_service_puppet/1.0.0/meta.yaml
+++ b/resources/nova_generic_service_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     title:
diff --git a/resources/nova_neutron_puppet/1.0.0/meta.yaml b/resources/nova_neutron_puppet/1.0.0/meta.yaml
index 60641c9..dffa410 100644
--- a/resources/nova_neutron_puppet/1.0.0/meta.yaml
+++ b/resources/nova_neutron_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 input:
     auth_host:
diff --git a/resources/nova_puppet/1.0.0/meta.yaml b/resources/nova_puppet/1.0.0/meta.yaml
index de32aba..0f16e89 100644
--- a/resources/nova_puppet/1.0.0/meta.yaml
+++ b/resources/nova_puppet/1.0.0/meta.yaml
@@ -1,5 +1,4 @@
 handler: puppet
-puppet_module: nova
 version: 1.0.0
 actions:
     run: run.pp