diff --git a/lib/ansible/runner/filter_plugins/core.py b/lib/ansible/runner/filter_plugins/core.py
index 51a1f827e5..484b059a55 100644
--- a/lib/ansible/runner/filter_plugins/core.py
+++ b/lib/ansible/runner/filter_plugins/core.py
@@ -26,6 +26,6 @@ class FilterModule(object):
             'to_json': json.dumps,
             'from_json': json.loads,
             'to_yaml': yaml.safe_dump,
-            'from_yaml': yaml.load,
+            'from_yaml': yaml.safe_load,
         }
     
diff --git a/lib/ansible/utils/module_docs.py b/lib/ansible/utils/module_docs.py
index e8e5541716..57d914cfbe 100755
--- a/lib/ansible/utils/module_docs.py
+++ b/lib/ansible/utils/module_docs.py
@@ -45,7 +45,7 @@ def get_docstring(filename, verbose=False):
         for child in M.body:
             if isinstance(child, ast.Assign):
                 if 'DOCUMENTATION' in (t.id for t in child.targets):
-                    doc = yaml.load(child.value.s)
+                    doc = yaml.safe_load(child.value.s)
                 if 'EXAMPLES' in (t.id for t in child.targets):
                     plainexamples = child.value.s[1:]  # Skip first empty line
     except:
diff --git a/library/git b/library/git
index 020306bd1f..d6307072b1 100644
--- a/library/git
+++ b/library/git
@@ -160,7 +160,7 @@ def get_head_branch(module, dest, remote):
     # Check if the .git is a file. If it is a file, it means that we are in a submodule structure.
     if os.path.isfile(repo_path):
         try:
-            gitdir = yaml.load(open(repo_path)).get('gitdir')
+            gitdir = yaml.safe_load(open(repo_path)).get('gitdir')
             # There is a posibility the .git file to have an absolute path.
             if os.path.isabs(gitdir):
                 repo_path = gitdir
diff --git a/plugins/inventory/yaml.py b/plugins/inventory/yaml.py
index 4971d5e468..c395a05a64 100755
--- a/plugins/inventory/yaml.py
+++ b/plugins/inventory/yaml.py
@@ -226,7 +226,7 @@ base_dir = os.path.dirname(os.path.realpath(__file__))
 hosts_file = os.path.join(base_dir, 'hosts.yml')
 
 with open(hosts_file) as f:
-    yaml_hosts = yaml.load( f.read() )
+    yaml_hosts = yaml.safe_load( f.read() )
 
 groups, all_hosts = parse_yaml(yaml_hosts)