diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml
index 00212944d3..8b0b184403 100644
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@@ -16,6 +16,30 @@ parameter_defaults:
   # Type: boolean
   EnablePackageInstall: True
 
+  # Indicate whether this resource may be shared with the domain received in the request "origin" header.
+  # Type: string
+  HeatCorsAllowedOrigin: '*'
+
+  # Maximum number of nested stack depth.
+  # Type: number
+  HeatMaxNestedStackDepth: 7
+
+  # Maximum resources allowed per top-level stack. -1 stands for unlimited.
+  # Type: number
+  HeatMaxResourcesPerStack: -1
+
+  # Allow reauthentication on token expiry, such that long-running tasks may complete. Note this defeats the expiry of any provided user tokens.
+  # Type: string
+  HeatReauthenticationAuthMethod: 'trusts'
+
+  # The maximum number of elements in collection yaql expressions can take for its evaluation.
+  # Type: number
+  HeatYaqlLimitIterators: 10000
+
+  # The maximum size of memory in bytes that yaql exrpessions can take for its evaluation.
+  # Type: number
+  HeatYaqlMemoryQuota: 200000
+
   # Type of disk cleaning before and between deployments, "full" for full cleaning, "metadata" to clean only disk metadata (partition table).
   # Type: string
   IronicCleaningDiskErase: metadata
@@ -28,6 +52,10 @@ parameter_defaults:
   # Type: string
   IronicDefaultInspectInterface: inspector
 
+  # Default resource class to use for new nodes.
+  # Type: string
+  IronicDefaultResourceClass: baremetal
+
   # Whether to enable use of staging drivers.
   # Type: boolean
   IronicEnableStagingDrivers: True
diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml
index 08a05085cf..a99768a804 100644
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@ -9,6 +9,16 @@ environments:
     description: |
       TODO
     files:
+      deployment/heat/heat-base-puppet.yaml:
+        parameters:
+          - HeatCorsAllowedOrigin
+          - HeatYaqlLimitIterators
+          - HeatYaqlMemoryQuota
+      deployment/heat/heat-engine-container-puppet.yaml:
+        parameters:
+          - HeatMaxNestedStackDepth
+          - HeatMaxResourcesPerStack
+          - HeatReauthenticationAuthMethod
       deployment/timesync/chrony-baremetal-ansible.yaml:
         parameters:
           - NtpServer
@@ -24,6 +34,9 @@ environments:
         parameters:
           - SoftwareConfigTransport
           - DnsServers
+      deployment/ironic/ironic-base-puppet.yaml:
+        parameters:
+          - IronicDefaultResourceClass
       deployment/ironic/ironic-conductor-container-puppet.yaml:
         parameters:
           - IronicCleaningDiskErase
@@ -47,6 +60,12 @@ environments:
           - IronicRescuingNetwork
     sample_values:
       # Normal bits for standalone
+      HeatCorsAllowedOrigin: "'*'"
+      HeatMaxNestedStackDepth: 7
+      HeatMaxResourcesPerStack: -1
+      HeatReauthenticationAuthMethod: "'trusts'"
+      HeatYaqlLimitIterators: 10000
+      HeatYaqlMemoryQuota: 200000
       StackAction: CREATE
       SoftwareConfigTransport: POLL_SERVER_HEAT
       EnablePackageInstall: true
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 4b31f3dc36..a1ccd8ad34 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -17,7 +17,19 @@
               - openstack-tox-pep8
         - tripleo-ci-centos-8-content-provider:
             dependencies: *deps_unit_lint
+        - tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
+            vars:
+              consumer_job: true
+              remove_tags:
+                - build
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
+            files:
+              - ^sample-env-generator/undercloud-minion.yaml
+              - ^environments/undercloud/undercloud-minion.yaml
+              - ^deployment/undercloud/minion-rabbitmq-puppet.yaml
     gate:
       queue: tripleo
       jobs:
         - openstack-tox-pep8
+        - tripleo-ci-centos-8-containers-undercloud-minion: *undercloud_minion