diff --git a/build/Dockerfile.cloudrun b/build/Dockerfile.cloudrun
index 79d78ed8..722e879a 100644
--- a/build/Dockerfile.cloudrun
+++ b/build/Dockerfile.cloudrun
@@ -9,7 +9,7 @@ USER root
 
 # For security reasons, the non-root user gotenberg does not own the Tini binary by default.
 # However, some providers like Cloud Run from Google Cloud cannot start a Docker container in that case.
-# See https://github.com/thecodingmachine/gotenberg/issues/90#issuecomment-543551353.
+# See https://github.com/gotenberg/gotenberg/issues/90#issuecomment-543551353.
 RUN chown gotenberg: /usr/bin/tini
 
 USER gotenberg
diff --git a/pkg/modules/api/context.go b/pkg/modules/api/context.go
index 3a9cc9f1..88fb79c3 100644
--- a/pkg/modules/api/context.go
+++ b/pkg/modules/api/context.go
@@ -124,8 +124,8 @@ func newContext(echoCtx echo.Context, logger *zap.Logger, timeout time.Duration)
 
 	copyToDisk := func(fh *multipart.FileHeader) error {
 		// Avoid directory traversal and normalize filename.
-		// See https://github.com/thecodingmachine/gotenberg/issues/104.
-		// See https://github.com/thecodingmachine/gotenberg/issues/228.
+		// See https://github.com/gotenberg/gotenberg/issues/104.
+		// See https://github.com/gotenberg/gotenberg/issues/228.
 		t := transform.Chain(norm.NFD, runes.Remove(runes.In(unicode.Mn)), norm.NFC)
 
 		filename, _, err := transform.String(t, strings.ToLower(filepath.Base(fh.Filename)))
diff --git a/pkg/modules/api/formdata.go b/pkg/modules/api/formdata.go
index 89732ff2..c4260a36 100644
--- a/pkg/modules/api/formdata.go
+++ b/pkg/modules/api/formdata.go
@@ -297,14 +297,14 @@ func (form *FormData) MandatoryPaths(extensions []string, target *[]string) *For
 func (form *FormData) paths(extensions []string, target *[]string) *FormData {
 	for filename, path := range form.files {
 		for _, ext := range extensions {
-			// See https://github.com/thecodingmachine/gotenberg/issues/228.
+			// See https://github.com/gotenberg/gotenberg/issues/228.
 			if strings.ToLower(filepath.Ext(filename)) == ext {
 				*target = append(*target, path)
 			}
 		}
 	}
 
-	// See https://github.com/thecodingmachine/gotenberg/issues/139.
+	// See https://github.com/gotenberg/gotenberg/issues/139.
 	sort.Strings(*target)
 
 	return form
diff --git a/pkg/modules/libreoffice/unoconv/unoconv.go b/pkg/modules/libreoffice/unoconv/unoconv.go
index b5841f59..9019d282 100644
--- a/pkg/modules/libreoffice/unoconv/unoconv.go
+++ b/pkg/modules/libreoffice/unoconv/unoconv.go
@@ -166,7 +166,7 @@ func (mod Unoconv) PDF(ctx context.Context, logger *zap.Logger, inputPath, outpu
 	err = cmd.Exec()
 
 	// Always remove the user profile directory created by LibreOffice.
-	// See https://github.com/thecodingmachine/gotenberg/issues/192.
+	// See https://github.com/gotenberg/gotenberg/issues/192.
 	go func() {
 		logger.Debug(fmt.Sprintf("remove user profile directory '%s'", userProfileDirPath))