diff --git a/.github/workflows/github-actions-main.yml b/.github/workflows/github-actions-main.yml
index 10bf4bb822..b8f3a10e94 100644
--- a/.github/workflows/github-actions-main.yml
+++ b/.github/workflows/github-actions-main.yml
@@ -97,7 +97,7 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
-          SERVER_REPOSITORY: joplin/server
+          SERVER_REPOSITORY: laurent22/joplin-server
           SERVER_TAG_PREFIX: server
         run: |
           "${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
@@ -122,7 +122,7 @@ jobs:
         env:
           IS_CONTINUOUS_INTEGRATION: 1
           BUILD_SEQUENCIAL: 1
-          SERVER_REPOSITORY: joplin/server
+          SERVER_REPOSITORY: laurent22/joplin-server
           SERVER_TAG_PREFIX: server
         run: |
           yarn install && cd packages/app-desktop && yarn run dist --publish=never
@@ -166,8 +166,8 @@ jobs:
           BUILD_SEQUENCIAL: 1
         run: |
           yarn install
-          yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
+          yarn run buildServerDocker --tag-name server-v0.0.0 --repository laurent22/joplin-server
 
           # Basic test to ensure that the created build is valid. It should exit with
           # code 0  if it works.
-          docker run joplin/server:0.0.0-beta node dist/app.js migrate list
+          docker run laurent22/joplin-server:0.0.0-beta node dist/app.js migrate list
diff --git a/docker-compose.server.yml b/docker-compose.server.yml
index 04d220f7af..fc84de2bee 100644
--- a/docker-compose.server.yml
+++ b/docker-compose.server.yml
@@ -30,7 +30,7 @@ services:
             - POSTGRES_USER=${POSTGRES_USER}
             - POSTGRES_DB=${POSTGRES_DATABASE}
     app:
-        image: joplin/server:latest
+        image: laurent22/joplin-server:latest
         depends_on:
             - db
         ports:
diff --git a/packages/server/README.md b/packages/server/README.md
index 74cd6f3c85..91696eb913 100644
--- a/packages/server/README.md
+++ b/packages/server/README.md
@@ -12,7 +12,7 @@
 3. Run the following command to test starting the server using the default configuration:
 
 ```shell
-docker run --env-file .env -p 22300:22300 joplin/server:latest
+docker run --env-file .env -p 22300:22300 laurent22/joplin-server:latest
 ```
 
 The server will listen on port **22300** on **localhost**. By default, the server will use SQLite, which allows you to test the app without setting up a database. When running the server for production use, you should connect the container to a database, as described below.
diff --git a/packages/tools/tagServerLatest.ts b/packages/tools/tagServerLatest.ts
index e744ef1553..ea47c7ef92 100644
--- a/packages/tools/tagServerLatest.ts
+++ b/packages/tools/tagServerLatest.ts
@@ -6,9 +6,9 @@ async function main() {
 
 	const version = argv._[0];
 
-	await execCommand2(`docker pull "joplin/server:${version}"`);
-	await execCommand2(`docker tag "joplin/server:${version}" "joplin/server:latest"`);
-	await execCommand2('docker push joplin/server:latest');
+	await execCommand2(`docker pull "laurent22/joplin-server:${version}"`);
+	await execCommand2(`docker tag "laurent22/joplin-server:${version}" "laurent22/joplin-server:latest"`);
+	await execCommand2('docker push laurent22/joplin-server:latest');
 }
 
 if (require.main === module) {