diff --git a/bin/generate_inventory b/bin/generate_inventory
index b56d22e..880777c 100755
--- a/bin/generate_inventory
+++ b/bin/generate_inventory
@@ -75,7 +75,7 @@
         # Get the yaml dictionary data
         print_timen("Loading " + yaml_file_path)
         f = open(yaml_file_path)
-        yaml_data = yaml.load(f)
+        yaml_data = yaml.safe_load(f)
         f.close()
         for item in range(0, len(yaml_data['properties'])):
             tmp_data = yaml_data['properties'][item]['name']
diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index f6a5a9c..c09a71a 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -174,7 +174,7 @@
             # Load default or user define YAML configuration file.
             with open(self.ffdc_config, 'r') as file:
                 try:
-                    self.ffdc_actions = yaml.load(file, Loader=yaml.FullLoader)
+                    self.ffdc_actions = yaml.load(file, Loader=yaml.SafeLoader)
                 except yaml.YAMLError as e:
                     self.logger.error(e)
                     sys.exit(-1)
@@ -874,7 +874,7 @@
             if self.econfig:
                 with open(self.econfig, 'r') as file:
                     try:
-                        tmp_env_dict = yaml.load(file, Loader=yaml.FullLoader)
+                        tmp_env_dict = yaml.load(file, Loader=yaml.SafeLoader)
                     except yaml.YAMLError as e:
                         self.logger.error(e)
                         sys.exit(-1)