diff --git a/packages/@vuepress/core/lib/app/style/config.styl b/packages/@vuepress/core/lib/app/style/config.styl
index 1653b37cfd6913e27f947a2d24e5fcf9204d8f7f..4d8c916ce63fd370fd4c50ab1fa5f10b72a8b493 100644
--- a/packages/@vuepress/core/lib/app/style/config.styl
+++ b/packages/@vuepress/core/lib/app/style/config.styl
@@ -17,6 +17,6 @@ $MQMobileNarrow = 419px
 
 // code
 $lineNumbersWrapperWidth = 3.5rem
-$codeLang = js ts html md vue css sass scss less stylus go java c sh yaml py
+$codeLang = js ts html md vue css sass scss less stylus go java c sh yaml py docker dockerfile makefile
 
 @import '~@temp/palette.styl'
diff --git a/packages/@vuepress/markdown/lib/highlight.js b/packages/@vuepress/markdown/lib/highlight.js
index dbb6437206a43ee650a4d8dddb3ac5e104ceff24..1d3e1489678a243b0ddd193d830fb4538621cca9 100644
--- a/packages/@vuepress/markdown/lib/highlight.js
+++ b/packages/@vuepress/markdown/lib/highlight.js
@@ -30,6 +30,12 @@ module.exports = (str, lang) => {
   if (lang === 'py') {
     lang = 'python'
   }
+  if (lang === 'sh') {
+    lang = 'bash'
+  }
+  if (lang === 'yml') {
+    lang = 'yaml'
+  }
   if (!prism.languages[lang]) {
     try {
       loadLanguages([lang])