diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 7067c7aa6..f2dee53b1 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -397,6 +397,7 @@ ironic_config {
   'inspector/enabled':            value => true;
   'pxe/http_url':                 value => 'http://$my_ip:8088';
   'pxe/http_root':                value => '/httpboot';
+  'pxe/ipxe_timeout':             value => '60';
   'conductor/clean_nodes':        value => hiera('ironic::conductor::clean_nodes');
 }
 
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index b27dd1ecf..101a6aa27 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -397,6 +397,7 @@ ironic::inspector::dnsmasq_interface: {{INSPECTION_INTERFACE}}
 ironic::inspector::ramdisk_collectors: {{INSPECTION_COLLECTORS}}
 ironic::inspector::additional_processing_hooks: 'extra_hardware'
 ironic::inspector::ramdisk_kernel_args: {{INSPECTION_KERNEL_ARGS}}
+ironic::inspector::ipxe_timeout: 60
 
 # Rabbit
 rabbit_cookie: {{UNDERCLOUD_RABBIT_COOKIE}}