diff --git a/Dockerfile b/Dockerfile
index 785872a..8a37a96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM lsiobase/alpine:3.7
+FROM lsiobase/alpine:3.8
 
 # set version label
 ARG BUILD_DATE
@@ -66,8 +66,17 @@ RUN \
  make && \
  make install && \
  echo "**** compile minetestserver ****" && \
- git clone --depth 1 https://github.com/minetest/minetest.git /tmp/minetest && \
- cp /tmp/minetest//minetest.conf.example /defaults/minetest.conf && \
+ mkdir -p \
+	/tmp/minetest && \
+ MINETEST_TAG=$(curl -sX GET "https://api.github.com/repos/minetest/minetest/releases/latest" \
+	| awk '/tag_name/{print $4;exit}' FS='[""]') && \
+ curl -o \
+ /tmp/minetest-src.tar.gz -L \
+	"https://github.com/minetest/minetest/archive/${MINETEST_TAG}.tar.gz" && \
+ tar xf \
+ /tmp/minetest-src.tar.gz -C \
+	/tmp/minetest --strip-components=1 && \
+ cp /tmp/minetest/minetest.conf.example /defaults/minetest.conf && \
  cd /tmp/minetest && \
  cmake . \
 	-DBUILD_CLIENT=0 \
@@ -89,8 +98,15 @@ RUN \
  mkdir -p \
 	/defaults/games && \
  cp -pr  /usr/share/minetest/games/* /defaults/games/ && \
- echo "**** fetch additional game from git ****" && \
- git clone --depth 1 https://github.com/minetest/minetest_game.git /defaults/games/minetest && \
+ echo "**** fetch additional game ****" && \
+ mkdir -p \
+	/defaults/games/minetest && \
+ curl -o \
+ /tmp/minetest-game.tar.gz -L \
+	"https://github.com/minetest/minetest_game/archive/${MINETEST_TAG%.*}.tar.gz" && \
+ tar xf \
+ /tmp/minetest-game.tar.gz -C \
+	/defaults/games/minetest --strip-components=1 && \
  echo "**** cleanup ****" && \
  apk del --purge \
 	build-dependencies && \
diff --git a/README.md b/README.md
index 09c567b..5c50ecd 100644
--- a/README.md
+++ b/README.md
@@ -89,6 +89,7 @@ You can find the world maps, mods folder and config files in /config/.minetest.
 
 ## Versions
 
++ **08.08.18:** Rebase to alpine 3.8, build from latest release tag instead of master.
 + **03.01.18:** Deprecate cpu_core routine lack of scaling.
 + **08.12.17:** Rebase to alpine 3.7.
 + **30.11.17:** Use cpu core counting routine to speed up build time.