diff --git a/docker/go-1.12.0/Dockerfile b/docker/go-1.12.0/Dockerfile
new file mode 100644
index 0000000..f6457e7
--- /dev/null
+++ b/docker/go-1.12.0/Dockerfile
@@ -0,0 +1,10 @@
+FROM techknowlogick/xgo:base
+
+# Configure the root Go distribution and bootstrap based on it
+ENV GO_VERSION 1120
+
+RUN \
+  export ROOT_DIST=https://storage.googleapis.com/golang/go1.12.linux-amd64.tar.gz    && \
+  export ROOT_DIST_SHA=3ac1db65a6fa5c13f424b53ee181755429df0c33775733cede1e0d540440fd7b && \
+  \
+  $BOOTSTRAP_PURE
diff --git a/docker/go-1.12.x/Dockerfile b/docker/go-1.12.x/Dockerfile
new file mode 100644
index 0000000..b14f4dd
--- /dev/null
+++ b/docker/go-1.12.x/Dockerfile
@@ -0,0 +1 @@
+FROM techknowlogick/xgo:go-1.12.0
diff --git a/docker/go-latest/Dockerfile b/docker/go-latest/Dockerfile
index 2bb2024..4d20088 100644
--- a/docker/go-latest/Dockerfile
+++ b/docker/go-latest/Dockerfile
@@ -3,6 +3,4 @@
 #
 # Released under the MIT license.
 
-FROM techknowlogick/xgo:go-1.11.x
-
-MAINTAINER Péter Szilágyi <peterke@gmail.com>
+FROM techknowlogick/xgo:go-1.12.x