diff --git a/README.md b/README.md
index c142fbb53..0e63f59f3 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ evcc is an extensible EV Charge Controller with PV integration implemented in [G
 
 ## Getting Started
 
-You'll find everything you need in our [documentation](https://docs.evcc.io/) (German).
+You'll find everything you need in our [documentation](https://docs.evcc.io/).
 
 ## Contribute
 
diff --git a/cmd/configure/localization/en.toml b/cmd/configure/localization/en.toml
index 80f8d1d7a..c4effe763 100644
--- a/cmd/configure/localization/en.toml
+++ b/cmd/configure/localization/en.toml
@@ -57,9 +57,9 @@ TestingDevice_AddFailedUsage = "Testing of the {{ .Usage }} configuration of {{
 TestingMQTTFailed = "Testing the MQTT configuration failed. Do you want to repeat its configuration?"
 Requirements_Title = "The device has the following requirements:"
 Requirements_More = "Additional information:"
-Requirements_Sponsorship_Title = "This device requires evcc sponsorship. Check the following link for what this is and how it works: https://docs.evcc.io/docs/sponsorship"
-Requirements_Sponsorship_Optional_Title = "The development of evcc can be supported via sponsoring. Check the following link for what this is and how it works: https://docs.evcc.io/docs/sponsorship"
-Requirements_Sponsorship_Feature_Title = "To use this feature evcc sponsorship is required. Check the following link for what this is and how it works: https://docs.evcc.io/docs/sponsorship"
+Requirements_Sponsorship_Title = "This device requires evcc sponsorship. Check the following link for what this is and how it works: https://docs.evcc.io/en/docs/sponsorship"
+Requirements_Sponsorship_Optional_Title = "The development of evcc can be supported via sponsoring. Check the following link for what this is and how it works: https://docs.evcc.io/en/docs/sponsorship"
+Requirements_Sponsorship_Feature_Title = "To use this feature evcc sponsorship is required. Check the following link for what this is and how it works: https://docs.evcc.io/en/docs/sponsorship"
 Requirements_Sponsorship_Token = "Are you already a sponsor?"
 Requirements_Sponsorship_Token_Input = "Please enter the sponsorship token"
 Requirements_EEBUS_Cert_Error = "Error: The EEBUS certificate couldn't be created"
@@ -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/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/docs/\n"
 InputError = "An input error occurred:"
 Value_Choice = "Choose:"
 Value_Help = "Help:"
diff --git a/core/site.go b/core/site.go
index 829496532..26deef6d7 100644
--- a/core/site.go
+++ b/core/site.go
@@ -186,7 +186,7 @@ func NewSiteFromConfig(
 	}
 
 	if len(site.batteryMeters) > 0 && site.ResidualPower <= 0 {
-		site.log.WARN.Println("battery configured but residualPower is missing or <= 0 (add residualPower: 100 to site), see https://https://docs.evcc.io/docs/reference/configuration/site#residualpower")
+		site.log.WARN.Println("battery configured but residualPower is missing or <= 0 (add residualPower: 100 to site), see https://docs.evcc.io/en/docs/reference/configuration/site#residualpower")
 	}
 
 	// auxiliary meters
diff --git a/templates/definition/vehicle/tesla.yaml b/templates/definition/vehicle/tesla.yaml
index 0a09d60f1..b16be511a 100644
--- a/templates/definition/vehicle/tesla.yaml
+++ b/templates/definition/vehicle/tesla.yaml
@@ -26,13 +26,13 @@ params:
     required: true
     mask: true
     help:
-      en: "See https://docs.evcc.io/docs/devices/vehicles#tesla"
+      en: "See https://docs.evcc.io/en/docs/devices/vehicles#tesla"
       de: "Siehe https://docs.evcc.io/docs/devices/vehicles#tesla"
   - name: refreshToken
     required: true
     mask: true
     help:
-      en: "See https://docs.evcc.io/docs/devices/vehicles#tesla"
+      en: "See https://docs.evcc.io/en/docs/devices/vehicles#tesla"
       de: "Siehe https://docs.evcc.io/docs/devices/vehicles#tesla"
   - name: vin
     example: W...
diff --git a/util/templates/defaults.yaml b/util/templates/defaults.yaml
index 447ef9ffb..6fb5a26ba 100644
--- a/util/templates/defaults.yaml
+++ b/util/templates/defaults.yaml
@@ -209,7 +209,7 @@ params:
       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/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"
     type: stringlist
   - name: priority
     description: