diff --git a/Templates.md b/Templates.md
index ce8765d8..986be09e 100644
--- a/Templates.md
+++ b/Templates.md
@@ -1,6 +1,6 @@
 Starting with version **[6.4.1.16](https://github.com/arendst/Sonoff-Tasmota/commit/98ae3eaf547d69f3042cbf6ad6850de3965b7c6e)** Sonoff-Tasmota Modules can be extended by users using a **Template**. Version **[6.4.1.17](https://github.com/arendst/Sonoff-Tasmota/commit/577791440e2018308f27e4a01d698bab4661b44b)** introduced a menu to configure templates.
 
-These are intended to be an easy way for users to create and share configurations for devices that are unsupported in Sonoff-Tasmota but have common characteristics with existing modules. We encourage everyone who creates a template for a new unknown device to [add it to the database](https://blakadder.github.io/templates/) with an image of the device, links to the manufaturer or where it can be found and, of course, the template for it.
+These are intended to be an easy way for users to create and share configurations for devices that are unsupported in Sonoff-Tasmota but have common characteristics with existing modules. We encourage everyone who creates a template for a new unknown device to [add it to the wiki](https://github.com/arendst/Sonoff-Tasmota/wiki/User-created-templates) with an image of the device, links to the manufaturer or where it can be found and, of course, the template for it.
 
 To provide easy processing by Sonoff-Tasmota, a user template is written as a JSON text and could look like this:
 ```
@@ -54,7 +54,7 @@ Now that you've set up your previously unsupported device in Tasmota it is time
 MQT: stat/sonoff/RESULT = {"NAME":"RGB Smart Plug","GPIO":[37,0,39,0,38,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}
 ```
 
-Copy the string `{"NAME":"RGB Smart Plug","GPIO":[37,0,39,0,38,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}` and share it on our [device repository](https://blakadder.github.io/templates/) page.
+Copy the string `{"NAME":"RGB Smart Plug","GPIO":[37,0,39,0,38,134,0,0,131,17,132,21,0],"FLAG":0,"BASE":45}` and share it on our [User created templates](User-created-templates) page.
 
 ## Importing Templates