diff --git a/.common-templates/maintainer-community.md b/.common-templates/maintainer-community.md
new file mode 100644
index 000000000000..55773a9cc3fb
--- /dev/null
+++ b/.common-templates/maintainer-community.md
@@ -0,0 +1 @@
+[the Docker Community](%%GITHUB-REPO%%)
diff --git a/.common-templates/maintainer-docker.md b/.common-templates/maintainer-docker.md
new file mode 100644
index 000000000000..6ae8021074de
--- /dev/null
+++ b/.common-templates/maintainer-docker.md
@@ -0,0 +1 @@
+[Docker, Inc.](%%GITHUB-REPO%%)
diff --git a/.common-templates/maintainer-hashicorp.md b/.common-templates/maintainer-hashicorp.md
new file mode 100644
index 000000000000..f25d739c7431
--- /dev/null
+++ b/.common-templates/maintainer-hashicorp.md
@@ -0,0 +1 @@
+[HashiCorp](%%GITHUB-REPO%%)
diff --git a/.common-templates/maintainer-influxdata.md b/.common-templates/maintainer-influxdata.md
new file mode 100644
index 000000000000..599dad3bdbad
--- /dev/null
+++ b/.common-templates/maintainer-influxdata.md
@@ -0,0 +1 @@
+[InfluxData](%%GITHUB-REPO%%)
diff --git a/.template-helpers/docker-versions.md b/.template-helpers/docker-versions.md
deleted file mode 100644
index 0ac8c0bf5f1d..000000000000
--- a/.template-helpers/docker-versions.md
+++ /dev/null
@@ -1,5 +0,0 @@
-This image is officially supported on Docker version %%DOCKER-LATEST%%.
-
-Support for older versions (down to 1.6) is provided on a best-effort basis.
-
-Please see [the Docker installation documentation](https://docs.docker.com/installation/) for details on how to upgrade your Docker daemon.
diff --git a/.template-helpers/get-help.md b/.template-helpers/get-help.md
new file mode 100644
index 000000000000..5ee9c7306c74
--- /dev/null
+++ b/.template-helpers/get-help.md
@@ -0,0 +1 @@
+[the Docker Community Forums](https://forums.docker.com/), [the Docker Community Slack](https://blog.docker.com/2016/11/introducing-docker-community-directory-docker-community-slack/), or [Stack Overflow](https://stackoverflow.com/search?tab=newest&q=docker)
diff --git a/.template-helpers/issues.md b/.template-helpers/issues.md
new file mode 100644
index 000000000000..d2dbb7fccc4a
--- /dev/null
+++ b/.template-helpers/issues.md
@@ -0,0 +1 @@
+[%%GITHUB-REPO%%/issues](%%GITHUB-REPO%%/issues)
diff --git a/.template-helpers/template.md b/.template-helpers/template.md
index 0d04860e1786..ecc310174911 100644
--- a/.template-helpers/template.md
+++ b/.template-helpers/template.md
@@ -2,16 +2,29 @@
 
 %%TAGS%%
 
-For detailed information about the published artifacts of each of the above supported tags (image metadata, transfer size, etc), please see [the `repos/%%REPO%%` directory](https://github.com/docker-library/repo-info/blob/master/repos/%%REPO%%) in [the `docker-library/repo-info` GitHub repo](https://github.com/docker-library/repo-info).
+# Quick reference
 
-For more information about this image and its history, please see [the relevant manifest file (`library/%%REPO%%`)](https://github.com/docker-library/official-images/blob/master/library/%%REPO%%). This image is updated via [pull requests to the `docker-library/official-images` GitHub repo](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2F%%REPO%%).
+-	**Where to get help**:  
+	%%GET-HELP%%
 
-%%CONTENT%%%%VARIANT%%%%LICENSE%%
+-	**Where to file issues**:  
+	%%ISSUES%%
+
+-	**Maintained by**:  
+	%%MAINTAINER%%
 
-# Supported Docker versions
+-	**Published image artifact details**:  
+	[repo-info repo's `repos/%%REPO%%/` directory](https://github.com/docker-library/repo-info/blob/master/repos/%%REPO%%) ([history](https://github.com/docker-library/repo-info/commits/master/repos/%%REPO%%))  
+	(image metadata, transfer size, etc)
 
-%%DOCKER-VERSIONS%%
+-	**Image updates**:  
+	[official-images PRs with label `library/%%REPO%%`](https://github.com/docker-library/official-images/pulls?q=label%3Alibrary%2F%%REPO%%)  
+	[official-images repo's `library/%%REPO%%` file](https://github.com/docker-library/official-images/blob/master/library/%%REPO%%) ([history](https://github.com/docker-library/official-images/commits/master/library/%%REPO%%))
 
-# User Feedback
+-	**Source of this description**:  
+	[docs repo's `%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) ([history](https://github.com/docker-library/docs/commits/master/%%REPO%%))
 
-%%USER-FEEDBACK%%
+-	**Supported Docker versions**:  
+	[the latest release](https://github.com/docker/docker/releases/latest) (down to 1.6 on a best-effort basis)
+
+%%CONTENT%%%%VARIANT%%%%LICENSE%%
diff --git a/.template-helpers/user-feedback.md b/.template-helpers/user-feedback.md
deleted file mode 100644
index 11436a6e0744..000000000000
--- a/.template-helpers/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/.travis/check-required-files.sh b/.travis/check-required-files.sh
index 5bba09231ed1..feb8f0c95e74 100755
--- a/.travis/check-required-files.sh
+++ b/.travis/check-required-files.sh
@@ -7,6 +7,7 @@ exitCode=0
 for requiredFile in \
 	content.md \
 	github-repo \
+	maintainer.md \
 ; do
 	failed=''
 	for repo in */; do
diff --git a/adminer/maintainer.md b/adminer/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/adminer/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/aerospike/issues.md b/aerospike/issues.md
new file mode 100644
index 000000000000..7f7f5a133956
--- /dev/null
+++ b/aerospike/issues.md
@@ -0,0 +1 @@
+[the Aerospike Forums](https://discuss.aerospike.com) or [GitHub](%%GITHUB-REPO%%/issues)
diff --git a/aerospike/maintainer.md b/aerospike/maintainer.md
new file mode 100644
index 000000000000..7c33498cfabb
--- /dev/null
+++ b/aerospike/maintainer.md
@@ -0,0 +1 @@
+[Aerospike, Inc.](%%GITHUB-REPO%%)
diff --git a/aerospike/user-feedback.md b/aerospike/user-feedback.md
deleted file mode 100644
index ba1576fc0c20..000000000000
--- a/aerospike/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans on the [Aerospike Forums](https://discuss.aerospike.com) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/alpine/maintainer.md b/alpine/maintainer.md
new file mode 100644
index 000000000000..b54deb8efdb5
--- /dev/null
+++ b/alpine/maintainer.md
@@ -0,0 +1 @@
+[Glider Labs](%%GITHUB-REPO%%) (an Alpine community contributor)
diff --git a/amazonlinux/issues.md b/amazonlinux/issues.md
new file mode 100644
index 000000000000..553e07ae53f2
--- /dev/null
+++ b/amazonlinux/issues.md
@@ -0,0 +1 @@
+[the Amazon Linux forums](https://forums.aws.amazon.com/forum.jspa?forumID=228)
diff --git a/amazonlinux/maintainer.md b/amazonlinux/maintainer.md
new file mode 100644
index 000000000000..79b085624875
--- /dev/null
+++ b/amazonlinux/maintainer.md
@@ -0,0 +1 @@
+[the Amazon Linux Team](%%GITHUB-REPO%%)
diff --git a/amazonlinux/user-feedback.md b/amazonlinux/user-feedback.md
deleted file mode 100644
index e01d1dd89dc3..000000000000
--- a/amazonlinux/user-feedback.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through [the Amazon Linux forums](https://forums.aws.amazon.com/forum.jspa?forumID=228). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/arangodb/maintainer.md b/arangodb/maintainer.md
new file mode 100644
index 000000000000..d70e0829f235
--- /dev/null
+++ b/arangodb/maintainer.md
@@ -0,0 +1 @@
+[ArangoDB](%%GITHUB-REPO%%)
diff --git a/backdrop/maintainer.md b/backdrop/maintainer.md
new file mode 100644
index 000000000000..ebad14841236
--- /dev/null
+++ b/backdrop/maintainer.md
@@ -0,0 +1 @@
+[Backdrop Ops](%%GITHUB-REPO%%)
diff --git a/bash/maintainer.md b/bash/maintainer.md
new file mode 100644
index 000000000000..ae93a0ab4362
--- /dev/null
+++ b/bash/maintainer.md
@@ -0,0 +1 @@
+[Tianon (of the Docker Community)](%%GITHUB-REPO%%), [with Chet's support (from Bash upstream)](https://github.com/docker-library/official-images/pull/2217#issue-181031192)
diff --git a/bonita/maintainer.md b/bonita/maintainer.md
new file mode 100644
index 000000000000..c78fd7a69a12
--- /dev/null
+++ b/bonita/maintainer.md
@@ -0,0 +1 @@
+[Bonitasoft Community](%%GITHUB-REPO%%)
diff --git a/buildpack-deps/maintainer.md b/buildpack-deps/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/buildpack-deps/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/busybox/maintainer.md b/busybox/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/busybox/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/cassandra/maintainer.md b/cassandra/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/cassandra/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/celery/maintainer.md b/celery/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/celery/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/centos/issues.md b/centos/issues.md
new file mode 100644
index 000000000000..e1323c7c9c1a
--- /dev/null
+++ b/centos/issues.md
@@ -0,0 +1 @@
+[https://bugs.centos.org](https://bugs.centos.org) or [GitHub](%%GITHUB-REPO%%/issues)
diff --git a/centos/maintainer.md b/centos/maintainer.md
new file mode 100644
index 000000000000..06be7cefd089
--- /dev/null
+++ b/centos/maintainer.md
@@ -0,0 +1 @@
+[The CentOS Project](%%GITHUB-REPO%%)
diff --git a/centos/user-feedback.md b/centos/user-feedback.md
deleted file mode 100644
index 368d1af4501b..000000000000
--- a/centos/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans by submitting a ticket at [https://bugs.centos.org](https://bugs.centos.org) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/chronograf/maintainer.md b/chronograf/maintainer.md
new file mode 120000
index 000000000000..4bee6ceacd5b
--- /dev/null
+++ b/chronograf/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-influxdata.md
\ No newline at end of file
diff --git a/cirros/maintainer.md b/cirros/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/cirros/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/clearlinux/maintainer.md b/clearlinux/maintainer.md
new file mode 100644
index 000000000000..947a585d2677
--- /dev/null
+++ b/clearlinux/maintainer.md
@@ -0,0 +1 @@
+[Intel Corporation](%%GITHUB-REPO%%)
diff --git a/clojure/maintainer.md b/clojure/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/clojure/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/composer/maintainer.md b/composer/maintainer.md
new file mode 100644
index 000000000000..fc16200d5d6e
--- /dev/null
+++ b/composer/maintainer.md
@@ -0,0 +1 @@
+[Composer](%%GITHUB-REPO%%)
diff --git a/composer/user-feedback.md b/composer/user-feedback.md
deleted file mode 100644
index b2465edcef16..000000000000
--- a/composer/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach us through the `#composer` or `#docker-library` IRC channels on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/consul/maintainer.md b/consul/maintainer.md
new file mode 120000
index 000000000000..ef4100e019a3
--- /dev/null
+++ b/consul/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-hashicorp.md
\ No newline at end of file
diff --git a/convertigo/maintainer.md b/convertigo/maintainer.md
new file mode 100644
index 000000000000..f3f30e6de8d1
--- /dev/null
+++ b/convertigo/maintainer.md
@@ -0,0 +1 @@
+[Convertigo](%%GITHUB-REPO%%)
diff --git a/couchbase/maintainer.md b/couchbase/maintainer.md
new file mode 100644
index 000000000000..c1371b3fd4ca
--- /dev/null
+++ b/couchbase/maintainer.md
@@ -0,0 +1 @@
+[the Couchbase Docker Team](%%GITHUB-REPO%%)
diff --git a/couchdb/maintainer.md b/couchdb/maintainer.md
new file mode 100644
index 000000000000..35ecd0a3edbb
--- /dev/null
+++ b/couchdb/maintainer.md
@@ -0,0 +1 @@
+[Apache CouchDB](%%GITHUB-REPO%%)
diff --git a/crate/get-help.md b/crate/get-help.md
new file mode 100644
index 000000000000..98fec09c3a69
--- /dev/null
+++ b/crate/get-help.md
@@ -0,0 +1 @@
+[the public Crate community on Slack](https://crate.io/docs/support/slackin/)
diff --git a/crate/maintainer.md b/crate/maintainer.md
new file mode 100644
index 000000000000..ab8c0943b249
--- /dev/null
+++ b/crate/maintainer.md
@@ -0,0 +1 @@
+[Crate.io](%%GITHUB-REPO%%)
diff --git a/crate/user-feedback.md b/crate/user-feedback.md
deleted file mode 100644
index 9c042f2bd453..000000000000
--- a/crate/user-feedback.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/crate/docker-crate/issues).
-
-If you have any questions or suggestions, we are happy to help! Feel free to join our [public Crate community on Slack](https://crate.io/docs/support/slackin/).
-
-For further information and official contact visit [https://crate.io](https://crate.io).
-
-## Contributing
-
-You are very welcome to contribute features or fixes! Before we can accept any pull requests to Crate Data we need you to agree to our [CLA](https://crate.io/community/contribute/). For further information please refer to [CONTRIBUTING.rst](https://github.com/crate/crate/blob/master/CONTRIBUTING.rst).
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
-
-Visit [Crate on Docker](https://crate.io/docs/install/containers/docker/) and get further documentation about how to get started with Crate.
diff --git a/crux/maintainer.md b/crux/maintainer.md
new file mode 100644
index 000000000000..bdd8b67eae93
--- /dev/null
+++ b/crux/maintainer.md
@@ -0,0 +1 @@
+currently unmainainted (see deprecation notice)
diff --git a/debian/maintainer.md b/debian/maintainer.md
new file mode 100644
index 000000000000..99589af9bdd8
--- /dev/null
+++ b/debian/maintainer.md
@@ -0,0 +1 @@
+Debian Developers [tianon](https://qa.debian.org/developer.php?login=tianon) and [paultag](https://qa.debian.org/developer.php?login=paultag)
diff --git a/django/maintainer.md b/django/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/django/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/docker/maintainer.md b/docker/maintainer.md
new file mode 100644
index 000000000000..8766c3fcbeda
--- /dev/null
+++ b/docker/maintainer.md
@@ -0,0 +1 @@
+[Tianon (of the Docker Project)](%%GITHUB-REPO%%)
diff --git a/drupal/content.md b/drupal/content.md
index e8ade8ccd42d..1747c5b449de 100644
--- a/drupal/content.md
+++ b/drupal/content.md
@@ -6,10 +6,6 @@ Drupal is a free and open-source content-management framework written in PHP and
 
 %%LOGO%%
 
-# Who maintains this
-
-This image is not maintained by the Drupal community or the Drupal Security Team. This image is maintained by the docker community.
-
 # How to use this image
 
 The basic pattern for starting a `%%REPO%%` instance is:
diff --git a/drupal/maintainer.md b/drupal/maintainer.md
new file mode 100644
index 000000000000..71c6d966761e
--- /dev/null
+++ b/drupal/maintainer.md
@@ -0,0 +1 @@
+[the Docker Community](%%GITHUB-REPO%%) (*not* the Drupal Community or the Drupal Security Team)
diff --git a/eclipse-mosquitto/maintainer.md b/eclipse-mosquitto/maintainer.md
new file mode 100644
index 000000000000..bc90bfc6d105
--- /dev/null
+++ b/eclipse-mosquitto/maintainer.md
@@ -0,0 +1 @@
+[the Eclipse Foundation](%%GITHUB-REPO%%)
diff --git a/eggdrop/maintainer.md b/eggdrop/maintainer.md
new file mode 100644
index 000000000000..f9972228feee
--- /dev/null
+++ b/eggdrop/maintainer.md
@@ -0,0 +1 @@
+[Eggheads (the Eggdrop community)](%%GITHUB-REPO%%)
diff --git a/elasticsearch/maintainer.md b/elasticsearch/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/elasticsearch/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/elixir/maintainer.md b/elixir/maintainer.md
new file mode 100644
index 000000000000..033776507216
--- /dev/null
+++ b/elixir/maintainer.md
@@ -0,0 +1 @@
+[the Docker Community](%%GITHUB-REPO%%), [with Elixir's support](https://github.com/docker-library/official-images/pull/1398#issuecomment-180484549)
diff --git a/erlang/maintainer.md b/erlang/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/erlang/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/fedora/github-repo b/fedora/github-repo
index dfd4bf804569..508262fd97bb 100644
--- a/fedora/github-repo
+++ b/fedora/github-repo
@@ -1 +1 @@
-https://github.com/lsm5/docker-brew-fedora
+https://github.com/fedora-cloud/docker-brew-fedora
diff --git a/fedora/issues.md b/fedora/issues.md
new file mode 100644
index 000000000000..c2bfb6883b4e
--- /dev/null
+++ b/fedora/issues.md
@@ -0,0 +1 @@
+[Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or [GitHub](%%GITHUB-REPO%%/issues)
diff --git a/fedora/maintainer.md b/fedora/maintainer.md
new file mode 100644
index 000000000000..eb832d525ea2
--- /dev/null
+++ b/fedora/maintainer.md
@@ -0,0 +1 @@
+[Fedora Release Engineering](%%GITHUB-REPO%%)
diff --git a/fedora/user-feedback.md b/fedora/user-feedback.md
deleted file mode 100644
index c2909395c50f..000000000000
--- a/fedora/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans by filing a bug on [Fedora's bugzilla page](https://bugzilla.redhat.com/enter_bug.cgi?product=Fedora) (choose `docker` as component and include details about image problems in the description) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/fsharp/maintainer.md b/fsharp/maintainer.md
new file mode 100644
index 000000000000..bfb50db0394e
--- /dev/null
+++ b/fsharp/maintainer.md
@@ -0,0 +1 @@
+[the F# Community](%%GITHUB-REPO%%)
diff --git a/gazebo/maintainer.md b/gazebo/maintainer.md
new file mode 120000
index 000000000000..4859104df36f
--- /dev/null
+++ b/gazebo/maintainer.md
@@ -0,0 +1 @@
+../ros/maintainer.md
\ No newline at end of file
diff --git a/gcc/maintainer.md b/gcc/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/gcc/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/geonetwork/maintainer.md b/geonetwork/maintainer.md
new file mode 100644
index 000000000000..9ed269e9978b
--- /dev/null
+++ b/geonetwork/maintainer.md
@@ -0,0 +1 @@
+[GeoNetwork opensource](%%GITHUB-REPO%%)
diff --git a/ghost/maintainer.md b/ghost/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/ghost/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/golang/maintainer.md b/golang/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/golang/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/gradle/maintainer.md b/gradle/maintainer.md
new file mode 100644
index 000000000000..f53574265422
--- /dev/null
+++ b/gradle/maintainer.md
@@ -0,0 +1 @@
+[Keegan Witt (of the Groovy Project)](%%GITHUB-REPO%%), [with the Gradle Project's approval](https://discuss.gradle.org/t/official-docker-images/21159/8)
diff --git a/groovy/maintainer.md b/groovy/maintainer.md
new file mode 100644
index 000000000000..eb354356d574
--- /dev/null
+++ b/groovy/maintainer.md
@@ -0,0 +1 @@
+[the Apache Groovy project](%%GITHUB-REPO%%)
diff --git a/haproxy/maintainer.md b/haproxy/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/haproxy/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/haskell/maintainer.md b/haskell/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/haskell/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/haxe/maintainer.md b/haxe/maintainer.md
new file mode 100644
index 000000000000..b3de8333e01f
--- /dev/null
+++ b/haxe/maintainer.md
@@ -0,0 +1 @@
+[the Haxe Foundation](%%GITHUB-REPO%%)
diff --git a/hello-seattle/maintainer.md b/hello-seattle/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/hello-seattle/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/hello-world/maintainer.md b/hello-world/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/hello-world/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/hola-mundo/maintainer.md b/hola-mundo/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/hola-mundo/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/httpd/maintainer.md b/httpd/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/httpd/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/hylang/maintainer.md b/hylang/maintainer.md
new file mode 100644
index 000000000000..dda42bfb495e
--- /dev/null
+++ b/hylang/maintainer.md
@@ -0,0 +1 @@
+[Paul Tagliamonte, Hy BDFL](%%GITHUB-REPO%%)
diff --git a/ibmjava/get-help.md b/ibmjava/get-help.md
new file mode 100644
index 000000000000..06c54cfa6758
--- /dev/null
+++ b/ibmjava/get-help.md
@@ -0,0 +1 @@
+[the developerWorks forum for IBM Java Runtimes and SDKs](https://www.ibm.com/developerworks/community/forums/html/forum?id=11111111-0000-0000-0000-000000000367)
diff --git a/ibmjava/issues.md b/ibmjava/issues.md
new file mode 100644
index 000000000000..b6e9393e86f6
--- /dev/null
+++ b/ibmjava/issues.md
@@ -0,0 +1 @@
+[GitHub](%%GITHUB-REPO%%/issues); for troubleshooting, see our [How Do I ...?](http://www.ibm.com/developerworks/java/jdk/howdoi/) page
diff --git a/ibmjava/maintainer.md b/ibmjava/maintainer.md
new file mode 100644
index 000000000000..0a84d8e9a6c7
--- /dev/null
+++ b/ibmjava/maintainer.md
@@ -0,0 +1 @@
+[IBM Runtime Technologies](%%GITHUB-REPO%%)
diff --git a/ibmjava/user-feedback.md b/ibmjava/user-feedback.md
deleted file mode 100644
index b2593e248024..000000000000
--- a/ibmjava/user-feedback.md
+++ /dev/null
@@ -1,7 +0,0 @@
-#### Issues
-
-For issues relating specifically to this Docker image, please use the [GitHub issue tracker](https://github.com/ibmruntimes/ci.docker/issues).
-
-For more general issues relating to IBM® SDK, Java™ Technology Edition you can ask questions in the developerWorks forum: [IBM Java Runtimes and SDKs](https://www.ibm.com/developerworks/community/forums/html/forum?id=11111111-0000-0000-0000-000000000367).
-
-For general information on Troubleshooting with the SDK, please do take a look at our [How Do I ...?](http://www.ibm.com/developerworks/java/jdk/howdoi/) page.
diff --git a/influxdb/maintainer.md b/influxdb/maintainer.md
new file mode 120000
index 000000000000..4bee6ceacd5b
--- /dev/null
+++ b/influxdb/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-influxdata.md
\ No newline at end of file
diff --git a/irssi/maintainer.md b/irssi/maintainer.md
new file mode 100644
index 000000000000..96a8460c2ea5
--- /dev/null
+++ b/irssi/maintainer.md
@@ -0,0 +1 @@
+[Jessie and Tianon (of the Docker Community)](%%GITHUB-REPO%%), [with the appreciation of the Irssi Project](https://twitter.com/GeertHauwaerts/status/559131523145035776)
diff --git a/java/maintainer.md b/java/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/java/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/jenkins/maintainer.md b/jenkins/maintainer.md
new file mode 100644
index 000000000000..e8c6bd796979
--- /dev/null
+++ b/jenkins/maintainer.md
@@ -0,0 +1 @@
+[the Jenkins Project](%%GITHUB-REPO%%)
diff --git a/jetty/maintainer.md b/jetty/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/jetty/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/joomla/maintainer.md b/joomla/maintainer.md
new file mode 100644
index 000000000000..573bd0d032bf
--- /dev/null
+++ b/joomla/maintainer.md
@@ -0,0 +1 @@
+[Joomla!](%%GITHUB-REPO%%)
diff --git a/jruby/maintainer.md b/jruby/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/jruby/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/julia/maintainer.md b/julia/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/julia/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/kaazing-gateway/maintainer.md b/kaazing-gateway/maintainer.md
new file mode 100644
index 000000000000..39f75e47e2db
--- /dev/null
+++ b/kaazing-gateway/maintainer.md
@@ -0,0 +1 @@
+[the Kaazing Docker Maintainers](%%GITHUB-REPO%%)
diff --git a/kapacitor/maintainer.md b/kapacitor/maintainer.md
new file mode 120000
index 000000000000..4bee6ceacd5b
--- /dev/null
+++ b/kapacitor/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-influxdata.md
\ No newline at end of file
diff --git a/kibana/maintainer.md b/kibana/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/kibana/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/known/maintainer.md b/known/maintainer.md
new file mode 100644
index 000000000000..909ddaf6d6a8
--- /dev/null
+++ b/known/maintainer.md
@@ -0,0 +1 @@
+[Known](%%GITHUB-REPO%%)
diff --git a/kong/maintainer.md b/kong/maintainer.md
new file mode 100644
index 000000000000..01d070c9a2c0
--- /dev/null
+++ b/kong/maintainer.md
@@ -0,0 +1 @@
+[the Mashape Docker Maintainers](%%GITHUB-REPO%%)
diff --git a/lightstreamer/maintainer.md b/lightstreamer/maintainer.md
new file mode 100644
index 000000000000..95cd75425e06
--- /dev/null
+++ b/lightstreamer/maintainer.md
@@ -0,0 +1 @@
+[the Lightstreamer Server Development Team](%%GITHUB-REPO%%)
diff --git a/logstash/maintainer.md b/logstash/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/logstash/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/mageia/maintainer.md b/mageia/maintainer.md
new file mode 100644
index 000000000000..d23a704c823c
--- /dev/null
+++ b/mageia/maintainer.md
@@ -0,0 +1 @@
+[Mageia Developers](%%GITHUB-REPO%%)
diff --git a/mariadb/maintainer.md b/mariadb/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/mariadb/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/maven/maintainer.md b/maven/maintainer.md
new file mode 100644
index 000000000000..ab3ef11baa7b
--- /dev/null
+++ b/maven/maintainer.md
@@ -0,0 +1 @@
+[the Maven Project](%%GITHUB-REPO%%)
diff --git a/memcached/maintainer.md b/memcached/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/memcached/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/mongo-express/maintainer.md b/mongo-express/maintainer.md
new file mode 100644
index 000000000000..01c06b328d30
--- /dev/null
+++ b/mongo-express/maintainer.md
@@ -0,0 +1 @@
+[mongo-express](%%GITHUB-REPO%%)
diff --git a/mongo/maintainer.md b/mongo/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/mongo/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/mono/maintainer.md b/mono/maintainer.md
new file mode 100644
index 000000000000..be6d91ba117c
--- /dev/null
+++ b/mono/maintainer.md
@@ -0,0 +1 @@
+[the Mono Project](%%GITHUB-REPO%%)
diff --git a/mono/user-feedback.md b/mono/user-feedback.md
deleted file mode 100644
index dc2af14f9633..000000000000
--- a/mono/user-feedback.md
+++ /dev/null
@@ -1 +0,0 @@
-Please report issues on the [GitHub project](https://github.com/mono/docker).
diff --git a/mysql/maintainer.md b/mysql/maintainer.md
new file mode 100644
index 000000000000..67bca737f974
--- /dev/null
+++ b/mysql/maintainer.md
@@ -0,0 +1 @@
+[the Docker Community and the MySQL Team](%%GITHUB-REPO%%)
diff --git a/nats-streaming/maintainer.md b/nats-streaming/maintainer.md
new file mode 120000
index 000000000000..c91a297fdd04
--- /dev/null
+++ b/nats-streaming/maintainer.md
@@ -0,0 +1 @@
+../nats/maintainer.md
\ No newline at end of file
diff --git a/nats/maintainer.md b/nats/maintainer.md
new file mode 100644
index 000000000000..3976357aaf4f
--- /dev/null
+++ b/nats/maintainer.md
@@ -0,0 +1 @@
+[the NATS Project](%%GITHUB-REPO%%)
diff --git a/neo4j/get-help.md b/neo4j/get-help.md
new file mode 100644
index 000000000000..af0efede52b3
--- /dev/null
+++ b/neo4j/get-help.md
@@ -0,0 +1 @@
+[Stack Overflow](http://stackoverflow.com/questions/tagged/neo4j)
diff --git a/neo4j/maintainer.md b/neo4j/maintainer.md
new file mode 100644
index 000000000000..0d5a20cc0425
--- /dev/null
+++ b/neo4j/maintainer.md
@@ -0,0 +1 @@
+[Neo4j](%%GITHUB-REPO%%)
diff --git a/neo4j/user-feedback.md b/neo4j/user-feedback.md
deleted file mode 100644
index 51202b7fd15c..000000000000
--- a/neo4j/user-feedback.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](https://github.com/neo4j/docker-neo4j/issues).
-
-For general Neo4j questions, please ask on [StackOverflow](http://stackoverflow.com/questions/tagged/neo4j).
-
-## Contributing
-
-We welcome pull requests on [GitHub](https://github.com/neo4j/docker-neo4j/pulls).
diff --git a/neurodebian/maintainer.md b/neurodebian/maintainer.md
new file mode 100644
index 000000000000..b2cc6a66b9be
--- /dev/null
+++ b/neurodebian/maintainer.md
@@ -0,0 +1 @@
+[NeuroDebian](%%GITHUB-REPO%%)
diff --git a/nextcloud/maintainer.md b/nextcloud/maintainer.md
new file mode 100644
index 000000000000..e6bd947c8c47
--- /dev/null
+++ b/nextcloud/maintainer.md
@@ -0,0 +1 @@
+[Nextcloud](%%GITHUB-REPO%%)
diff --git a/nginx/maintainer.md b/nginx/maintainer.md
new file mode 100644
index 000000000000..722ef4d7baf7
--- /dev/null
+++ b/nginx/maintainer.md
@@ -0,0 +1 @@
+[the NGINX Docker Maintainers](%%GITHUB-REPO%%)
diff --git a/node/maintainer.md b/node/maintainer.md
new file mode 100644
index 000000000000..00a472009f2a
--- /dev/null
+++ b/node/maintainer.md
@@ -0,0 +1 @@
+[The Node.js Docker Team](%%GITHUB-REPO%%)
diff --git a/notary/maintainer.md b/notary/maintainer.md
new file mode 120000
index 000000000000..617c4fb974a1
--- /dev/null
+++ b/notary/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-docker.md
\ No newline at end of file
diff --git a/nuxeo/maintainer.md b/nuxeo/maintainer.md
new file mode 100644
index 000000000000..0ad82eb66ba7
--- /dev/null
+++ b/nuxeo/maintainer.md
@@ -0,0 +1 @@
+[Nuxeo](%%GITHUB-REPO%%)
diff --git a/odoo/maintainer.md b/odoo/maintainer.md
new file mode 100644
index 000000000000..93b48ad73002
--- /dev/null
+++ b/odoo/maintainer.md
@@ -0,0 +1 @@
+[Odoo](%%GITHUB-REPO%%)
diff --git a/openjdk/maintainer.md b/openjdk/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/openjdk/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/opensuse/maintainer.md b/opensuse/maintainer.md
new file mode 100644
index 000000000000..7c8f0a78ed6b
--- /dev/null
+++ b/opensuse/maintainer.md
@@ -0,0 +1 @@
+[the SUSE containers team](%%GITHUB-REPO%%)
diff --git a/oraclelinux/content.md b/oraclelinux/content.md
index 5ed5a80836ff..74f4f3ca49a7 100644
--- a/oraclelinux/content.md
+++ b/oraclelinux/content.md
@@ -20,3 +20,30 @@ The Oracle Linux images are intended for use in the **FROM** field of an applica
 -	[Facebook](https://www.facebook.com/OracleLinux)
 -	[YouTube](https://www.youtube.com/user/OracleLinuxChannel)
 -	[Blog](http://blogs.oracle.com/linux)
+
+## Customer Support
+
+Oracle provides support to Oracle Linux subscription customers via the [My Oracle Support](https://support.oracle.com) portal. The Oracle Linux Docker images are covered by Oracle Linux Basic and Premier support subscriptions. Customers should follow existing support procedures to obtain support for Oracle Linux running in a Docker container.
+
+This image is officially supported for Oracle Linux customers with an active Oracle Linux Basic or Premier support subscription on both Oracle Linux 6 and Oracle Linux 7 running the Unbreakable Enterprise Kernel Release 4 and Docker Engine version 1.9 installed from the Oracle Linux Yum Server.
+
+Oracle Linux users without an active support subscription can use either the Oracle distributed version of Docker Engine or the upstream version distributed by Docker. Support is limited to the community-based options outlined below.
+
+### Oracle Linux 7
+
+Please review the [additional Linux programs supported under Oracle Linux support](https://docs.oracle.com/cd/E52668_01/E63013/html/ol7-lic-addl-packages.html) chapter for more information on the scope of support for Docker.
+
+Please review [Chapter 29 of the Oracle Linux 7 Administrator's Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages.
+
+### Oracle Linux 6
+
+Please review the [additional Linux programs supported under Oracle Linux support](http://docs.oracle.com/cd/E37670_01/E63012/html/ol6-lic-addl-packages.html) chapter for more information on the scope of support for Docker.
+
+Please review [Chapter 10 of the Oracle Linux 6 Administrator's Solutions Guide](http://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages.
+
+## Community Support
+
+For Oracle Linux users without a paid support subscription, the following resources are available:
+
+-	The [Oracle Linux Forum](https://community.oracle.com/community/server_%26_storage_systems/linux/oracle_linux) on the [Oracle Technology Network Community](https://community.oracle.com/welcome).
+-	The `##oraclelinux` IRC channel on Freenode.
diff --git a/oraclelinux/docker-versions.md b/oraclelinux/docker-versions.md
deleted file mode 100644
index ff6181a05483..000000000000
--- a/oraclelinux/docker-versions.md
+++ /dev/null
@@ -1,15 +0,0 @@
-This image is officially supported for Oracle Linux customers with an active Oracle Linux Basic or Premier support subscription on both Oracle Linux 6 and Oracle Linux 7 running the Unbreakable Enterprise Kernel Release 4 and Docker Engine version 1.9 installed from the Oracle Linux Yum Server.
-
-Oracle Linux users without an active support subscription can use either the Oracle distributed version of Docker Engine or the upstream version distributed by Docker. Support is limited to the community-based options outlined below.
-
-## Oracle Linux 7
-
-Please review the [additional Linux programs supported under Oracle Linux support](https://docs.oracle.com/cd/E52668_01/E63013/html/ol7-lic-addl-packages.html) chapter for more information on the scope of support for Docker.
-
-Please review [Chapter 29 of the Oracle Linux 7 Administrator's Guide](https://docs.oracle.com/cd/E52668_01/E54669/html/ol7-docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages.
-
-## Oracle Linux 6
-
-Please review the [additional Linux programs supported under Oracle Linux support](http://docs.oracle.com/cd/E37670_01/E63012/html/ol6-lic-addl-packages.html) chapter for more information on the scope of support for Docker.
-
-Please review [Chapter 10 of the Oracle Linux 6 Administrator's Solutions Guide](http://docs.oracle.com/cd/E37670_01/E37355/html/ol_docker.html) for details on how to install or upgrade the Unbreakable Enterprise Kernel and Docker Engine packages.
diff --git a/oraclelinux/get-help.md b/oraclelinux/get-help.md
new file mode 100644
index 000000000000..7021fe0ba937
--- /dev/null
+++ b/oraclelinux/get-help.md
@@ -0,0 +1 @@
+see the "Customer Support" and "Community Support" sections below
diff --git a/oraclelinux/github-repo b/oraclelinux/github-repo
index 9a7490dcebe6..afef68ccc7e8 100644
--- a/oraclelinux/github-repo
+++ b/oraclelinux/github-repo
@@ -1 +1 @@
-https://github.com/oracle/docker
+https://github.com/oracle/docker-images
diff --git a/oraclelinux/maintainer.md b/oraclelinux/maintainer.md
new file mode 100644
index 000000000000..52003361a7c9
--- /dev/null
+++ b/oraclelinux/maintainer.md
@@ -0,0 +1 @@
+[the Oracle Linux Product Team](%%GITHUB-REPO%%)
diff --git a/oraclelinux/user-feedback.md b/oraclelinux/user-feedback.md
deleted file mode 100644
index 6f84a54f9dd2..000000000000
--- a/oraclelinux/user-feedback.md
+++ /dev/null
@@ -1,16 +0,0 @@
-## Customer Support
-
-Oracle provides support to Oracle Linux subscription customers via the [My Oracle Support](https://support.oracle.com) portal. The Oracle Linux Docker images are covered by Oracle Linux Basic and Premier support subscriptions. Customers should follow existing support procedures to obtain support for Oracle Linux running in a Docker container.
-
-## Community Support
-
-For Oracle Linux users without a paid support subscription, the following resources are available:
-
--	The [Oracle Linux Forum](https://community.oracle.com/community/server_%26_storage_systems/linux/oracle_linux) on the [Oracle Technology Network Community](https://community.oracle.com/welcome).
--	The `##oraclelinux` IRC channel on Freenode.
-
-## Contributing
-
-Oracle Linux customers with an active support subscription should follow the existing support procedures to suggest new features, fixes or updates to the Oracle Linux Docker images.
-
-For Oracle Linux users without a paid support subscription, please submit any new feature, fix or update suggestion via a [GitHub issue](%%GITHUB-REPO%%/issues).
diff --git a/orientdb/maintainer.md b/orientdb/maintainer.md
new file mode 100644
index 000000000000..2a9364211f26
--- /dev/null
+++ b/orientdb/maintainer.md
@@ -0,0 +1 @@
+[OrientDB](%%GITHUB-REPO%%)
diff --git a/owncloud/maintainer.md b/owncloud/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/owncloud/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/percona/maintainer.md b/percona/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/percona/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/perl/maintainer.md b/perl/maintainer.md
new file mode 100644
index 000000000000..e0b116af96d8
--- /dev/null
+++ b/perl/maintainer.md
@@ -0,0 +1 @@
+[the Perl Community](%%GITHUB-REPO%%)
diff --git a/photon/maintainer.md b/photon/maintainer.md
new file mode 100644
index 000000000000..4f223458423f
--- /dev/null
+++ b/photon/maintainer.md
@@ -0,0 +1 @@
+[VMware](%%GITHUB-REPO%%)
diff --git a/php-zendserver/issues.md b/php-zendserver/issues.md
new file mode 100644
index 000000000000..ee7741214e60
--- /dev/null
+++ b/php-zendserver/issues.md
@@ -0,0 +1 @@
+[Zend Support Center](https://www.zend.com/en/support-center)
diff --git a/php-zendserver/maintainer.md b/php-zendserver/maintainer.md
new file mode 100644
index 000000000000..43e66e9f0022
--- /dev/null
+++ b/php-zendserver/maintainer.md
@@ -0,0 +1 @@
+[Zend Technologies](%%GITHUB-REPO%%)
diff --git a/php-zendserver/user-feedback.md b/php-zendserver/user-feedback.md
deleted file mode 100644
index c88156a088b0..000000000000
--- a/php-zendserver/user-feedback.md
+++ /dev/null
@@ -1 +0,0 @@
-Think we’ve missed something? Let us know at: http://www.zend.com/en/support-center
diff --git a/php/maintainer.md b/php/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/php/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/piwik/maintainer.md b/piwik/maintainer.md
new file mode 100644
index 000000000000..c318b5eaf8e7
--- /dev/null
+++ b/piwik/maintainer.md
@@ -0,0 +1 @@
+[Piwik Analytics](%%GITHUB-REPO%%)
diff --git a/plone/maintainer.md b/plone/maintainer.md
new file mode 100644
index 000000000000..cc87b4684a72
--- /dev/null
+++ b/plone/maintainer.md
@@ -0,0 +1 @@
+[the Plone Foundation](%%GITHUB-REPO%%)
diff --git a/postgres/maintainer.md b/postgres/maintainer.md
new file mode 100644
index 000000000000..6013dac2035a
--- /dev/null
+++ b/postgres/maintainer.md
@@ -0,0 +1 @@
+[the PostgreSQL Docker Community](%%GITHUB-REPO%%)
diff --git a/postgres/user-feedback.md b/postgres/user-feedback.md
deleted file mode 100644
index 5ce569fe8e09..000000000000
--- a/postgres/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans on the [mailing list](http://www.postgresql.org/community/lists/subscribe/) or through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/pypy/maintainer.md b/pypy/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/pypy/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/python/maintainer.md b/python/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/python/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/r-base/issues.md b/r-base/issues.md
new file mode 100644
index 000000000000..a325904a2688
--- /dev/null
+++ b/r-base/issues.md
@@ -0,0 +1 @@
+[GitHub](%%GITHUB-REPO%%/issues) or [Email](mailto:rocker-maintainers@eddelbuettel.com)
diff --git a/r-base/maintainer.md b/r-base/maintainer.md
new file mode 100644
index 000000000000..552ead2d4ce2
--- /dev/null
+++ b/r-base/maintainer.md
@@ -0,0 +1 @@
+[the Rocker Community](%%GITHUB-REPO%%)
diff --git a/r-base/user-feedback.md b/r-base/user-feedback.md
deleted file mode 100644
index ff7aa262f9a8..000000000000
--- a/r-base/user-feedback.md
+++ /dev/null
@@ -1,15 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues).
-
-You can also reach us by email via email at `rocker-maintainers@eddelbuettel.com`.
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/rabbitmq/maintainer.md b/rabbitmq/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/rabbitmq/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/rails/maintainer.md b/rails/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/rails/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/rakudo-star/maintainer.md b/rakudo-star/maintainer.md
new file mode 100644
index 000000000000..d5a3c22c7d49
--- /dev/null
+++ b/rakudo-star/maintainer.md
@@ -0,0 +1 @@
+[the Perl 6 Community](%%GITHUB-REPO%%)
diff --git a/rapidoid/maintainer.md b/rapidoid/maintainer.md
new file mode 100644
index 000000000000..8843b6b77549
--- /dev/null
+++ b/rapidoid/maintainer.md
@@ -0,0 +1 @@
+[Rapidoid](%%GITHUB-REPO%%)
diff --git a/redis/maintainer.md b/redis/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/redis/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/redmine/maintainer.md b/redmine/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/redmine/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/registry/maintainer.md b/registry/maintainer.md
new file mode 120000
index 000000000000..617c4fb974a1
--- /dev/null
+++ b/registry/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-docker.md
\ No newline at end of file
diff --git a/rethinkdb/maintainer.md b/rethinkdb/maintainer.md
new file mode 100644
index 000000000000..e226d7cbab07
--- /dev/null
+++ b/rethinkdb/maintainer.md
@@ -0,0 +1 @@
+[RethinkDB](%%GITHUB-REPO%%)
diff --git a/rocket.chat/maintainer.md b/rocket.chat/maintainer.md
new file mode 100644
index 000000000000..bf559b5b047f
--- /dev/null
+++ b/rocket.chat/maintainer.md
@@ -0,0 +1 @@
+[Rocket.Chat](%%GITHUB-REPO%%)
diff --git a/ros/maintainer.md b/ros/maintainer.md
new file mode 100644
index 000000000000..90db8c7f2308
--- /dev/null
+++ b/ros/maintainer.md
@@ -0,0 +1 @@
+[the Open Source Robotics Foundation](%%GITHUB-REPO%%)
diff --git a/ruby/maintainer.md b/ruby/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/ruby/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/scratch/github-repo b/scratch/github-repo
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/sentry/maintainer.md b/sentry/maintainer.md
new file mode 100644
index 000000000000..24fcafb6f94a
--- /dev/null
+++ b/sentry/maintainer.md
@@ -0,0 +1 @@
+[Sentry](%%GITHUB-REPO%%)
diff --git a/silverpeas/get-help.md b/silverpeas/get-help.md
new file mode 100644
index 000000000000..8dc8db73fffd
--- /dev/null
+++ b/silverpeas/get-help.md
@@ -0,0 +1 @@
+[the Silverpeas user mailing list](https://groups.google.com/forum/#!forum/silverpeas-users)
diff --git a/silverpeas/maintainer.md b/silverpeas/maintainer.md
new file mode 100644
index 000000000000..47242f0671bf
--- /dev/null
+++ b/silverpeas/maintainer.md
@@ -0,0 +1 @@
+[Silverpeas](%%GITHUB-REPO%%)
diff --git a/silverpeas/user-feedback.md b/silverpeas/user-feedback.md
deleted file mode 100644
index a623575fa669..000000000000
--- a/silverpeas/user-feedback.md
+++ /dev/null
@@ -1,17 +0,0 @@
-## Issues
-
-If you have any problems with or questions about this image, please contact us through a [GitHub issue](%%GITHUB-REPO%%/issues). If the issue is related to a CVE, please check for [a `cve-tracker` issue on the `official-images` repository first](https://github.com/docker-library/official-images/issues?q=label%3Acve-tracker).
-
-You can also reach many of the official image maintainers via the `#docker-library` IRC channel on [Freenode](https://freenode.net).
-
-For general questions about Silverpeas, see our [user mailing list](https://groups.google.com/forum/#!forum/silverpeas-users).
-
-## Contributing
-
-You are invited to contribute new features, fixes, or updates, large or small; we are always thrilled to receive pull requests, and do our best to process them as fast as we can.
-
-Before you start to code, we recommend discussing your plans through a [GitHub issue](%%GITHUB-REPO%%/issues), especially for more ambitious contributions. This gives other contributors a chance to point you in the right direction, give you feedback on your design, and help you find out if someone else is working on the same thing.
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/solr/get-help.md b/solr/get-help.md
new file mode 100644
index 000000000000..31ab6716cf5d
--- /dev/null
+++ b/solr/get-help.md
@@ -0,0 +1 @@
+[the Solr Community](https://lucene.apache.org/solr/community.html)
diff --git a/solr/maintainer.md b/solr/maintainer.md
new file mode 100644
index 000000000000..ed83fa2f681e
--- /dev/null
+++ b/solr/maintainer.md
@@ -0,0 +1 @@
+[the Solr Community](%%GITHUB-REPO%%)
diff --git a/solr/user-feedback.md b/solr/user-feedback.md
deleted file mode 100644
index a0a4e676ec50..000000000000
--- a/solr/user-feedback.md
+++ /dev/null
@@ -1,9 +0,0 @@
-## Issues
-
-Please report issues with this docker image on this [Github project](https://github.com/docker-solr/docker-solr).
-
-For general questions about Solr, see the [Community information](http://lucene.apache.org/solr/resources.html#community), in particular the solr-user mailing list.
-
-## Contributing
-
-If you want to contribute to Solr, see the [Solr Resources](http://lucene.apache.org/solr/resources.html#community).
diff --git a/sonarqube/maintainer.md b/sonarqube/maintainer.md
new file mode 100644
index 000000000000..dfec9c386443
--- /dev/null
+++ b/sonarqube/maintainer.md
@@ -0,0 +1 @@
+[SonarSource](%%GITHUB-REPO%%)
diff --git a/sourcemage/maintainer.md b/sourcemage/maintainer.md
new file mode 100644
index 000000000000..ff8469c25b44
--- /dev/null
+++ b/sourcemage/maintainer.md
@@ -0,0 +1 @@
+[the Source Mage Community](%%GITHUB-REPO%%)
diff --git a/spiped/maintainer.md b/spiped/maintainer.md
new file mode 100644
index 000000000000..93f5277e713c
--- /dev/null
+++ b/spiped/maintainer.md
@@ -0,0 +1 @@
+[Tim Wolla (of the Docker Community)](%%GITHUB-REPO%%), [with Colin's support (from spiped upstream)](https://github.com/docker-library/official-images/pull/1714#issuecomment-219556607)
diff --git a/storm/maintainer.md b/storm/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/storm/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/swarm/maintainer.md b/swarm/maintainer.md
new file mode 120000
index 000000000000..617c4fb974a1
--- /dev/null
+++ b/swarm/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-docker.md
\ No newline at end of file
diff --git a/swift/maintainer.md b/swift/maintainer.md
new file mode 100644
index 000000000000..b6003eb31d28
--- /dev/null
+++ b/swift/maintainer.md
@@ -0,0 +1 @@
+[Haris and Thomas (of the Docker Community)](%%GITHUB-REPO%%), [with the approval of the Swift Project](https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20160118/000908.html)
diff --git a/telegraf/maintainer.md b/telegraf/maintainer.md
new file mode 120000
index 000000000000..4bee6ceacd5b
--- /dev/null
+++ b/telegraf/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-influxdata.md
\ No newline at end of file
diff --git a/thrift/maintainer.md b/thrift/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/thrift/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/tomcat/maintainer.md b/tomcat/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/tomcat/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/tomee/maintainer.md b/tomee/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/tomee/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/traefik/maintainer.md b/traefik/maintainer.md
new file mode 100644
index 000000000000..d8f08f538c68
--- /dev/null
+++ b/traefik/maintainer.md
@@ -0,0 +1 @@
+[the Træfik Project](%%GITHUB-REPO%%)
diff --git a/ubuntu/issues.md b/ubuntu/issues.md
new file mode 100644
index 000000000000..5b2c28a2f3ba
--- /dev/null
+++ b/ubuntu/issues.md
@@ -0,0 +1 @@
+[the cloud-images bug tracker](https://bugs.launchpad.net/cloud-images) (include the `docker` tag)
diff --git a/ubuntu/maintainer.md b/ubuntu/maintainer.md
new file mode 100644
index 000000000000..a6ead816ed37
--- /dev/null
+++ b/ubuntu/maintainer.md
@@ -0,0 +1 @@
+[Canonical](https://partner-images.canonical.com/core/) and [Tianon (Debian Developer)](%%GITHUB-REPO%%)
diff --git a/update.sh b/update.sh
index ec433013e6f6..0f0d50f72273 100755
--- a/update.sh
+++ b/update.sh
@@ -20,8 +20,6 @@ replace_field() {
 	sed -ri "s/${extraSed}%%${field}%%${extraSed}/$sed_escaped_value/g" "$repo/README.md"
 }
 
-dockerLatest="$(curl -fsSL 'https://get.docker.com/latest')"
-
 for repo in "${repos[@]}"; do
 	if [ -x "$repo/update.sh" ]; then
 		( set -x; "$repo/update.sh" )
@@ -29,10 +27,10 @@ for repo in "${repos[@]}"; do
 	
 	if [ -e "$repo/content.md" ]; then
 		githubRepo="$(cat "$repo/github-repo")"
+		maintainer="$(cat "$repo/maintainer.md")"
 		
-		dockerVersions="$(cat "$repo/docker-versions.md" 2>/dev/null || cat "$helperDir/docker-versions.md")"
-		
-		userFeedback="$(cat "$repo/user-feedback.md" 2>/dev/null || cat "$helperDir/user-feedback.md")"
+		issues="$(cat "$repo/issues.md" 2>/dev/null || cat "$helperDir/issues.md")"
+		getHelp="$(cat "$repo/get-help.md" 2>/dev/null || cat "$helperDir/get-help.md")"
 		
 		license="$(cat "$repo/license.md" 2>/dev/null || true)"
 		if [ "$license" ]; then
@@ -78,7 +76,7 @@ for repo in "${repos[@]}"; do
 			cat "$helperDir/template.md"
 		} > "$repo/README.md"
 		
-		echo '  TAGS => generate-dockerfile-links-partial.sh'
+		echo '  TAGS => generate-dockerfile-links-partial.sh "'"$repo"'"'
 		partial="$("$helperDir/generate-dockerfile-links-partial.sh" "$repo")"
 		[ "$partial" ]
 		replace_field "$repo" 'TAGS' "$partial"
@@ -99,17 +97,17 @@ for repo in "${repos[@]}"; do
 		echo '  COMPOSE-YML => '"$repo"'/docker-compose.yml'
 		replace_field "$repo" 'COMPOSE-YML' "$composeYml"
 		
-		echo '  DOCKER-VERSIONS => '"$repo"'/docker-versions.md'
-		replace_field "$repo" 'DOCKER-VERSIONS' "$dockerVersions"
-		
-		echo '  DOCKER-LATEST => "'"$dockerLatest"'"'
-		replace_field "$repo" 'DOCKER-LATEST' "$dockerLatest"
-		
 		echo '  LICENSE => '"$repo"'/license.md'
 		replace_field "$repo" 'LICENSE' "$license"
 		
-		echo '  USER-FEEDBACK => '"$repo"'/user-feedback.md'
-		replace_field "$repo" 'USER-FEEDBACK' "$userFeedback"
+		echo '  ISSUES => "'"$issues"'"'
+		replace_field "$repo" 'ISSUES' "$issues"
+		
+		echo '  GET-HELP => "'"$getHelp"'"'
+		replace_field "$repo" 'GET-HELP' "$getHelp"
+		
+		echo '  MAINTAINER => "'"$maintainer"'"'
+		replace_field "$repo" 'MAINTAINER' "$maintainer"
 		
 		echo '  REPO => "'"$repo"'"'
 		replace_field "$repo" 'REPO' "$repo"
diff --git a/vault/maintainer.md b/vault/maintainer.md
new file mode 120000
index 000000000000..ef4100e019a3
--- /dev/null
+++ b/vault/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-hashicorp.md
\ No newline at end of file
diff --git a/websphere-liberty/get-help.md b/websphere-liberty/get-help.md
new file mode 100644
index 000000000000..660b67c0de41
--- /dev/null
+++ b/websphere-liberty/get-help.md
@@ -0,0 +1 @@
+[the WASdev community](https://developer.ibm.com/wasdev/help/)
diff --git a/websphere-liberty/maintainer.md b/websphere-liberty/maintainer.md
new file mode 100644
index 000000000000..be8be6796644
--- /dev/null
+++ b/websphere-liberty/maintainer.md
@@ -0,0 +1 @@
+[the IBM WASdev Community](%%GITHUB-REPO%%)
diff --git a/websphere-liberty/user-feedback.md b/websphere-liberty/user-feedback.md
deleted file mode 100644
index ed551ebdd93a..000000000000
--- a/websphere-liberty/user-feedback.md
+++ /dev/null
@@ -1 +0,0 @@
-For issues relating specifically to this Docker image, please use the [GitHub issue tracker](https://github.com/WASdev/ci.docker/issues). For more general issues relating to IBM WebSphere Application Server Liberty you can [get help](https://developer.ibm.com/wasdev/help/) through the WASdev community. We welcome contributions following [our guidelines](https://github.com/WASdev/wasdev.github.io/blob/master/CONTRIBUTING.md).
diff --git a/wordpress/maintainer.md b/wordpress/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/wordpress/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file
diff --git a/xwiki/get-help.md b/xwiki/get-help.md
new file mode 100644
index 000000000000..c8769ff9fe46
--- /dev/null
+++ b/xwiki/get-help.md
@@ -0,0 +1 @@
+[the XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or [the XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC)
diff --git a/xwiki/issues.md b/xwiki/issues.md
new file mode 100644
index 000000000000..2f935e86eff1
--- /dev/null
+++ b/xwiki/issues.md
@@ -0,0 +1 @@
+[the XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER)
diff --git a/xwiki/mailing-list.md b/xwiki/mailing-list.md
deleted file mode 100644
index a457965066f1..000000000000
--- a/xwiki/mailing-list.md
+++ /dev/null
@@ -1 +0,0 @@
-For general questions about XWiki, see our [user mailing list](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists).
diff --git a/xwiki/maintainer.md b/xwiki/maintainer.md
new file mode 100644
index 000000000000..bd77401e2282
--- /dev/null
+++ b/xwiki/maintainer.md
@@ -0,0 +1 @@
+[the XWiki Community](%%GITHUB-REPO%%)
diff --git a/xwiki/user-feedback.md b/xwiki/user-feedback.md
deleted file mode 100644
index 7e5bba5a27d5..000000000000
--- a/xwiki/user-feedback.md
+++ /dev/null
@@ -1,12 +0,0 @@
-## Support
-
--	If you wish to raise an issue or an idea of improvement use [XWiki Docker JIRA project](http://jira.xwiki.org/browse/XDOCKER)
--	If you have questions, use the [XWiki Users Mailing List/Forum](http://dev.xwiki.org/xwiki/bin/view/Community/MailingLists) or use the [XWiki IRC channel](http://dev.xwiki.org/xwiki/bin/view/Community/IRC)
-
-## Contributing
-
--	If you wish to help out on the code, please send Pull Requests on [XWiki Docker GitHub project](%%GITHUB-REPO%%)
-
-## Documentation
-
-Documentation for this image is stored in the [`%%REPO%%/` directory](https://github.com/docker-library/docs/tree/master/%%REPO%%) of the [`docker-library/docs` GitHub repo](https://github.com/docker-library/docs). Be sure to familiarize yourself with the [repository's `README.md` file](https://github.com/docker-library/docs/blob/master/README.md) before attempting a pull request.
diff --git a/znc/maintainer.md b/znc/maintainer.md
new file mode 100644
index 000000000000..c5d29a4a9931
--- /dev/null
+++ b/znc/maintainer.md
@@ -0,0 +1 @@
+[the ZNC Community](%%GITHUB-REPO%%)
diff --git a/zookeeper/maintainer.md b/zookeeper/maintainer.md
new file mode 120000
index 000000000000..e727ff0696ae
--- /dev/null
+++ b/zookeeper/maintainer.md
@@ -0,0 +1 @@
+../.common-templates/maintainer-community.md
\ No newline at end of file