diff --git a/source/_redirects b/source/_redirects
index 1bdd670861c..ce55007e0cb 100644
--- a/source/_redirects
+++ b/source/_redirects
@@ -128,17 +128,21 @@ layout: null
 /components/cover.mqtt /integrations/cover.mqtt
 /components/cover.mysensors /integrations/mysensors#cover
 /components/cover.template /integrations/template/#cover
+/integrations/cover.template /integrations/template/#cover
 /components/device_tracker.mqtt /integrations/device_tracker.mqtt
 /components/device_tracker.mysensors /integrations/mysensors#device-tracker
 /components/fan.mqtt /integrations/fan.mqtt
-/components/fan.template /integrations/template/#fan
+/components/fan.template /integrations/cover.template
+/integrations/fan.template /integrations/template/#fan
 /components/light.group /integrations/light.group
 /components/light.mqtt /integrations/light.mqtt
 /components/light.mysensors /integrations/mysensors#light
 /components/light.switch /integrations/light.switch
-/components/light.template /integrations/template/#light
+/components/light.template /integrations/light.template
+/integrations/light.template /integrations/template/#light
 /components/lock.mqtt /integrations/lock.mqtt
-/components/lock.template /integrations/template/#lock
+/components/lock.template /integrations/lock.template
+/integrations/lock.template /integrations/template/#lock
 /components/notify.command_line /integrations/notify.command_line
 /components/notify.group /integrations/notify.group
 /components/notify.mysensors /integrations/mysensors#notify
@@ -151,18 +155,20 @@ layout: null
 /components/switch.mqtt /integrations/switch.mqtt
 /components/switch.mysensors /integrations/mysensors#switch
 /components/switch.rest /integrations/switch.rest
-/components/switch.template /integrations/template/#switch
+/components/switch.template /integrations/switch.template
+/integrations/switch.template /integrations/template/#switch
 /components/telegram_bot.broadcast /integrations/telegram_broadcast
 /components/telegram_bot.polling /integrations/telegram_polling
 /components/telegram_bot.webhooks /integrations/telegram_webhooks
 /components/vacuum.mqtt /integrations/vacuum.mqtt
-/components/vacuum.template /integrations/template/#vacuum
+/components/vacuum.template /integrations/vacuum.template
+/integrations/vacuum.template /integrations/template/#vacuum
 /integrations/binary_sensor.group /integrations/group
 /integrations/binary_sensor.knx /integrations/knx#binary-sensor
 /integrations/binary_sensor.modbus /integrations/modbus/#configuring-binary-sensor-entities
 /integrations/binary_sensor.mysensors /integrations/mysensors#binary-sensor
 /integrations/binary_sensor.rflink /integrations/rflink/#binary-sensor
-/integrations/binary_sensor.template /integrations/template/#binary-sensor
+/integrations/binary_sensor.template /integrations/template/#binary_sensor
 /integrations/binary_sensor.xiaomi_aqara/ /integrations/xiaomi_aqara/#binary-sensor
 /integrations/climate.knx /integrations/knx#climate
 /integrations/climate.modbus/ /integrations/modbus/#configuring-climate-entities