diff --git a/n2vc/k8s_helm_conn.py b/n2vc/k8s_helm_conn.py
index cd15d73..4e6c4c5 100644
--- a/n2vc/k8s_helm_conn.py
+++ b/n2vc/k8s_helm_conn.py
@@ -894,7 +894,7 @@
             for key in params:
                 value = params.get(key)
                 if '!!yaml' in str(value):
-                    value = yaml.load(value[7:])
+                    value = yaml.load(value[7:], Loader=yaml.SafeLoader)
                 params2[key] = value
 
             values_file = get_random_number() + '.yaml'
diff --git a/tests/base.py b/tests/base.py
index c7dad6d..e40338f 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -108,7 +108,7 @@
 def get_descriptor(descriptor):
     desc = None
     try:
-        tmp = yaml.load(descriptor)
+        tmp = yaml.load(descriptor, Loader=yaml.Loader)
 
         # Remove the envelope
         root = list(tmp.keys())[0]