diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index 035c96f0d..e625d4fd0 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -12,7 +12,8 @@
   :config
   (setq nxml-slash-auto-complete-flag t
         nxml-auto-insert-xml-declaration-flag t)
-  (set-company-backend! 'nxml-mode '(company-nxml company-yasnippet)))
+  (set-company-backend! 'nxml-mode '(company-nxml company-yasnippet))
+  (setq-hook! 'nxml-mode-hook tab-width nxml-child-indent))
 
 
 ;;
@@ -30,7 +31,8 @@
       "t" #'csv-transpose)
 
 (use-package! graphql-mode
-  :mode "\\.gql\\'")
+  :mode "\\.gql\\'"
+  :config (setq-hook! 'graphql-mode-hook tab-width graphql-indent-level))
 
 (use-package! json-mode
   :mode "\\.js\\(?:on\\|[hl]int\\(?:rc\\)?\\)\\'"
@@ -40,6 +42,9 @@
 (after! jsonnet-mode
   (set-electric! 'jsonnet-mode :chars '(?\n ?: ?{ ?})))
 
+(after! yaml-mode
+  (setq-hook! 'yaml-mode-hook tab-width yaml-indent-offset))
+
 
 ;;
 ;;; Frameworks