diff --git a/Dockerfile b/Dockerfile
index 9e0ed5d..0eb6d1a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
-ARG version=2.5
+ARG version=2.6
 
 FROM minidocks/base:3.7 AS v2.4
 
-FROM minidocks/base AS v2.5
+FROM minidocks/base:3.10 AS v2.5
+
+FROM minidocks/base AS v2.6
 
 FROM v${version}
 LABEL maintainer="Martin Hasoň <martin.hason@gmail.com>"
diff --git a/README.md b/README.md
index 670d909..3737411 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,10 @@ It has an elegant syntax that is natural to read and easy to write.
 Tags
 ----
 
- Tag       | Size
- ---       | ----
- latest    | [![](https://images.microbadger.com/badges/image/minidocks/ruby.svg)](https://microbadger.com/images/minidocks/ruby)
- 2.5       | [![](https://images.microbadger.com/badges/image/minidocks/ruby:2.5.svg)](https://microbadger.com/images/minidocks/ruby:2.5)
- 2.4       | [![](https://images.microbadger.com/badges/image/minidocks/ruby:2.4.svg)](https://microbadger.com/images/minidocks/ruby:2.4)
+ Tag         | Size
+ ---         | ----
+ latest, 2.6 | [![](https://images.microbadger.com/badges/image/minidocks/ruby.svg)](https://microbadger.com/images/minidocks/ruby)
+ 2.6         | [![](https://images.microbadger.com/badges/image/minidocks/ruby:2.6.svg)](https://microbadger.com/images/minidocks/ruby:2.6)
+ 2.5         | [![](https://images.microbadger.com/badges/image/minidocks/ruby:2.5.svg)](https://microbadger.com/images/minidocks/ruby:2.5)
+ 2.4         | [![](https://images.microbadger.com/badges/image/minidocks/ruby:2.4.svg)](https://microbadger.com/images/minidocks/ruby:2.4)
 
diff --git a/build.sh b/build.sh
index 2793997..cb82758 100755
--- a/build.sh
+++ b/build.sh
@@ -5,7 +5,8 @@ image="${namespace:-minidocks}/ruby"
 versions="
 2.4;2.4
 2.5;2.5
-latest;2.5
+2.6;2.6
+latest;2.6
 "
 
 build() {