diff --git a/elasticsearch/deprecated.md b/elasticsearch/deprecated.md
index f5df9a2dc..b6a03d638 100644
--- a/elasticsearch/deprecated.md
+++ b/elasticsearch/deprecated.md
@@ -1,3 +1,3 @@
-This image is officially deprecated in favor of [the `elasticsearh` image provided by elastic.co](https://www.elastic.co/guide/en/elasticsearch/reference/5.2/docker.html) which is available to pull via `docker.elastic.co/elasticsearch/elasticsearch:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
+This image is officially deprecated in favor of [the `elasticsearch` image provided by elastic.co](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html) which is available to pull via `docker.elastic.co/elasticsearch/elasticsearch:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
 
-The team at Elastic.co prefer to offer Docker images on their infrastructure rather than through the "Official Images" program and the images are fully supported by them through their subscription program. You can also reach the community on the [forums](https://discuss.elastic.co/c/elasticsearch).
+Elastic provides open-source support for Elasticsearch via the [elastic/elasticsearch GitHub repository](https://github.com/elastic/elasticsearch) and the Docker image via the [elastic/elasticsearch-docker GitHub repository](https://github.com/elastic/elasticsearch-docker), as well as community support via its [forums](https://discuss.elastic.co/c/elasticsearch).
diff --git a/kibana/deprecated.md b/kibana/deprecated.md
index a588b8176..fbdf6e54e 100644
--- a/kibana/deprecated.md
+++ b/kibana/deprecated.md
@@ -1,3 +1,3 @@
-This image is officially deprecated in favor of [the `kibana` image provided by elastic.co](https://www.elastic.co/guide/en/kibana/5.2/_pulling_the_image.html) which is available to pull via `docker.elastic.co/kibana/kibana:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
+This image is officially deprecated in favor of [the `kibana` image provided by elastic.co](https://www.elastic.co/guide/en/kibana/current/_pulling_the_image.html) which is available to pull via `docker.elastic.co/kibana/kibana:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
 
-The team at Elastic.co prefer to offer Docker images on their infrastructure rather than through the "Official Images" program and the images are fully supported by them through their subscription program. You can also reach the community on the [forums](https://discuss.elastic.co/c/kibana).
+Elastic provides open-source support for Kibana via the [elastic/kibana GitHub repository](https://github.com/elastic/kibana) and the Docker image via the [elastic/kibana-docker GitHub repository](https://github.com/elastic/kibana-docker), as well as community support via its [forums](https://discuss.elastic.co/c/kibana).
diff --git a/logstash/deprecated.md b/logstash/deprecated.md
index 60b265212..f2a908e2b 100644
--- a/logstash/deprecated.md
+++ b/logstash/deprecated.md
@@ -1,3 +1,3 @@
-This image is officially deprecated in favor of [the `logstash` image provided by elastic.co](https://www.elastic.co/guide/en/logstash/5.2/docker.html) which is available to pull via `docker.elastic.co/logstash/logstash:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
+This image is officially deprecated in favor of [the `logstash` image provided by elastic.co](https://www.elastic.co/guide/en/logstash/current/docker.html) which is available to pull via `docker.elastic.co/logstash/logstash:[version]` like `5.2.1`. This image will receive no further updates after 2017-06-20 (June 20, 2017). Please adjust your usage accordingly.
 
-The team at Elastic.co prefer to offer Docker images on their infrastructure rather than through the "Official Images" program and the images are fully supported by them through their subscription program. You can also reach the community on the [forums](https://discuss.elastic.co/c/logstash).
+Elastic provides open-source support for Logstash via the [elastic/logstash GitHub repository](https://github.com/elastic/logstash) and the Docker image via the [elastic/logstash-docker GitHub repository](https://github.com/elastic/logstash-docker), as well as community support via its [forums](https://discuss.elastic.co/c/logstash).