diff --git a/core/core-file-templates.el b/core/core-file-templates.el
index 6cd74c6a1..38b6390b8 100644
--- a/core/core-file-templates.el
+++ b/core/core-file-templates.el
@@ -22,6 +22,8 @@
   (mapc 'auto-insert-template
         `(;; General
           ("/\\.gitignore$"                  "__"               gitignore-mode)
+          ("/Dockerfile$"                    "__"               dockerfile-mode)
+          ("/docker-compose.yml$"            "__"               yaml-mode)
 
           ;; C/C++
           ("/Makefile$"                      "__"               makefile-gmake-mode)