diff --git a/cloudinit/user_data.py b/cloudinit/user_data.py
index 6f41b03a19b..416f5321c49 100644
--- a/cloudinit/user_data.py
+++ b/cloudinit/user_data.py
@@ -30,7 +30,7 @@
 CONTENT_TYPE = 'Content-Type'
 
 # Various special content types that cause special actions
-TYPE_NEEDED = ["text/plain", "text/x-not-multipart"]
+TYPE_NEEDED = ["text/plain", "text/x-not-multipart", "text/x-shellscript", "text/x-yaml"]
 INCLUDE_TYPES = ['text/x-include-url', 'text/x-include-once-url']
 ARCHIVE_TYPES = ["text/cloud-config-archive"]
 UNDEF_TYPE = "text/plain"