diff --git a/encoding/encoding.go b/encoding/encoding.go
index 47e1c270..b0efd779 100644
--- a/encoding/encoding.go
+++ b/encoding/encoding.go
@@ -1,6 +1,7 @@
 package encoding
 
 import (
+	"bytes"
 	"encoding/json"
 
 	"github.com/layer5io/meshkit/utils"
@@ -59,12 +60,16 @@ func unmarshalJSON(data []byte, result interface{}) error {
 }
 
 func Marshal(in interface{}) ([]byte, error) {
-	result, err := json.Marshal(in)
+	result, err := json.MarshalIndent(in, "", "  ")
 	if err != nil {
-		result, err = yaml.Marshal(in)
+		var buf bytes.Buffer
+		enc := yaml.NewEncoder(&buf)
+		enc.SetIndent(2)
+		err = enc.Encode(in)
 		if err != nil {
 			return nil, utils.ErrMarshal(err)
 		}
+		result = buf.Bytes()
 	}
 
 	return result, nil
diff --git a/files/sanitization.go b/files/sanitization.go
index 8116852a..33ff6d44 100644
--- a/files/sanitization.go
+++ b/files/sanitization.go
@@ -34,6 +34,7 @@ var ValidIacExtensions = map[string]bool{
 	".tar.tgz": true,
 	".zip":     true,
 	".gz":      true,
+	".tgz":     true,
 }
 
 func SanitizeFile(data []byte, fileName string, tempDir string, validExts map[string]bool) (SanitizedFile, error) {
@@ -44,7 +45,6 @@ func SanitizeFile(data []byte, fileName string, tempDir string, validExts map[st
 	if !validExts[ext] && !validExts[filepath.Ext(strings.TrimSuffix(fileName, ".gz"))] {
 		return SanitizedFile{}, ErrUnsupportedExtension(fileName, ext, validExts)
 	}
-
 	switch ext {
 
 	case ".yml", ".yaml":