diff --git a/forward_engineering/helpers/generateModelScript.js b/forward_engineering/helpers/generateModelScript.js
index f58c67e..a69f885 100644
--- a/forward_engineering/helpers/generateModelScript.js
+++ b/forward_engineering/helpers/generateModelScript.js
@@ -126,7 +126,7 @@ function generateModelScript(data, logger, cb) {
 
 		switch (data.targetScriptOptions.format) {
 			case 'yaml': {
-				const schema = yaml.safeDump(resultSchema, { skipInvalid: true });
+				const schema = yaml.dump(resultSchema, { skipInvalid: true });
 				const schemaWithComments = addCommentsSigns(schema, 'yaml');
 				cb(null, schemaWithComments);
 				break;
diff --git a/forward_engineering/helpers/validation/validate.js b/forward_engineering/helpers/validation/validate.js
index ead9923..d011881 100644
--- a/forward_engineering/helpers/validation/validate.js
+++ b/forward_engineering/helpers/validation/validate.js
@@ -12,7 +12,7 @@ function validate(data, logger, cb) {
 
 		switch (targetScriptOptions.format) {
 			case 'yaml':
-				parsedScript = yaml.safeLoad(filteredScript);
+				parsedScript = yaml.load(filteredScript);
 				break;
 			case 'json':
 			default: