diff --git a/layouts/_default/list.markdown.md b/layouts/_default/list.markdown.md
index 4dfb7bad83..73a5872d9d 100644
--- a/layouts/_default/list.markdown.md
+++ b/layouts/_default/list.markdown.md
@@ -1,7 +1,5 @@
 {{ .Title }}
-
-{{ .RawContent }}
-
+{{ .RenderShortcodes }}
 {{ range .Pages }}
 - [{{ .Title }}](https://docs.docker.com{{ .RelPermalink }})
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/layouts/_default/single.markdown.md b/layouts/_default/single.markdown.md
index 91b4052d4e..9c5653e31d 100644
--- a/layouts/_default/single.markdown.md
+++ b/layouts/_default/single.markdown.md
@@ -1,3 +1,2 @@
 {{ .Title }}
-
-{{ .RawContent }}
\ No newline at end of file
+{{ .RenderShortcodes }}