diff --git a/docs/citus-quickstart.rst b/docs/citus-quickstart.rst
index 01c297a6f..e0e2868b7 100644
--- a/docs/citus-quickstart.rst
+++ b/docs/citus-quickstart.rst
@@ -41,7 +41,7 @@ or run the docker build command directly:
 
 ::
 
-   $ git clone https://github.com/citusdata/pg_auto_failover
+   $ git clone https://github.com/hapostgres/pg_auto_failover
    $ cd pg_auto_failover/docs/cluster
 
    $ docker build -t pg_auto_failover:citus -f Dockerfile ../..
diff --git a/docs/faq.rst b/docs/faq.rst
index e870153b7..876dad748 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -5,7 +5,7 @@ Those questions have been asked in `GitHub issues`__ for the project by
 several people. If you have more questions, feel free to open a new issue,
 and your question and its answer might make it to this FAQ.
 
-__ https://github.com/citusdata/pg_auto_failover/issues_
+__ https://github.com/hapostgres/pg_auto_failover/issues
 
 I stopped the primary and no failover is happening for 20s to 30s, why?
 -----------------------------------------------------------------------
diff --git a/docs/index.rst b/docs/index.rst
index ecb04777f..4e8d8481e 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -7,7 +7,7 @@ Welcome to pg_auto_failover's documentation!
 ============================================
 
 The pg_auto_failover project is an Open Source Software project. The
-development happens at `https://github.com/citusdata/pg_auto_failover`__ and
+development happens at `https://github.com/hapostgres/pg_auto_failover`__ and
 is public: everyone is welcome to participate by opening issues or pull
 requests, giving feedback, etc.
 
@@ -16,7 +16,7 @@ command, then read the entire available documentation (after all, I took the
 time to write it), and then to address the community in a kind and polite
 way — the same way you would expect people to use when addressing you.
 
-__ https://github.com/citusdata
+__ https://github.com/hapostgres/pg_auto_failover
 
 .. note::
 
diff --git a/docs/tutorial.rst b/docs/tutorial.rst
index 3cb88b0cb..2217d7bb5 100644
--- a/docs/tutorial.rst
+++ b/docs/tutorial.rst
@@ -41,7 +41,7 @@ or run the docker build command directly:
 
 ::
 
-   $ git clone https://github.com/citusdata/pg_auto_failover
+   $ git clone https://github.com/hapostgres/pg_auto_failover
    $ cd pg_auto_failover/docs/tutorial
    $ docker compose build
 
diff --git a/src/bin/pg_autoctl/keeper.c b/src/bin/pg_autoctl/keeper.c
index 2196e2ecb..6315cd00b 100644
--- a/src/bin/pg_autoctl/keeper.c
+++ b/src/bin/pg_autoctl/keeper.c
@@ -128,7 +128,7 @@ keeper_update_state(Keeper *keeper, int64_t node_id, int group_id,
 		log_fatal("Current node id does not fit in a 32 bits integer.");
 		log_info("Please report a bug to pg_auto_failover by opening "
 				 "an issue on Github project at "
-				 "https://github.com/citusdata/pg_auto_failover.");
+				 "https://github.com/hapostgres/pg_auto_failover.");
 		return false;
 	}
 
@@ -1071,7 +1071,7 @@ keeper_maintain_replication_slots(Keeper *keeper)
 	 *
 	 * In Postgres 11 and 12, the pg_replication_slot_advance() function has
 	 * been buggy for quite some time and prevented WAL recycling on standby
-	 * servers, see https://github.com/citusdata/pg_auto_failover/issues/283
+	 * servers, see https://github.com/hapostgres/pg_auto_failover/issues/283
 	 * for the problem and
 	 * https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=b48df81
 	 * for the solution.
diff --git a/src/bin/pg_autoctl/pgsetup.c b/src/bin/pg_autoctl/pgsetup.c
index 2f6f7b665..5554d0344 100644
--- a/src/bin/pg_autoctl/pgsetup.c
+++ b/src/bin/pg_autoctl/pgsetup.c
@@ -1859,7 +1859,7 @@ pgsetup_sslmode_to_string(SSLMode sslMode)
  * In Postgres 11 and 12, the pg_replication_slot_advance() function has been
  * buggy and prevented WAL recycling on standby nodes.
  *
- * See https://github.com/citusdata/pg_auto_failover/issues/283 for the problem
+ * See https://github.com/hapostgres/pg_auto_failover/issues/283 for the problem
  * and https://git.postgresql.org/gitweb/?p=postgresql.git;a=commit;h=b48df81
  * for the solution.
  *