diff --git a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/alarm.pp b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/alarm.pp
index 6273aed1cb..a465ffb9cb 100644
--- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/alarm.pp
+++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/alarm.pp
@@ -20,6 +20,7 @@ class nfv::alarm (
   $fault_mgmt_service_type       = 'faultmanagement',
   $fault_mgmt_endpoint_type      = 'admin',
   $fault_mgmt_endpoint_disabled  = false,
+  $fault_management_pod_disabled      = true,
 ) {
 
   include nfv::params
@@ -27,6 +28,9 @@ class nfv::alarm (
   nfv_plugin_alarm_config {
     # File-Storage Information
     'File-Storage/file': value => $storage_file;
+    # This flag is used to disable raising alarm to containerized fm
+    # and will be removed in future.
+    'openstack/fault_management_pod_disabled': value => $fault_management_pod_disabled;
 
     # OpenStack Authentication Information
     'openstack/username': value => $openstack_username;
diff --git a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/event_log.pp b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/event_log.pp
index 9c15a4d948..f295ade904 100644
--- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/event_log.pp
+++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/event_log.pp
@@ -20,6 +20,7 @@ class nfv::event_log (
   $fault_mgmt_service_type       = 'faultmanagement',
   $fault_mgmt_endpoint_type      = 'admin',
   $fault_mgmt_endpoint_disabled  = false,
+  $fault_management_pod_disabled      = true,
 ) {
 
   include nfv::params
@@ -27,6 +28,9 @@ class nfv::event_log (
   nfv_plugin_event_log_config {
     # File-Storage Information
     'File-Storage/file': value => $storage_file;
+    # This flag is used to disable raising alarm to containerized fm
+    # and will be removed in future.
+    'openstack/fault_management_pod_disabled': value => $fault_management_pod_disabled;
 
     # OpenStack Authentication Information
     'openstack/username': value => $openstack_username;
diff --git a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp
index ae0211bc0a..fa299afa10 100644
--- a/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp
+++ b/puppet-modules-wrs/puppet-nfv/src/nfv/manifests/vim.pp
@@ -26,6 +26,7 @@ class nfv::vim (
   $network_plugin_disabled  = false,
   $guest_plugin_disabled    = false,
   $fault_mgmt_plugin_disabled = false,
+  $fault_management_pod_disabled = true,
   $vim_rpc_ip               = '127.0.0.1',
   $vim_rpc_port             = 4343,
   $vim_api_ip               = '0.0.0.0',
@@ -72,6 +73,9 @@ class nfv::vim (
     'nfvi/network_plugin_disabled': value => $network_plugin_disabled;
     'nfvi/guest_plugin_disabled': value => $guest_plugin_disabled;
     'nfvi/fault_mgmt_plugin_disabled': value => $fault_mgmt_plugin_disabled;
+    # This flag is used to disable raising alarm to containerized fm
+    # and will be removed in future.
+    'nfvi/fault_management_pod_disabled': value => $fault_management_pod_disabled;
 
     # INSTANCE CONFIGURATION
     'instance-configuration/max_live_migrate_wait_in_secs': value => $instance_max_live_migrate_wait_in_secs;
diff --git a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
index 723c3ba2df..679f8e5b12 100644
--- a/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
+++ b/sysinv/sysinv/sysinv/sysinv/puppet/nfv.py
@@ -78,6 +78,11 @@ class NfvPuppet(openstack.OpenstackBasePuppet):
             'nfv::vim::vim_webserver_ip': self._get_oam_address(),
             'nfv::vim::instance_single_hypervisor': single_hypervisor,
             'nfv::vim::sw_mgmt_single_controller': single_controller,
+            # This flag is used to disable raising alarm to containerized fm
+            # and will be removed in future.
+            'nfv::alarm::fault_management_pod_disabled': True,
+            'nfv::event_log::fault_management_pod_disabled': True,
+            'nfv::vim::fault_management_pod_disabled': True,
 
             'platform::nfv::params::service_create':
                 self._to_create_services(),