diff --git a/doc/examples/alpine.md b/doc/examples/alpine
similarity index 97%
rename from doc/examples/alpine.md
rename to doc/examples/alpine
index d4ac8fd..835d12c 100644
--- a/doc/examples/alpine.md
+++ b/doc/examples/alpine
@@ -1,6 +1,3 @@
-# Alpine Linux
-
-```yaml
 image:
   distribution: alpinelinux
   release: 3.7.0
@@ -57,4 +54,3 @@ packages:
     update: true
     install:
         - neovim
-```
diff --git a/doc/examples/archlinux.md b/doc/examples/archlinux
similarity index 97%
rename from doc/examples/archlinux.md
rename to doc/examples/archlinux
index 45cea46..b659a8e 100644
--- a/doc/examples/archlinux.md
+++ b/doc/examples/archlinux
@@ -1,6 +1,3 @@
-# Arch Linux
-
-```yaml
 image:
   distribution: archlinux
   release: 2018.03.01
@@ -59,4 +56,3 @@ packages:
   update: true
   install:
     - neovim
-```
diff --git a/doc/examples/centos.md b/doc/examples/centos
similarity index 98%
rename from doc/examples/centos.md
rename to doc/examples/centos
index a01bcc7..e6d69a8 100644
--- a/doc/examples/centos.md
+++ b/doc/examples/centos
@@ -1,6 +1,3 @@
-# CentOS
-
-```yaml
 image:
   distribution: centos
   release: 7
@@ -92,4 +89,3 @@ actions:
     action: |-
       #!/bin/sh
       rm -rf /var/cache/yum
-```
diff --git a/doc/examples/debian.md b/doc/examples/debian
similarity index 98%
rename from doc/examples/debian.md
rename to doc/examples/debian
index c361c08..b6de65e 100644
--- a/doc/examples/debian.md
+++ b/doc/examples/debian
@@ -1,6 +1,3 @@
-# Debian
-
-```yaml
 image:
   distribution: debian
   release: testing
@@ -59,4 +56,3 @@ packages:
 
 mappings:
   architecture_map: debian
-```
diff --git a/doc/examples/fedora.md b/doc/examples/fedora
similarity index 98%
rename from doc/examples/fedora.md
rename to doc/examples/fedora
index 67cb9bd..61f2c34 100644
--- a/doc/examples/fedora.md
+++ b/doc/examples/fedora
@@ -1,6 +1,3 @@
-# Fedora
-
-```yaml
 image:
   distribution: fedora
   release: 28
@@ -56,4 +53,3 @@ packages:
   install:
     - systemd
     - neovim
-```
diff --git a/doc/examples/ubuntu.md b/doc/examples/ubuntu
similarity index 70%
rename from doc/examples/ubuntu.md
rename to doc/examples/ubuntu
index 5d90889..e8b2b2d 100644
--- a/doc/examples/ubuntu.md
+++ b/doc/examples/ubuntu
@@ -1,7 +1,3 @@
-# Ubuntu
-## With debootstrap
-
-```yaml
 image:
   distribution: ubuntu
   release: artful
@@ -154,77 +150,3 @@ actions:
 
 mappings:
   architecture_map: debian
-```
-
-## With Ubuntu base image
-
-```yaml
-image:
-  distribution: ubuntu
-  release: artful
-  variant: default
-  description: Ubuntu {{ image.release }}
-  expiry: 30d
-  arch: amd64
-
-source:
-  downloader: ubuntu-http
-  url: http://cdimage.ubuntu.com/ubuntu-base
-  keys:
-    - 0x46181433FBB75451
-    - 0xD94AA3F0EFE21092
-
-targets:
-  lxc:
-    create-message: |
-        You just created an Ubuntu container (release={{ image.release }}, arch={{ image.architecture }}, variant={{ image.variant }})
-
-    config:
-      - type: all
-        before: 5
-        content: |-
-          lxc.include = LXC_TEMPLATE_CONFIG/ubuntu.common.conf
-
-      - type: user
-        before: 5
-        content: |-
-          lxc.include = LXC_TEMPLATE_CONFIG/ubuntu.userns.conf
-
-      - type: all
-        after: 4
-        content: |-
-          lxc.include = LXC_TEMPLATE_CONFIG/common.conf
-
-      - type: user
-        after: 4
-        content: |-
-          lxc.include = LXC_TEMPLATE_CONFIG/userns.conf
-
-      - type: all
-        content: |-
-          lxc.arch = {{ image.architecture_kernel }}
-
-files:
- - path: /etc/hostname
-   generator: hostname
-
- - path: /etc/hosts
-   generator: hosts
-
- - path: /etc/init/lxc-tty.conf
-   generator: upstart-tty
-   releases:
-    - precise
-    - trusty
-
-packages:
-  manager: apt
-
-  update: true
-  install:
-    - systemd
-    - neovim
-
-mappings:
-  architecture_map: debian
-```
diff --git a/doc/examples/ubuntu-with-base-image b/doc/examples/ubuntu-with-base-image
new file mode 100644
index 0000000..d357bc3
--- /dev/null
+++ b/doc/examples/ubuntu-with-base-image
@@ -0,0 +1,68 @@
+image:
+  distribution: ubuntu
+  release: artful
+  variant: default
+  description: Ubuntu {{ image.release }}
+  expiry: 30d
+  arch: amd64
+
+source:
+  downloader: ubuntu-http
+  url: http://cdimage.ubuntu.com/ubuntu-base
+  keys:
+    - 0x46181433FBB75451
+    - 0xD94AA3F0EFE21092
+
+targets:
+  lxc:
+    create-message: |
+        You just created an Ubuntu container (release={{ image.release }}, arch={{ image.architecture }}, variant={{ image.variant }})
+
+    config:
+      - type: all
+        before: 5
+        content: |-
+          lxc.include = LXC_TEMPLATE_CONFIG/ubuntu.common.conf
+
+      - type: user
+        before: 5
+        content: |-
+          lxc.include = LXC_TEMPLATE_CONFIG/ubuntu.userns.conf
+
+      - type: all
+        after: 4
+        content: |-
+          lxc.include = LXC_TEMPLATE_CONFIG/common.conf
+
+      - type: user
+        after: 4
+        content: |-
+          lxc.include = LXC_TEMPLATE_CONFIG/userns.conf
+
+      - type: all
+        content: |-
+          lxc.arch = {{ image.architecture_kernel }}
+
+files:
+ - path: /etc/hostname
+   generator: hostname
+
+ - path: /etc/hosts
+   generator: hosts
+
+ - path: /etc/init/lxc-tty.conf
+   generator: upstart-tty
+   releases:
+    - precise
+    - trusty
+
+packages:
+  manager: apt
+
+  update: true
+  install:
+    - systemd
+    - neovim
+
+mappings:
+  architecture_map: debian