diff --git a/arangodb/README.md b/arangodb/README.md
index b66d5cc81..82b2139f0 100644
--- a/arangodb/README.md
+++ b/arangodb/README.md
@@ -17,7 +17,7 @@ WARNING:
 # Supported tags and respective `Dockerfile` links
 
 -	[`2.8`, `2.8.11` (*jessie/2.8.11/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/05366cb4c6a6aab8e1ff9ca74c81b09d9a57b5b5/jessie/2.8.11/Dockerfile)
--	[`3.1`, `3.1.21`, `latest` (*jessie/3.1.21/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/3f34ce3522ece639f0d01968934f0a191a7ba2a4/jessie/3.1.21/Dockerfile)
+-	[`3.1`, `3.1.22`, `latest` (*jessie/3.1.22/Dockerfile*)](https://github.com/arangodb/arangodb-docker/blob/44199413db34d7eca3b28a6e7cf1ecd82885706e/jessie/3.1.22/Dockerfile)
 
 # Quick reference
 
diff --git a/groovy/README.md b/groovy/README.md
index 44d28aa71..c5dd85bea 100644
--- a/groovy/README.md
+++ b/groovy/README.md
@@ -16,25 +16,26 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`2.4.11-jdk7`, `2.4-jdk7`, `jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jdk7/Dockerfile)
--	[`2.4.11-jre7`, `2.4-jre7`, `jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jre7/Dockerfile)
--	[`2.4.11-jdk7-alpine`, `2.4-jdk7-alpine`, `jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jdk7-alpine/Dockerfile)
--	[`2.4.11-jre7-alpine`, `2.4-jre7-alpine`, `jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jre7-alpine/Dockerfile)
--	[`2.4.11-jdk8`, `2.4-jdk8`, `jdk8`, `2.4.11-jdk`, `2.4-jdk`, `jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jdk8/Dockerfile)
--	[`2.4.11-jre8`, `2.4-jre8`, `jre8`, `2.4.11-jre`, `2.4-jre`, `jre`, `2.4.11`, `2.4`, `latest` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jre8/Dockerfile)
--	[`2.4.11-jdk8-alpine`, `2.4-jdk8-alpine`, `jdk8-alpine`, `2.4.11-jdk-alpine`, `2.4-jdk-alpine`, `jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jdk8-alpine/Dockerfile)
--	[`2.4.11-jre8-alpine`, `2.4-jre8-alpine`, `jre8-alpine`, `2.4.11-jre-alpine`, `2.4-jre-alpine`, `jre-alpine`, `2.4.11-alpine`, `2.4-alpine`, `alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jre8-alpine/Dockerfile)
--	[`2.4.11-jdk9`, `2.4-jdk9`, `jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jdk9/Dockerfile)
--	[`2.4.11-jre9`, `2.4-jre9`, `jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/2ddaa9372c9d8c80fd76e0de808be030cd4ba380/jre9/Dockerfile)
--	[`2.5.0-alpha-1-jdk7`, `2.5-jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jdk7/Dockerfile)
--	[`2.5.0-alpha-1-jre7`, `2.5-jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jre7/Dockerfile)
--	[`2.5.0-alpha-1-jdk7-alpine`, `2.5-jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jdk7-alpine/Dockerfile)
--	[`2.5.0-alpha-1-jre7-alpine`, `2.5-jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jre7-alpine/Dockerfile)
--	[`2.5.0-alpha-1-jdk8`, `2.5-jdk8`, `2.5.0-alpha-1-jdk`, `2.5-jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jdk8/Dockerfile)
--	[`2.5.0-alpha-1-jre8`, `2.5-jre8`, `2.5.0-alpha-1-jre`, `2.5-jre`, `2.5.0-alpha-1`, `2.5` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jre8/Dockerfile)
--	[`2.5.0-alpha-1-jdk8-alpine`, `2.5-jdk8-alpine`, `2.5.0-alpha-1-jdk-alpine`, `2.5-jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jdk8-alpine/Dockerfile)
--	[`2.5.0-alpha-1-jre8-alpine`, `2.5-jre8-alpine`, `2.5.0-alpha-1-jre-alpine`, `2.5-jre-alpine`, `2.5.0-alpha-1-alpine`, `2.5-alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jre8-alpine/Dockerfile)
--	[`2.5.0-alpha-1-jre9`, `2.5-jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/fbf90de5f7f6f527764db38a5c6152a9139ed323/jre9/Dockerfile)
+-	[`2.4.11-jdk7`, `2.4-jdk7`, `jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk7/Dockerfile)
+-	[`2.4.11-jre7`, `2.4-jre7`, `jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre7/Dockerfile)
+-	[`2.4.11-jdk7-alpine`, `2.4-jdk7-alpine`, `jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk7-alpine/Dockerfile)
+-	[`2.4.11-jre7-alpine`, `2.4-jre7-alpine`, `jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre7-alpine/Dockerfile)
+-	[`2.4.11-jdk8`, `2.4-jdk8`, `jdk8`, `2.4.11-jdk`, `2.4-jdk`, `jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk8/Dockerfile)
+-	[`2.4.11-jre8`, `2.4-jre8`, `jre8`, `2.4.11-jre`, `2.4-jre`, `jre`, `2.4.11`, `2.4`, `latest` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre8/Dockerfile)
+-	[`2.4.11-jdk8-alpine`, `2.4-jdk8-alpine`, `jdk8-alpine`, `2.4.11-jdk-alpine`, `2.4-jdk-alpine`, `jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk8-alpine/Dockerfile)
+-	[`2.4.11-jre8-alpine`, `2.4-jre8-alpine`, `jre8-alpine`, `2.4.11-jre-alpine`, `2.4-jre-alpine`, `jre-alpine`, `2.4.11-alpine`, `2.4-alpine`, `alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre8-alpine/Dockerfile)
+-	[`2.4.11-jdk9`, `2.4-jdk9`, `jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jdk9/Dockerfile)
+-	[`2.4.11-jre9`, `2.4-jre9`, `jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/432bf2a5deadfcfd03934e697c133f3b9f4aa08e/jre9/Dockerfile)
+-	[`2.5.0-beta-1-jdk7`, `2.5-jdk7` (*jdk7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk7/Dockerfile)
+-	[`2.5.0-beta-1-jre7`, `2.5-jre7` (*jre7/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre7/Dockerfile)
+-	[`2.5.0-beta-1-jdk7-alpine`, `2.5-jdk7-alpine` (*jdk7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk7-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jre7-alpine`, `2.5-jre7-alpine` (*jre7-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre7-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jdk8`, `2.5-jdk8`, `2.5.0-beta-1-jdk`, `2.5-jdk` (*jdk8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk8/Dockerfile)
+-	[`2.5.0-beta-1-jre8`, `2.5-jre8`, `2.5.0-beta-1-jre`, `2.5-jre`, `2.5.0-beta-1`, `2.5` (*jre8/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre8/Dockerfile)
+-	[`2.5.0-beta-1-jdk8-alpine`, `2.5-jdk8-alpine`, `2.5.0-beta-1-jdk-alpine`, `2.5-jdk-alpine` (*jdk8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk8-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jre8-alpine`, `2.5-jre8-alpine`, `2.5.0-beta-1-jre-alpine`, `2.5-jre-alpine`, `2.5.0-beta-1-alpine`, `2.5-alpine` (*jre8-alpine/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre8-alpine/Dockerfile)
+-	[`2.5.0-beta-1-jdk9`, `2.5-jdk9` (*jdk9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jdk9/Dockerfile)
+-	[`2.5.0-beta-1-jre9`, `2.5-jre9` (*jre9/Dockerfile*)](https://github.com/groovy/docker-groovy/blob/452edc68dca2ed0100fee8c7f9c1007cf088b645/jre9/Dockerfile)
 
 # Quick reference
 
diff --git a/rapidoid/README.md b/rapidoid/README.md
index 8d18974d8..bb08c9ea1 100644
--- a/rapidoid/README.md
+++ b/rapidoid/README.md
@@ -16,7 +16,7 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`5.3.4`, `5.3`, `5`, `latest` (*Dockerfile*)](https://github.com/rapidoid/docker-rapidoid/blob/7d2e37df8a87985f267aa4e77f4f15744c411d62/Dockerfile)
+-	[`5.3.5`, `5.3`, `5`, `latest` (*Dockerfile*)](https://github.com/rapidoid/docker-rapidoid/blob/7a40ffa3a8963fb77514a92e6ab7d25802c0e431/Dockerfile)
 
 # Quick reference
 
diff --git a/solr/README.md b/solr/README.md
index 7bbce7399..15bb0b266 100644
--- a/solr/README.md
+++ b/solr/README.md
@@ -16,14 +16,16 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`5.5.4`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/5.5/Dockerfile)
--	[`5.5.4-alpine`, `5.5-alpine`, `5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/5.5/alpine/Dockerfile)
--	[`6.3.0`, `6.3` (*6.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/6.3/Dockerfile)
--	[`6.3.0-alpine`, `6.3-alpine` (*6.3/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/6.3/alpine/Dockerfile)
--	[`6.4.2`, `6.4` (*6.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/6.4/Dockerfile)
--	[`6.4.2-alpine`, `6.4-alpine` (*6.4/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/1ccf51aaeef0636445f670d9fd083730d4a6e9c1/6.4/alpine/Dockerfile)
--	[`6.5.1`, `6.5` (*6.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/9a5abca27d60292ce0dc6dcb41bb3d6fed5c54dc/6.5/Dockerfile)
--	[`6.5.1-alpine`, `6.5-alpine` (*6.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/9a5abca27d60292ce0dc6dcb41bb3d6fed5c54dc/6.5/alpine/Dockerfile)
+-	[`5.5.4`, `5.5`, `5` (*5.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/5.5/Dockerfile)
+-	[`5.5.4-alpine`, `5.5-alpine`, `5-alpine` (*5.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/5.5/alpine/Dockerfile)
+-	[`6.3.0`, `6.3` (*6.3/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.3/Dockerfile)
+-	[`6.3.0-alpine`, `6.3-alpine` (*6.3/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.3/alpine/Dockerfile)
+-	[`6.4.2`, `6.4` (*6.4/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.4/Dockerfile)
+-	[`6.4.2-alpine`, `6.4-alpine` (*6.4/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.4/alpine/Dockerfile)
+-	[`6.5.1`, `6.5` (*6.5/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.5/Dockerfile)
+-	[`6.5.1-alpine`, `6.5-alpine` (*6.5/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/f02cef1654e7c5cdd46411b6dbe351e7fcb6422c/6.5/alpine/Dockerfile)
+-	[`6.6.0`, `6.6`, `6`, `latest` (*6.6/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/c61a0c9b012c7313c2b5d0d97ddc06693270b734/6.6/Dockerfile)
+-	[`6.6.0-alpine`, `6.6-alpine`, `6-alpine`, `alpine` (*6.6/alpine/Dockerfile*)](https://github.com/docker-solr/docker-solr/blob/c61a0c9b012c7313c2b5d0d97ddc06693270b734/6.6/alpine/Dockerfile)
 
 # Quick reference
 
@@ -228,6 +230,22 @@ This repository is available on [github.com/docker-solr/docker-solr](https://git
 
 This repository is based on (and replaces) `makuk66/docker-solr`, and has been sponsored by [Lucidworks](http://www.lucidworks.com/).
 
+# Image Variants
+
+The `solr` images come in many flavors, each designed for a specific use case.
+
+## `solr:<version>`
+
+This is the defacto image. If you are unsure about what your needs are, you probably want to use this one. It is designed to be used both as a throw away container (mount your source code and start the container to start your app), as well as the base to build other images off of.
+
+## `solr:alpine`
+
+This image is based on the popular [Alpine Linux project](http://alpinelinux.org), available in [the `alpine` official image](https://hub.docker.com/_/alpine). Alpine Linux is much smaller than most distribution base images (~5MB), and thus leads to much slimmer images in general.
+
+This variant is highly recommended when final image size being as small as possible is desired. The main caveat to note is that it does use [musl libc](http://www.musl-libc.org) instead of [glibc and friends](http://www.etalabs.net/compare_libcs.html), so certain software might run into issues depending on the depth of their libc requirements. However, most software doesn't have an issue with this, so this variant is usually a very safe choice. See [this Hacker News comment thread](https://news.ycombinator.com/item?id=10782897) for more discussion of the issues that might arise and some pro/con comparisons of using Alpine-based images.
+
+To minimize image size, it's uncommon for additional related tools (such as `git` or `bash`) to be included in Alpine-based images. Using this image as a base, add the things you need in your own Dockerfile (see the [`alpine` image description](https://hub.docker.com/_/alpine/) for examples of how to install packages if you are unfamiliar).
+
 # License
 
 Solr is licensed under the [Apache License, Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).