diff --git a/lib/thwap-config.el b/lib/thwap-config.el
index 8266b54..a229ecc 100644
--- a/lib/thwap-config.el
+++ b/lib/thwap-config.el
@@ -142,6 +142,12 @@
 	:type 'boolean
 	:group 'thwap-config-group)
 
+;; Yaml toggle
+(defcustom thwap-dev-enable-yaml nil
+	"Whether or not to setup Yaml modes."
+	:type 'boolean
+	:group 'thwap-config-group)
+
 ;;
 ;; Org mode settings
 ;;
diff --git a/lib/thwap-yaml.el b/lib/thwap-yaml.el
index aec97be..7fbdc2d 100644
--- a/lib/thwap-yaml.el
+++ b/lib/thwap-yaml.el
@@ -1,5 +1,6 @@
-(use-package yaml-mode
-  :ensure t
-  :straight t)
+(when thwap-dev-enable-yaml
+	(use-package yaml-mode
+		:ensure t
+		:straight t))
 
 (provide 'thwap-yaml)