diff --git a/nornir/core/configuration.py b/nornir/core/configuration.py
index a691343c..aa4d5f74 100644
--- a/nornir/core/configuration.py
+++ b/nornir/core/configuration.py
@@ -2,7 +2,7 @@
 import os
 
 
-import yaml
+import ruamel.yaml
 
 
 CONF = {
@@ -93,7 +93,7 @@ class Config(object):
     def __init__(self, config_file=None, **kwargs):
         if config_file:
             with open(config_file, "r") as f:
-                data = yaml.load(f.read()) or {}
+                data = ruamel.yaml.safe_load(f.read()) or {}
         else:
             data = {}
 
diff --git a/nornir/plugins/inventory/simple.py b/nornir/plugins/inventory/simple.py
index cf77c98a..03b87039 100644
--- a/nornir/plugins/inventory/simple.py
+++ b/nornir/plugins/inventory/simple.py
@@ -4,7 +4,7 @@
 
 from nornir.core.inventory import Inventory
 
-import yaml
+import ruamel.yaml
 
 
 class SimpleInventory(Inventory):
@@ -118,12 +118,12 @@ class SimpleInventory(Inventory):
 
     def __init__(self, host_file="hosts.yaml", group_file="groups.yaml", **kwargs):
         with open(host_file, "r") as f:
-            hosts = yaml.load(f.read())
+            hosts = ruamel.yaml.safe_load(f.read())
 
         if group_file:
             if os.path.exists(group_file):
                 with open(group_file, "r") as f:
-                    groups = yaml.load(f.read())
+                    groups = ruamel.yaml.safe_load(f.read())
             else:
                 logging.warning("{}: doesn't exist".format(group_file))
                 groups = {}
diff --git a/requirements.txt b/requirements.txt
index 12396b0b..335ed1cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,4 @@
 colorama
-pyyaml
 jinja2
 napalm>=2.3.0
 netmiko>=2.1.1
diff --git a/tests/core/test_configuration/config.yaml b/tests/core/test_configuration/config.yaml
index 164c4f87..e66cb710 100644
--- a/tests/core/test_configuration/config.yaml
+++ b/tests/core/test_configuration/config.yaml
@@ -1,6 +1,6 @@
 ---
 num_workers: 10
-raise_on_error: no
+raise_on_error: false
 user_defined: "asdasd"
 my_root:
     user_defined: "i am nested"