diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 721985b6b..9ce286d4b 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,4 +2,4 @@ Submit a new issue only if you are sure it is a missing feature or a bug. Otherw
 
 Before creating an issue also make sure to read our [contributing guide](https://github.com/komoot/photon/blob/master/.github/CONTRIBUTING.md).
 
-The best way to get help about a Photon issue is to create a valid and detailed issue content, preferable with a unit or integration test reproducing the issue. Please include the version of Photon, the JVM and the operating system are you using and in case of a geocoding problem include a link to [komoot's photon instance](https://photon.komoot.de/). Also tell us your expected geocoding result.
+The best way to get help about a Photon issue is to create a valid and detailed issue content, preferable with a unit or integration test reproducing the issue. Please include the version of Photon, the JVM and the operating system are you using and in case of a geocoding problem include a link to [komoot's photon instance](https://photon.komoot.io/). Also tell us your expected geocoding result.
diff --git a/README.md b/README.md
index 430880ed2..d12062b19 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 _photon_ is an open source geocoder built for [OpenStreetMap](https://openstreetmap.org) data. It is based on [elasticsearch](http://elasticsearch.org/) - an efficient, powerful and highly scalable search platform.
 
-_photon_ was started by [komoot](http://www.komoot.de) and provides search-as-you-type and multilingual support. It's used in production with thousands of requests per minute at [www.komoot.de](http://www.komoot.de). Find our public API and demo on [photon.komoot.de](http://photon.komoot.de).
+_photon_ was started by [komoot](http://www.komoot.de) and provides search-as-you-type and multilingual support. It's used in production with thousands of requests per minute at [www.komoot.de](http://www.komoot.de). Find our public API and demo on [photon.komoot.io](http://photon.komoot.io). Until October 2020 the API was available under photon.komoot.**de**. Requests still work as they redirected but please update your apps accordingly.
 
 ### Contribution
 
diff --git a/website/Readme.md b/website/Readme.md
index b8b2302bd..0cebcd07d 100644
--- a/website/Readme.md
+++ b/website/Readme.md
@@ -1,4 +1,4 @@
-## Website for photon.komoot.de
+## Website for photon.komoot.io
 
 This directory contains the website for photon's home page.
 
diff --git a/website/photon/index.html b/website/photon/index.html
index 7f43b1408..615593e10 100644
--- a/website/photon/index.html
+++ b/website/photon/index.html
@@ -80,27 +80,27 @@ <h2>A simple API</h2>
             <ul>
                 <li>
                     <h4>Search</h4>
-                    <pre>photon.komoot.de/api/?<strong>q=berlin</strong></pre>
+                    <pre>photon.komoot.io/api/?<strong>q=berlin</strong></pre>
                 </li>
                 <li>
                     <h4>Search, with priority to a geo position</h4>
-                    <pre>photon.komoot.de/api/?q=berlin&amp;<strong>lat=52.3879&amp;lon=13.0582</strong></pre>
+                    <pre>photon.komoot.io/api/?q=berlin&amp;<strong>lat=52.3879&amp;lon=13.0582</strong></pre>
                 </li>
                 <li>
                     <h4>Limit number of results</h4>
-                    <pre>photon.komoot.de/api/?q=berlin&amp;<strong>limit=1</strong></pre>
+                    <pre>photon.komoot.io/api/?q=berlin&amp;<strong>limit=1</strong></pre>
                 </li>
                 <li>
                     <h4>Force preferred language</h4>
-                    <pre>photon.komoot.de/api/?q=berlin&amp;<strong>lang=de</strong></pre>
+                    <pre>photon.komoot.io/api/?q=berlin&amp;<strong>lang=de</strong></pre>
                 </li>
                 <li>
                     <h4>Reverse geocoding</h4>
-                    <pre>photon.komoot.de/reverse?lon=10&lat=52</pre>
+                    <pre>photon.komoot.io/reverse?lon=10&lat=52</pre>
                 </li>
                 <li>
                     <h4>All good GeoJSON</h4>
-  <pre>
+                    <pre>
   {
     "type": "FeatureCollection",
     "features": [
@@ -137,6 +137,16 @@ <h4>All good GeoJSON</h4>
   }
   </pre>
                 </li>
+
+                <li>
+                    <h4>Note:</h4>
+                    <p style="color: #444">
+                        Until October 2020 the API was available under photon.komoot.<span
+                            style="color: #EC6F33; font-weight: bold">de</span>.
+                        Requests still work as they redirected to photon.komoot.<span
+                            style="color: #EC6F33; font-weight: bold">io</span> but please update your apps accordingly.
+                    </p>
+                </li>
             </ul>
         </div>
     </div>