diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml
index 97e156e38c..4d6221ccf4 100644
--- a/environments/standalone/standalone-tripleo.yaml
+++ b/environments/standalone/standalone-tripleo.yaml
@@ -40,6 +40,10 @@ parameter_defaults:
   # Type: comma_delimited_list
   NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
 
+  # How the server should receive the metadata required for software configuration.
+  # Type: string
+  SoftwareConfigTransport: POLL_SERVER_HEAT
+
   # Set this to true to open up ssh access from all sources.
   # Type: boolean
   SshFirewallAllowAll: True
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index a900be0132..3b6aa7ae20 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -77,6 +77,7 @@ parameter_defaults:
   TokenExpiration: 14400
   EnablePackageInstall: true
   StackAction: CREATE
+  SoftwareConfigTransport: POLL_SERVER_HEAT
   NeutronTunnelTypes: []
   NeutronBridgeMappings: ctlplane:br-ctlplane
   NeutronAgentExtensions: []
diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml
index bf944448e1..226ea1d865 100644
--- a/environments/undercloud/undercloud-minion.yaml
+++ b/environments/undercloud/undercloud-minion.yaml
@@ -20,6 +20,10 @@ parameter_defaults:
   # Type: comma_delimited_list
   NtpServer: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org']
 
+  # How the server should receive the metadata required for software configuration.
+  # Type: string
+  SoftwareConfigTransport: POLL_SERVER_HEAT
+
   # Set this to true to open up ssh access from all sources.
   # Type: boolean
   SshFirewallAllowAll: True
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 7904af2270..bd4253c633 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -343,7 +343,7 @@ parameter_defaults:
   NeutronMechanismDrivers: ovn
   ContainerCli: podman
   EnablePackageInstall: false
-  SoftwareConfigTransport: POLL_SERVER_HEAT
+  SoftwareConfigTransport: POLL_TEMP_URL
 
 {% for role in roles %}
   # Parameters generated for {{role.name}} Role
diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml
index d6e7c498be..ef8cfb138c 100644
--- a/sample-env-generator/standalone.yaml
+++ b/sample-env-generator/standalone.yaml
@@ -37,14 +37,18 @@ environments:
       deployment/sshd/sshd-baremetal-puppet.yaml:
         parameters:
           - SshFirewallAllowAll
+      # TODO(aschultz): hack to pull in this config transport, not sure it is
+      # still neded.
       puppet/controller-role.yaml:
         parameters:
+          - SoftwareConfigTransport
           - DnsServers
       sample-env-generator/standalone.yaml:
         parameters:
           - AddVipsToEtcHosts
     sample_values:
       StackAction: CREATE
+      SoftwareConfigTransport: POLL_SERVER_HEAT
       EnablePackageInstall: true
       SwiftReplicas: 1
       SshFirewallAllowAll: true
diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml
index 0eb69ab776..1ea7a7d7dd 100644
--- a/sample-env-generator/undercloud-minion.yaml
+++ b/sample-env-generator/undercloud-minion.yaml
@@ -18,12 +18,16 @@ environments:
       deployment/sshd/sshd-baremetal-puppet.yaml:
         parameters:
           - SshFirewallAllowAll
+      # TODO(aschultz): hack to pull in this config transport, not sure it is
+      # still neded.
       puppet/controller-role.yaml:
         parameters:
+          - SoftwareConfigTransport
           - DnsServers
     sample_values:
       # Normal bits for standalone
       StackAction: CREATE
+      SoftwareConfigTransport: POLL_SERVER_HEAT
       EnablePackageInstall: true
       SshFirewallAllowAll: true
       HeatEngineOptVolumes: