diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index b31e96aca..49658759e 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -473,6 +473,7 @@ include ::ironic
 include ::ironic::api
 include ::ironic::conductor
 include ::ironic::drivers::ilo
+include ::ironic::drivers::inspector
 include ::ironic::drivers::ipmi
 include ::ironic::drivers::pxe
 include ::ironic::drivers::ssh
@@ -480,6 +481,7 @@ include ::ironic::glance
 include ::ironic::inspector
 include ::ironic::neutron
 include ::ironic::pxe
+include ::ironic::service_catalog
 include ::ironic::swift
 include ::ironic::cors
 
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index c2a842aea..c757a68a6 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -463,10 +463,15 @@ ironic::api::host_ip: {{LOCAL_IP}}
 ironic::api::workers: "%{::os_workers}"
 ironic::database_connection: mysql+pymysql://ironic:{{UNDERCLOUD_IRONIC_PASSWORD}}@{{LOCAL_IP}}/ironic
 ironic::default_transport_url: "rabbit://{{UNDERCLOUD_RABBIT_USERNAME}}:{{UNDERCLOUD_RABBIT_PASSWORD}}@{{LOCAL_IP}}//"
+ironic::drivers::inspector::enabled: true
+ironic::drivers::inspector::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
+ironic::drivers::inspector::auth_url: "%{hiera('keystone_identity_uri')}"
 ironic::glance::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
 ironic::glance::auth_url: "%{hiera('keystone_identity_uri')}"
 ironic::neutron::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
 ironic::neutron::auth_url: "%{hiera('keystone_identity_uri')}"
+ironic::service_catalog::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
+ironic::service_catalog::auth_url: "%{hiera('keystone_identity_uri')}"
 ironic::swift::password: {{UNDERCLOUD_IRONIC_PASSWORD}}
 ironic::swift::auth_url: "%{hiera('keystone_identity_uri')}"
 # Ironic conductor forces deployments to use http
@@ -737,8 +742,10 @@ heat::keystone::authtoken::project_name: 'service'
 glance::api::authtoken::project_name: 'service'
 glance::registry::authtoken::project_name: 'service'
 ironic::api::authtoken::project_name: 'service'
+ironic::drivers::inspector::project_name: 'service'
 ironic::glance::project_name: 'service'
 ironic::neutron::project_name: 'service'
+ironic::service_catalog::project_name: 'service'
 ironic::swift::project_name: 'service'
 nova::keystone::authtoken::project_name: 'service'
 swift::proxy::authtoken::project_name: 'service'