diff --git a/geissonator/format-yaml b/geissonator/format-yaml
new file mode 100644
index 0000000..2ad8ddc
--- /dev/null
+++ b/geissonator/format-yaml
@@ -0,0 +1,16 @@
+#!/usr/bin/python3
+
+# Copyright 2019 IBM Corp.
+
+import yaml
+from argparse import ArgumentParser
+
+if __name__ == '__main__':
+    # A simple program to ensure proper indents of input yaml file
+    parser = ArgumentParser(description="YAML formatter")
+    parser.add_argument('-f', '--file', dest='file_yaml',
+                        help='yaml file to format')
+    args = parser.parse_args()
+
+    print(yaml.dump(yaml.load(open(args.file_yaml),
+                              Loader=yaml.FullLoader), indent=4))