diff --git a/README.md b/README.md
index 2f07e6b..3469023 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Then, you need to restart the webserver and from now on, every cookies you have
 
 # Python client
 
-You can use `pylookyloo` as a standalone script, or as a library, [more details here](https://github.com/CIRCL/lookyloo/tree/master/client)
+You can use `pylookyloo` as a standalone script, or as a library, [more details here](https://github.com/Lookyloo/lookyloo/tree/master/client)
 
 # Installation
 
@@ -82,7 +82,7 @@ cd ..
 ## Installation of Lookyloo
 
 ```bash
-git clone https://github.com/CIRCL/lookyloo.git
+git clone https://github.com/Lookyloo/lookyloo.git
 cd lookyloo
 poetry install
 echo LOOKYLOO_HOME="'`pwd`'" > .env
@@ -138,9 +138,9 @@ Now, you should configure [TLS (let's encrypt and so on)](https://www.digitaloce
 Aquarium is a haproxy + splash bundle that will allow lookyloo to be used by more than one user at once.
 
 The initial version of the project was created by [TeamHG-Memex](https://github.com/TeamHG-Memex/aquarium) but
-we have a [dedicated repository](https://github.com/circl/aquarium) that fits our needs better.
+we have a [dedicated repository](https://github.com/Lookyloo/aquarium) that fits our needs better.
 
-Follow [the documentation](https://github.com/CIRCL/aquarium/blob/master/README.rst) if you want to use it.
+Follow [the documentation](https://github.com/Lookyloo/aquarium/blob/master/README.rst) if you want to use it.
 
 
 # Run the app with a simple docker setup
diff --git a/client/README.md b/client/README.md
index 520b39b..b5f2499 100644
--- a/client/README.md
+++ b/client/README.md
@@ -1,6 +1,6 @@
 # PyLookyloo
 
-This is the client API for [Lookyloo](https://github.com/CIRCL/lookyloo).
+This is the client API for [Lookyloo](https://github.com/Lookyloo/lookyloo).
 
 ## Installation
 
diff --git a/client/setup.py b/client/setup.py
index 601706c..bd42af6 100644
--- a/client/setup.py
+++ b/client/setup.py
@@ -8,7 +8,7 @@ setup(
     author='Raphaël Vinot',
     author_email='raphael.vinot@circl.lu',
     maintainer='Raphaël Vinot',
-    url='https://github.com/CIRCL/lookyloo/client',
+    url='https://github.com/Lookyloo/lookyloo/client',
     description='Python client for Lookyloo',
     packages=['pylookyloo'],
     entry_points={"console_scripts": ["lookyloo = pylookyloo:main"]},
diff --git a/setup.py b/setup.py
index 591379a..83ed17c 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     author='Raphaël Vinot',
     author_email='raphael.vinot@circl.lu',
     maintainer='Raphaël Vinot',
-    url='https://github.com/CIRCL/lookyloo',
+    url='https://github.com/Lookyloo/lookyloo',
     description='Web interface to track the trackers.',
     packages=['lookyloo'],
     scripts=['bin/start_website.py', 'bin/start.py', 'bin/run_backend.py', 'bin/async_scrape.py',