diff --git a/assets/js/components/Savings.vue b/assets/js/components/Savings.vue
index 66e0496d1..21fb7d46f 100644
--- a/assets/js/components/Savings.vue
+++ b/assets/js/components/Savings.vue
@@ -172,7 +172,7 @@
 									</div>
 									<div v-if="!priceConfigured || !co2Configured">
 										<a
-											href="https://docs.evcc.io/en/docs/reference/configuration/tariffs/"
+											href="https://docs.evcc.io/en/docs/reference/configuration/tariffs"
 											class="evcc-gray"
 											target="_blank"
 										>
diff --git a/cmd/configure/localization/de.toml b/cmd/configure/localization/de.toml
index 598e31fca..f6bbf0801 100644
--- a/cmd/configure/localization/de.toml
+++ b/cmd/configure/localization/de.toml
@@ -69,7 +69,7 @@ Config_ModbusInterface = "Wähle die ModBus Schnittstelle aus"
 Config_AddAnotherValue = "Möchtest du einen weiteren Wert hinzufügen?"
 Config_Yes = "Ja"
 Config_No = "Nein"
-Cancel = "Die Konfiguration wurde abgebrochen.\n\nFalls diese geführte Konfiguration für dich noch nicht funktioniert, versuche es doch mal mit der manuellen Konfiguration. Details findest du auf der folgenden Webseite: https://docs.evcc.io/docs/\n"
+Cancel = "Die Konfiguration wurde abgebrochen.\n\nFalls diese geführte Konfiguration für dich noch nicht funktioniert, versuche es doch mal mit der manuellen Konfiguration. Details findest du auf der folgenden Webseite: https://docs.evcc.io \n"
 InputError = "Bei der Eingabe ist ein Fehler aufgetreten:"
 Value_Choice = "Auswahl:"
 Value_Help = "Hilfe:"
diff --git a/cmd/configure/localization/en.toml b/cmd/configure/localization/en.toml
index c4effe763..4205a1a9d 100644
--- a/cmd/configure/localization/en.toml
+++ b/cmd/configure/localization/en.toml
@@ -69,7 +69,7 @@ Config_ModbusInterface = "Choose the ModBus interface"
 Config_AddAnotherValue = "Do you want to add another value?"
 Config_Yes = "Yes"
 Config_No = "No"
-Cancel = "The configuration was cancelled.\n\nIf this guided configuration process doesn't work for you, please try the manual configuration. You can find more details about that on our website: https://docs.evcc.io/en/docs/\n"
+Cancel = "The configuration was cancelled.\n\nIf this guided configuration process doesn't work for you, please try the manual configuration. You can find more details about that on our website: https://docs.evcc.io/en/ \n"
 InputError = "An input error occurred:"
 Value_Choice = "Choose:"
 Value_Help = "Help:"
diff --git a/templates/definition/charger/go-e-v3.yaml b/templates/definition/charger/go-e-v3.yaml
index 10c8de971..4b1308384 100644
--- a/templates/definition/charger/go-e-v3.yaml
+++ b/templates/definition/charger/go-e-v3.yaml
@@ -19,7 +19,7 @@ requirements:
       For 1P/3P-Phase switching the HTTP API v2 in the charger setup needs to be activated.
 
       The “simulate unplugging” option should be activated in the Go-E app ("Car" menu item).
-  uri: https://docs.evcc.io/docs/devices/chargers#go-echarger
+  uri: https://docs.evcc.io/docs/devices/chargers#go-e
   evcc: ["sponsorship"]
 params:
   - name: host
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 0f76b31c7..58103ae7d 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -207,8 +207,8 @@ params:
       de: Identifikation
       en: Identification
     help:
-      de: "Kann meist erst später eingetragen werden, siehe: https://docs.evcc.io/docs/guides/vehicles/#erkennung-des-fahrzeugs-an-der-wallbox"
-      en: "Mostly this can be added later, see: https://docs.evcc.io/en/docs/guides/vehicles/#determining-which-vehicle-is-at-which-charger"
+      de: "Kann meist erst später eingetragen werden, siehe: https://docs.evcc.io/docs/features/vehicle"
+      en: "Mostly this can be added later, see: https://docs.evcc.io/en/docs/features/vehicle"
     type: stringlist
   - name: priority
     description: