diff --git a/tripleoclient/export.py b/tripleoclient/export.py
index 181e9a2e7..41d095eb3 100644
--- a/tripleoclient/export.py
+++ b/tripleoclient/export.py
@@ -41,7 +41,7 @@ def export_passwords(swift, stack, excludes=True):
                   "file from swift: %s", str(e))
         sys.exit(1)
 
-    data = yaml.load(content)["passwords"]
+    data = yaml.safe_load(content)["passwords"]
     if excludes:
         excluded_passwords = []
         for k in data:
diff --git a/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py b/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py
index 142b1a353..7c2c1afc4 100644
--- a/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py
+++ b/tripleoclient/tests/v1/overcloud_ffwd_upgrade/test_overcloud_ffwd_upgrade.py
@@ -59,7 +59,7 @@ class TestFFWDUpgradePrepare(fakes.TestFFWDUpgradePrepare):
     @mock.patch('tripleoclient.workflows.package_update.update',
                 autospec=True)
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@@ -119,7 +119,7 @@ class TestFFWDUpgradePrepare(fakes.TestFFWDUpgradePrepare):
                 autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
                 '_deploy_tripleo_heat_templates', autospec=True)
diff --git a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
index 93b1b1833..c435fe574 100644
--- a/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
+++ b/tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
@@ -46,7 +46,7 @@ class TestOvercloudUpdatePrepare(fakes.TestOvercloudUpdatePrepare):
     @mock.patch('tripleoclient.workflows.package_update.update',
                 autospec=True)
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@@ -83,7 +83,7 @@ class TestOvercloudUpdatePrepare(fakes.TestOvercloudUpdatePrepare):
                 autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
                 '_deploy_tripleo_heat_templates', autospec=True)
diff --git a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
index e511ad4e9..e87fe92fb 100644
--- a/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
+++ b/tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
@@ -53,7 +53,7 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
     @mock.patch('tripleoclient.workflows.package_update.update',
                 autospec=True)
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@@ -118,7 +118,7 @@ class TestOvercloudUpgradePrepare(fakes.TestOvercloudUpgradePrepare):
                 autospec=True)
     @mock.patch('six.moves.builtins.open')
     @mock.patch('os.path.abspath')
-    @mock.patch('yaml.load')
+    @mock.patch('yaml.safe_load')
     @mock.patch('shutil.copytree', autospec=True)
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
                 '_deploy_tripleo_heat_templates', autospec=True)
diff --git a/tripleoclient/utils.py b/tripleoclient/utils.py
index ac4040627..066d3652a 100644
--- a/tripleoclient/utils.py
+++ b/tripleoclient/utils.py
@@ -2346,7 +2346,7 @@ def check_file_for_enabled_service(env_file):
     """
     if os.path.exists(env_file):
         with open(env_file, "r") as f:
-            content = yaml.load(f)
+            content = yaml.safe_load(f)
         deprecated_services_enabled = []
         for service in constants.DEPRECATED_SERVICES.keys():
             try: