diff --git a/alpine/README.md b/alpine/README.md
index 6260453de..472bc57d3 100644
--- a/alpine/README.md
+++ b/alpine/README.md
@@ -74,14 +74,14 @@ ENTRYPOINT ["mysql"]
 This example has a virtual image size of only 36.8MB. Compare that to our good friend Ubuntu:
 
 ```dockerfile
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 RUN apt-get update \
     && apt-get install -y --no-install-recommends mysql-client \
     && rm -rf /var/lib/apt/lists/*
 ENTRYPOINT ["mysql"]
 ```
 
-This yields us a virtual image size of about 179MB image.
+This yields us a virtual image size of about 145MB image.
 
 ## Documentation
 
diff --git a/kapacitor/README.md b/kapacitor/README.md
index a286220ff..a1f909a3a 100644
--- a/kapacitor/README.md
+++ b/kapacitor/README.md
@@ -16,10 +16,10 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.3`, `1.3.3` (*kapacitor/1.3/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/14a13d25665e9991d6f7aa6a3927c3c6bf897805/kapacitor/1.3/Dockerfile)
--	[`1.3-alpine`, `1.3.3-alpine` (*kapacitor/1.3/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/14a13d25665e9991d6f7aa6a3927c3c6bf897805/kapacitor/1.3/alpine/Dockerfile)
--	[`1.4`, `1.4.1`, `latest` (*kapacitor/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/14a13d25665e9991d6f7aa6a3927c3c6bf897805/kapacitor/1.4/Dockerfile)
--	[`1.4-alpine`, `1.4.1-alpine`, `alpine` (*kapacitor/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/14a13d25665e9991d6f7aa6a3927c3c6bf897805/kapacitor/1.4/alpine/Dockerfile)
+-	[`1.4`, `1.4.1` (*kapacitor/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/fb0350cbbef4bd53334ea9bd2ab5e0a47e63a803/kapacitor/1.4/Dockerfile)
+-	[`1.4-alpine`, `1.4.1-alpine` (*kapacitor/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/fb0350cbbef4bd53334ea9bd2ab5e0a47e63a803/kapacitor/1.4/alpine/Dockerfile)
+-	[`1.5`, `1.5.0`, `latest` (*kapacitor/1.5/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/fb0350cbbef4bd53334ea9bd2ab5e0a47e63a803/kapacitor/1.5/Dockerfile)
+-	[`1.5-alpine`, `1.5.0-alpine`, `alpine` (*kapacitor/1.5/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/fb0350cbbef4bd53334ea9bd2ab5e0a47e63a803/kapacitor/1.5/alpine/Dockerfile)
 
 # Quick reference
 
diff --git a/telegraf/README.md b/telegraf/README.md
index bdc39d111..ee8fef5f3 100644
--- a/telegraf/README.md
+++ b/telegraf/README.md
@@ -16,12 +16,12 @@ WARNING:
 
 # Supported tags and respective `Dockerfile` links
 
--	[`1.4`, `1.4.5` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.4/Dockerfile)
--	[`1.4-alpine`, `1.4.5-alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.4/alpine/Dockerfile)
--	[`1.5`, `1.5.3` (*telegraf/1.5/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.5/Dockerfile)
--	[`1.5-alpine`, `1.5.3-alpine` (*telegraf/1.5/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.5/alpine/Dockerfile)
--	[`1.6`, `1.6.2`, `latest` (*telegraf/1.6/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.6/Dockerfile)
--	[`1.6-alpine`, `1.6.2-alpine`, `alpine` (*telegraf/1.6/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/237f33d76c5c2375ed4a61073ff471479521e91f/telegraf/1.6/alpine/Dockerfile)
+-	[`1.4`, `1.4.5` (*telegraf/1.4/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.4/Dockerfile)
+-	[`1.4-alpine`, `1.4.5-alpine` (*telegraf/1.4/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.4/alpine/Dockerfile)
+-	[`1.5`, `1.5.3` (*telegraf/1.5/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.5/Dockerfile)
+-	[`1.5-alpine`, `1.5.3-alpine` (*telegraf/1.5/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.5/alpine/Dockerfile)
+-	[`1.6`, `1.6.3`, `latest` (*telegraf/1.6/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.6/Dockerfile)
+-	[`1.6-alpine`, `1.6.3-alpine`, `alpine` (*telegraf/1.6/alpine/Dockerfile*)](https://github.com/influxdata/influxdata-docker/blob/76513846a8824077aa19bc9bd530a5deeb5a3df1/telegraf/1.6/alpine/Dockerfile)
 
 # Quick reference