diff --git a/_layouts/engine-api.html b/_layouts/engine-api.html
new file mode 100644
index 0000000000..36bfacaeeb
--- /dev/null
+++ b/_layouts/engine-api.html
@@ -0,0 +1,20 @@
+
+
+
+ Docker Engine API {{ page.api_version }} Reference
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/engine/api/v1.25/index.html b/engine/api/v1.25/index.html
deleted file mode 100644
index 2a76997bb3..0000000000
--- a/engine/api/v1.25/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: null
-redirect_from:
- - /engine/reference/api/docker_remote_api_v1.25/
----
-
-
-
- Docker Engine API v1.25 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.25/index.md b/engine/api/v1.25/index.md
new file mode 100644
index 0000000000..84c71ad1b2
--- /dev/null
+++ b/engine/api/v1.25/index.md
@@ -0,0 +1,6 @@
+---
+layout: engine-api
+api_version: v1.25
+redirect_from:
+ - /engine/reference/api/docker_remote_api_v1.25/
+---
diff --git a/engine/api/v1.26/index.html b/engine/api/v1.26/index.html
deleted file mode 100644
index f795611a7f..0000000000
--- a/engine/api/v1.26/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: null
-redirect_from:
- - /engine/reference/api/docker_remote_api_v1.26/
----
-
-
-
- Docker Engine API v1.26 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.26/index.md b/engine/api/v1.26/index.md
new file mode 100644
index 0000000000..ba0ccf7250
--- /dev/null
+++ b/engine/api/v1.26/index.md
@@ -0,0 +1,6 @@
+---
+layout: engine-api
+api_version: v1.26
+redirect_from:
+ - /engine/reference/api/docker_remote_api_v1.26/
+---
diff --git a/engine/api/v1.27/index.html b/engine/api/v1.27/index.html
deleted file mode 100644
index fba7300f82..0000000000
--- a/engine/api/v1.27/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: null
-redirect_from:
- - /engine/reference/api/docker_remote_api_v1.27/
----
-
-
-
- Docker Engine API v1.27 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.27/index.md b/engine/api/v1.27/index.md
new file mode 100644
index 0000000000..4b4732b654
--- /dev/null
+++ b/engine/api/v1.27/index.md
@@ -0,0 +1,6 @@
+---
+layout: engine-api
+api_version: v1.27
+redirect_from:
+ - /engine/reference/api/docker_remote_api_v1.27/
+---
diff --git a/engine/api/v1.28/index.html b/engine/api/v1.28/index.html
deleted file mode 100644
index 426f059738..0000000000
--- a/engine/api/v1.28/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
----
-layout: null
-redirect_from:
- - /engine/reference/api/docker_remote_api_v1.28/
----
-
-
-
- Docker Engine API v1.28 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.28/index.md b/engine/api/v1.28/index.md
new file mode 100644
index 0000000000..f646700da0
--- /dev/null
+++ b/engine/api/v1.28/index.md
@@ -0,0 +1,6 @@
+---
+layout: engine-api
+api_version: v1.28
+redirect_from:
+ - /engine/reference/api/docker_remote_api_v1.28/
+---
diff --git a/engine/api/v1.29/index.html b/engine/api/v1.29/index.html
deleted file mode 100644
index 06f8b574ff..0000000000
--- a/engine/api/v1.29/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.29 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.29/index.md b/engine/api/v1.29/index.md
new file mode 100644
index 0000000000..4cce1c4efa
--- /dev/null
+++ b/engine/api/v1.29/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.29
+---
diff --git a/engine/api/v1.30/index.html b/engine/api/v1.30/index.html
deleted file mode 100644
index 13a0370896..0000000000
--- a/engine/api/v1.30/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.30 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.30/index.md b/engine/api/v1.30/index.md
new file mode 100644
index 0000000000..cfdc69b197
--- /dev/null
+++ b/engine/api/v1.30/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.30
+---
diff --git a/engine/api/v1.31/index.html b/engine/api/v1.31/index.html
deleted file mode 100644
index 030f788aa2..0000000000
--- a/engine/api/v1.31/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.31 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.31/index.md b/engine/api/v1.31/index.md
new file mode 100644
index 0000000000..9a52d7d53d
--- /dev/null
+++ b/engine/api/v1.31/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.31
+---
diff --git a/engine/api/v1.32/index.html b/engine/api/v1.32/index.html
deleted file mode 100644
index 37a7e84e03..0000000000
--- a/engine/api/v1.32/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.32 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.32/index.md b/engine/api/v1.32/index.md
new file mode 100644
index 0000000000..56bd044592
--- /dev/null
+++ b/engine/api/v1.32/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.32
+---
diff --git a/engine/api/v1.33/index.html b/engine/api/v1.33/index.html
deleted file mode 100644
index c435851872..0000000000
--- a/engine/api/v1.33/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.33 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.33/index.md b/engine/api/v1.33/index.md
new file mode 100644
index 0000000000..7a63aa05ea
--- /dev/null
+++ b/engine/api/v1.33/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.33
+---
diff --git a/engine/api/v1.34/index.html b/engine/api/v1.34/index.html
deleted file mode 100644
index 0e5930216b..0000000000
--- a/engine/api/v1.34/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.34 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.34/index.md b/engine/api/v1.34/index.md
new file mode 100644
index 0000000000..7701eaee0d
--- /dev/null
+++ b/engine/api/v1.34/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.34
+---
diff --git a/engine/api/v1.35/index.html b/engine/api/v1.35/index.html
deleted file mode 100644
index 0a671b200a..0000000000
--- a/engine/api/v1.35/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.35 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.35/index.md b/engine/api/v1.35/index.md
new file mode 100644
index 0000000000..93a64230ec
--- /dev/null
+++ b/engine/api/v1.35/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.35
+---
diff --git a/engine/api/v1.36/index.html b/engine/api/v1.36/index.html
deleted file mode 100644
index d5bbc359dc..0000000000
--- a/engine/api/v1.36/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.36 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.36/index.md b/engine/api/v1.36/index.md
new file mode 100644
index 0000000000..c214e60f5e
--- /dev/null
+++ b/engine/api/v1.36/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.36
+---
diff --git a/engine/api/v1.37/index.html b/engine/api/v1.37/index.html
deleted file mode 100644
index 5b13cdc2d3..0000000000
--- a/engine/api/v1.37/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.37 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.37/index.md b/engine/api/v1.37/index.md
new file mode 100644
index 0000000000..645da45866
--- /dev/null
+++ b/engine/api/v1.37/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.37
+---
diff --git a/engine/api/v1.38/index.html b/engine/api/v1.38/index.html
deleted file mode 100644
index 8c808643f1..0000000000
--- a/engine/api/v1.38/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.38 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.38/index.md b/engine/api/v1.38/index.md
new file mode 100644
index 0000000000..4dae9929ca
--- /dev/null
+++ b/engine/api/v1.38/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.38
+---
diff --git a/engine/api/v1.39/index.html b/engine/api/v1.39/index.html
deleted file mode 100644
index 343d3c82c5..0000000000
--- a/engine/api/v1.39/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.39 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.39/index.md b/engine/api/v1.39/index.md
new file mode 100644
index 0000000000..cd6de9ce36
--- /dev/null
+++ b/engine/api/v1.39/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.39
+---
diff --git a/engine/api/v1.40/index.html b/engine/api/v1.40/index.html
deleted file mode 100644
index dd9d71232c..0000000000
--- a/engine/api/v1.40/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
----
-layout: null
----
-
-
-
- Docker Engine API v1.40 Reference
-
-
-
-
-
-
-
-
-
-
-
diff --git a/engine/api/v1.40/index.md b/engine/api/v1.40/index.md
new file mode 100644
index 0000000000..e360bb968e
--- /dev/null
+++ b/engine/api/v1.40/index.md
@@ -0,0 +1,4 @@
+---
+layout: engine-api
+api_version: v1.40
+---