diff --git a/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp b/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp
index 01b472642..72fd4d065 100644
--- a/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp
+++ b/modules/puppet-dcmanager/src/dcmanager/manifests/init.pp
@@ -73,7 +73,7 @@ class dcmanager (
   }
 
   dcmanager_config {
-      'DEFAULT/transport_url':    value => $::platform::amqp::params::transport_url;
+      'DEFAULT/transport_url':    value=> "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}"
   }
 
   dcmanager_config {
diff --git a/modules/puppet-dcorch/src/dcorch/manifests/init.pp b/modules/puppet-dcorch/src/dcorch/manifests/init.pp
index cba050888..b93e76747 100644
--- a/modules/puppet-dcorch/src/dcorch/manifests/init.pp
+++ b/modules/puppet-dcorch/src/dcorch/manifests/init.pp
@@ -93,7 +93,7 @@ class dcorch (
   }
 
   dcorch_config {
-      'DEFAULT/transport_url':    value => $::platform::amqp::params::transport_url;
+      'DEFAULT/transport_url':    value=> "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}"
   }
 
   dcorch_config {
diff --git a/puppet-manifests/src/modules/platform/manifests/dcmanager.pp b/puppet-manifests/src/modules/platform/manifests/dcmanager.pp
index 931512c32..dd19e6202 100644
--- a/puppet-manifests/src/modules/platform/manifests/dcmanager.pp
+++ b/puppet-manifests/src/modules/platform/manifests/dcmanager.pp
@@ -12,6 +12,7 @@ class platform::dcmanager::params (
   $iso_base_dir_target = '/var/www/pages/iso',
   $state_workers = undef,
   $audit_worker_workers = undef,
+  $rabbit_host = 'localhost',
 ) {
   include ::platform::params
 
@@ -63,29 +64,6 @@ class platform::dcmanager
 
     $system_mode = $::platform::params::system_mode
 
-    # FQDN can be used after:
-    # - after the bootstrap for any installation
-    # - mate controller uses FQDN if mgmt::params::fqdn_ready is present
-    #     mate controller can use FQDN before the bootstrap flag
-    # - just AIO-SX can use FQDN during the an upgrade. For other installs
-    #     the active controller in older release can resolve the .internal FQDN
-    #     when the mate controller is updated to N+1 version
-    if (!str2bool($::is_upgrade_do_not_use_fqdn) or $system_mode == 'simplex') {
-      if (str2bool($::is_bootstrap_completed)) {
-        $fqdn_ready = true
-      } else {
-        if ($::platform::network::mgmt::params::fqdn_ready != undef) {
-          $fqdn_ready = $::platform::network::mgmt::params::fqdn_ready
-        }
-        else {
-          $fqdn_ready = false
-        }
-      }
-    }
-    else {
-      $fqdn_ready = false
-    }
-
     # If not defined, worker values can vary from 4 to 8 depending
     # on the number of physical cores and memory available
     if $::platform::dcmanager::params::state_workers == undef {
@@ -101,10 +79,7 @@ class platform::dcmanager
     }
 
     class { '::dcmanager':
-      rabbit_host          => (str2bool($fqdn_ready)) ? {
-                                true    => $::platform::amqp::params::host,
-                                default => $::platform::amqp::params::host_url,
-                              },
+      rabbit_host          => $::platform::dcmanager::params::rabbit_host,
       rabbit_port          => $::platform::amqp::params::port,
       rabbit_userid        => $::platform::amqp::params::auth_user,
       rabbit_password      => $::platform::amqp::params::auth_password,
diff --git a/puppet-manifests/src/modules/platform/manifests/dcorch.pp b/puppet-manifests/src/modules/platform/manifests/dcorch.pp
index b2f0c1713..4150c13b8 100644
--- a/puppet-manifests/src/modules/platform/manifests/dcorch.pp
+++ b/puppet-manifests/src/modules/platform/manifests/dcorch.pp
@@ -18,6 +18,7 @@ class platform::dcorch::params (
   $sysinv_api_proxy_client_timeout = '600s',
   $sysinv_api_proxy_server_timeout = '600s',
   $engine_workers = undef,
+  $rabbit_host = 'localhost',
 ) {
   include ::platform::params
 
@@ -69,29 +70,6 @@ class platform::dcorch
 
     $system_mode = $::platform::params::system_mode
 
-    # FQDN can be used after:
-    # - after the bootstrap for any installation
-    # - mate controller uses FQDN if mgmt::params::fqdn_ready is present
-    #     mate controller can use FQDN before the bootstrap flag
-    # - just AIO-SX can use FQDN during the an upgrade. For other installs
-    #     the active controller in older release can resolve the .internal FQDN
-    #     when the mate controller is updated to N+1 version
-    if (!str2bool($::is_upgrade_do_not_use_fqdn) or $system_mode == 'simplex') {
-      if (str2bool($::is_bootstrap_completed)) {
-        $fqdn_ready = true
-      } else {
-        if ($::platform::network::mgmt::params::fqdn_ready != undef) {
-          $fqdn_ready = $::platform::network::mgmt::params::fqdn_ready
-        }
-        else {
-          $fqdn_ready = false
-        }
-      }
-    }
-    else {
-      $fqdn_ready = false
-    }
-
     # If not defined, worker values can vary from 4 to 6 depending
     # on the number of physical cores and memory available
     if $::platform::dcorch::params::engine_workers == undef {
@@ -101,10 +79,7 @@ class platform::dcorch
     }
 
     class { '::dcorch':
-      rabbit_host       => (str2bool($fqdn_ready)) ? {
-                              true    => $::platform::amqp::params::host,
-                              default => $::platform::amqp::params::host_url,
-                            },
+      rabbit_host       => $::platform::dcorch::params::rabbit_host,
       rabbit_port       => $::platform::amqp::params::port,
       rabbit_userid     => $::platform::amqp::params::auth_user,
       rabbit_password   => $::platform::amqp::params::auth_password,