diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
index d3caa319fafb..55427b87b096 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerDataYaml.java
@@ -52,7 +52,7 @@
 import org.slf4j.LoggerFactory;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.AbstractConstruct;
-import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.constructor.SafeConstructor;
 import org.yaml.snakeyaml.introspector.BeanAccess;
 import org.yaml.snakeyaml.introspector.Property;
 import org.yaml.snakeyaml.introspector.PropertyUtils;
@@ -160,7 +160,7 @@ public static ContainerData readContainer(InputStream input)
         KeyValueContainerData.getYamlFields());
     representer.setPropertyUtils(propertyUtils);
 
-    Constructor containerDataConstructor = new ContainerDataConstructor();
+    SafeConstructor containerDataConstructor = new ContainerDataConstructor();
 
     Yaml yaml = new Yaml(containerDataConstructor, representer);
     yaml.setBeanAccess(BeanAccess.FIELD);
@@ -200,7 +200,7 @@ public static Yaml getYamlForContainerType(ContainerType containerType,
           KeyValueContainerData.class,
           KEYVALUE_YAML_TAG);
 
-      Constructor keyValueDataConstructor = new ContainerDataConstructor();
+      SafeConstructor keyValueDataConstructor = new ContainerDataConstructor();
 
       return new Yaml(keyValueDataConstructor, representer);
     }
@@ -255,7 +255,7 @@ protected NodeTuple representJavaBeanProperty(
   /**
    * Constructor class for KeyValueData, which will be used by Yaml.
    */
-  private static class ContainerDataConstructor extends Constructor {
+  private static class ContainerDataConstructor extends SafeConstructor {
     ContainerDataConstructor() {
       //Adding our own specific constructors for tags.
       // When a new Container type is added, we need to add yamlConstructor