diff --git a/README.md b/README.md
index e6a2e9b66..23b5d944c 100644
--- a/README.md
+++ b/README.md
@@ -373,9 +373,9 @@ See more at [http://operational-transformation.github.io/](http://operational-tr
 
 [matrix.org-image]: https://img.shields.io/badge/Matrix.org-%23CodiMD@matrix.org-green.svg
 [matrix.org-url]: https://riot.im/app/#/room/#codimd:matrix.org
-[travis-image]: https://travis-ci.org/hackmdio/codimd.svg?branch=master
-[travis-url]: https://travis-ci.org/hackmdio/codimd
-[github-version-badge]: https://img.shields.io/github/release/hackmdio/codimd.svg
+[travis-image]: https://travis-ci.org/codimd/server.svg?branch=master
+[travis-url]: https://travis-ci.org/codimd/server
+[github-version-badge]: https://img.shields.io/github/release/codimd/server.svg
 [github-release-page]: https://github.com/codimd/server/releases
 [github-release-feed]: https://github.com/codimd/server/releases.atom
 [poeditor-image]: https://img.shields.io/badge/POEditor-translate-blue.svg
diff --git a/docs/guides/s3-image-upload.md b/docs/guides/s3-image-upload.md
index dc5e420d2..40ab868a6 100644
--- a/docs/guides/s3-image-upload.md
+++ b/docs/guides/s3-image-upload.md
@@ -76,7 +76,7 @@
     }
     ```
 
-9. In additional to edit `config.json` directly, you could also try [environment variable](https://github.com/hackmdio/hackmd#environment-variables-will-overwrite-other-server-configs).
+9. In additional to edit `config.json` directly, you could also try [environment variable](https://github.com/codimd/server#environment-variables-will-overwrite-other-server-configs).
 
 ## Related Tools