diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0d3904..c0c8102 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,7 +56,7 @@
 ## [1.15.0] - 2022-07-15
 
 ### Information
-🔓 **Encryption of API tokens** was added in [1.27.0](https://github.com/adriankumpf/teslamate/releases/tag/v1.27.0) of TeslaMate.
+🔓 **Encryption of API tokens** was added in [1.27.0](https://github.com/teslamate-org/teslamate/releases/tag/v1.27.0) of TeslaMate.
 You therefore need to adjust your TeslaMateApi deployment with the new added environment variables `ENCRYPTION_KEY`.
 The `ENCRYPTION_KEY` needs to have the same value as the key in the environment variables of your TeslaMate.
 
diff --git a/README.md b/README.md
index fcddab3..5398a74 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 [![GitHub license](https://img.shields.io/github/license/tobiasehlert/teslamateapi)](https://github.com/tobiasehlert/teslamateapi/blob/main/LICENSE)
 [![Docker pulls](https://img.shields.io/docker/pulls/tobiasehlert/teslamateapi)](https://hub.docker.com/r/tobiasehlert/teslamateapi)
 
-TeslaMateApi is a RESTful API to get data collected by self-hosted data logger **[TeslaMate](https://github.com/adriankumpf/teslamate)** in JSON.
+TeslaMateApi is a RESTful API to get data collected by self-hosted data logger **[TeslaMate](https://github.com/teslamate-org/teslamate)** in JSON.
 
 - Written in **[Golang](https://golang.org/)**
 - Data is collected from TeslaMate **Postgres** database and local **MQTT** Broker
diff --git a/src/CommandSupport.go b/src/CommandSupport.go
index 726cbca..a688eca 100644
--- a/src/CommandSupport.go
+++ b/src/CommandSupport.go
@@ -16,7 +16,7 @@ func initCommandAllowList() {
 	// generate map of all available commands
 	CommandList := make(map[string][]string)
 
-	// https://github.com/adriankumpf/teslamate/discussions/1433
+	// https://github.com/teslamate-org/teslamate/discussions/1433
 	CommandList["COMMANDS_LOGGING"] = []string{
 		"/logging/resume",
 		"/logging/suspend",