diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9b6df4bf..cba3e86f 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,51 +1,51 @@
 name: Tests
 
 on:
-    push:
-        branches: ["*"]
-    pull_request:
-        # The branches below must be a subset of the branches above
-        branches: ["main"]
+  push:
+    branches: ["*"]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: ["main"]
 
 jobs:
-    tests:
-        runs-on: ubuntu-latest
-        services:
-            postgres:
-                image: ghcr.io/lysand-org/postgres:main
-                ports:
-                    - 5432:5432
-                env:
-                    POSTGRES_DB: versia
-                    POSTGRES_USER: versia
-                    POSTGRES_PASSWORD: versia
-                volumes:
-                    - versia-data:/var/lib/postgresql/data
-                options: --health-cmd pg_isready
-                    --health-interval 10s
-                    --health-timeout 5s
-                    --health-retries 5
-        permissions:
-            contents: read
-            security-events: write
-            actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-              with:
-                submodules: recursive
+  tests:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: ghcr.io/versia-pub/postgres:main
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_DB: versia
+          POSTGRES_USER: versia
+          POSTGRES_PASSWORD: versia
+        volumes:
+          - versia-data:/var/lib/postgresql/data
+        options: --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+    permissions:
+      contents: read
+      security-events: write
+      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
 
-            - name: Setup Bun
-              uses: oven-sh/setup-bun@v2
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
 
-            - name: Install NPM packages
-              run: |
-                  bun install
+      - name: Install NPM packages
+        run: |
+          bun install
 
-            - name: Move workflow config to config folder
-              run: |
-                  mv .github/config.workflow.toml config/config.toml
+      - name: Move workflow config to config folder
+        run: |
+          mv .github/config.workflow.toml config/config.toml
 
-            - name: Run tests
-              run: |
-                  bun test
+      - name: Run tests
+        run: |
+          bun test
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a3ed9a8..419030f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Versia Server `0.7.0` is backwards compatible with `0.6.0`. However, some new fe
 ## Features
 
 - Upgrade Bun to `1.1.25`. This brings performance upgrades and better stability.
-- Added support for the [ActivityPub Federation Bridge](https://github.com/lysand-org/activitypub).
+- Added support for the [ActivityPub Federation Bridge](https://github.com/versia-pub/activitypub).
 - Added support for the [Sonic](https://github.com/valeriansaliou/sonic) search indexer.
 - Note deletions are now federated.
 - Note edits are now federated.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c067c9f0..fe9ef0c8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,7 +28,7 @@ curl -fsSL https://bun.sh/install | bash
 1. Clone this repository
 
 ```bash
-git clone https://github.com/lysand-org/server.git
+git clone https://github.com/versia-pub/server.git
 ```
 
 2. Install the dependencies
diff --git a/Dockerfile b/Dockerfile
index ee529257..dc244f14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ COPY --from=build /temp/dist /app/dist
 COPY entrypoint.sh /app
 
 LABEL org.opencontainers.image.authors="Gaspard Wierzbinski (https://cpluspatch.dev)"
-LABEL org.opencontainers.image.source="https://github.com/lysand-org/server"
+LABEL org.opencontainers.image.source="https://github.com/versia-pub/server"
 LABEL org.opencontainers.image.vendor="Versia Pub"
 LABEL org.opencontainers.image.licenses="AGPL-3.0-or-later"
 LABEL org.opencontainers.image.title="Versia Server"
diff --git a/api/api/v2/instance/index.ts b/api/api/v2/instance/index.ts
index 549b3e7a..7a5a4783 100644
--- a/api/api/v2/instance/index.ts
+++ b/api/api/v2/instance/index.ts
@@ -38,7 +38,7 @@ export default apiRoute((app) =>
             title: config.instance.name,
             version: "4.3.0-alpha.3+glitch",
             versia_version: version,
-            source_url: "https://github.com/lysand-org/server",
+            source_url: "https://github.com/versia-pub/server",
             description: config.instance.description,
             usage: {
                 users: {
diff --git a/config/config.example.toml b/config/config.example.toml
index 0609357d..04f7cb3f 100644
--- a/config/config.example.toml
+++ b/config/config.example.toml
@@ -1,6 +1,6 @@
 # This schema always follows the latest dev version of Versia Server, which may not be what you want
 # Change the URL to the commit/tag you are using
-#:schema https://raw.githubusercontent.com/lysand-org/server/main/config/config.schema.json
+#:schema https://raw.githubusercontent.com/versia-pub/server/main/config/config.schema.json
 
 [database]
 # Main PostgreSQL database connection
@@ -311,7 +311,7 @@ reactions = []
 banners = []
 avatars = []
 
-# For bridge software, such as lysand-org/activitypub
+# For bridge software, such as versia-pub/activitypub
 # Bridges must be hosted separately from the main Versia Server process
 [federation.bridge]
 enabled = false
diff --git a/docker-compose.yml b/docker-compose.yml
index 9bb0c89f..fb2db702 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   versia:
-    image: ghcr.io/lysand-org/server:latest
+    image: ghcr.io/versia-pub/server:latest
     volumes:
       - ./logs:/app/dist/logs
       - ./config:/app/dist/config
@@ -17,7 +17,7 @@ services:
       - fe
 
   fe:
-    image: ghcr.io/lysand-org/frontend:main
+    image: ghcr.io/versia-pub/frontend:main
     container_name: versia-fe
     restart: unless-stopped
     networks:
@@ -26,7 +26,7 @@ services:
       NUXT_PUBLIC_API_HOST: https://yourserver.com
 
   db:
-    image: ghcr.io/lysand-org/postgres:main
+    image: ghcr.io/versia-pub/postgres:main
     container_name: versia-db
     restart: unless-stopped
     environment:
diff --git a/docs/database.md b/docs/database.md
index b3ef671a..dc98cd6f 100644
--- a/docs/database.md
+++ b/docs/database.md
@@ -4,4 +4,4 @@ Versia Server uses a special PostgreSQL extension called `pg_uuidv7` to generate
 
 ## Using the Docker image
 
-Versia Server offers a pre-made Docker image for PostgreSQL with the extension already installed. Use `ghcr.io/lysand-org/postgres:main` as your Docker image name to use it.
\ No newline at end of file
+Versia Server offers a pre-made Docker image for PostgreSQL with the extension already installed. Use `ghcr.io/versia-pub/postgres:main` as your Docker image name to use it.
\ No newline at end of file
diff --git a/docs/installation.md b/docs/installation.md
index c15ec82d..0cd462f2 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -20,7 +20,7 @@ Docker is the recommended way to run Versia Server (Podman also works). To run V
 1. Download the `docker-compose.yml` file from the repository
 
 > [!NOTE]
-> You may need to change the image from `ghcr.io/lysand-org/server:latest` to `ghcr.io/lysand-org/server:main` if you want to use the latest changes from the `main` branch. Make sure to use the config template from the same branch as the server.
+> You may need to change the image from `ghcr.io/versia-pub/server:latest` to `ghcr.io/versia-pub/server:main` if you want to use the latest changes from the `main` branch. Make sure to use the config template from the same branch as the server.
 
 > [!CAUTION]
 > The `latest` tag on the Docker image refers to the latest release (currently `v0.6.0`), not the latest commit on the `main` branch.
@@ -28,16 +28,16 @@ Docker is the recommended way to run Versia Server (Podman also works). To run V
 > **Do not mix configurations from different branches, or everything will break with confusing errors!**
 
 ```bash
-curl -o docker-compose.yml https://raw.githubusercontent.com/lysand-org/server/main/docker-compose.yml
+curl -o docker-compose.yml https://raw.githubusercontent.com/versia-pub/server/main/docker-compose.yml
 ```
 1. Edit the `docker-compose.yml` file to set up the database connection and other settings
 2. Download the `config.example.toml` file from the repository
 
 ```bash
 # From main branch
-curl -o config.example.toml https://raw.githubusercontent.com/lysand-org/server/main/config/config.example.toml
+curl -o config.example.toml https://raw.githubusercontent.com/versia-pub/server/main/config/config.example.toml
 # For a specific release (e.g. v0.6.0)
-curl -o config.example.toml https://raw.githubusercontent.com/lysand-org/server/v0.6.0/config/config.example.toml
+curl -o config.example.toml https://raw.githubusercontent.com/versia-pub/server/v0.6.0/config/config.example.toml
 ```
 4. Edit the `config.example.toml` file to set up the database connection and other settings, rename it to `config.toml`, then place it inside `config/` (create the `config/` directory if it does not exist)
 5. Run the following command to start the server:
@@ -51,14 +51,14 @@ docker compose up
 
 You may need root privileges to run Docker commands.
 
-To check server logs, run `docker compose logs lysand`. The server will likely stop if there is an error, so you can check the logs to see what went wrong.
+To check server logs, run `docker compose logs versia`. The server will likely stop if there is an error, so you can check the logs to see what went wrong.
 
 ## From Source
 
 1. Clone this repository
 
 ```bash
-git clone https://github.com/lysand-org/server.git
+git clone https://github.com/versia-pub/server.git
 ```
 
 2. Install the dependencies
diff --git a/nix/source.nix b/nix/source.nix
index e096ce29..04c46fa1 100644
--- a/nix/source.nix
+++ b/nix/source.nix
@@ -5,7 +5,7 @@
   outputHash.x86_64-linux = lib.fakeHash;
   outputHash.aarch64-linux = lib.fakeHash;
   src = fetchFromGitHub {
-    owner = "lysand-org";
+    owner = "versia-pub";
     repo = "server";
     rev = "fbb845f7f8ee97e51ff57edba3817224341d3078";
     hash = "sha256-pc5t6z/AE+NPZEzXxTlzT76jq5PF7Mvjh94A0NCBDh8=";
diff --git a/nix/update.sh b/nix/update.sh
index 00156b24..63e066b5 100755
--- a/nix/update.sh
+++ b/nix/update.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-SOURCE=$(nix-prefetch-github --nix lysand-org server | tail -n 6)
+SOURCE=$(nix-prefetch-github --nix versia-pub server | tail -n 6)
 
 cat > ./nix/source.nix << EOF
 {
diff --git a/package.json b/package.json
index ad4a2080..7c54f4dd 100644
--- a/package.json
+++ b/package.json
@@ -10,9 +10,9 @@
         "url": "https://cpluspatch.com"
     },
     "bugs": {
-        "url": "https://github.com/lysand-org/server/issues"
+        "url": "https://github.com/versia-pub/server/issues"
     },
-    "icon": "https://github.com/lysand-org/server",
+    "icon": "https://github.com/versia-pub/server",
     "license": "AGPL-3.0-or-later",
     "keywords": ["federated", "activitypub", "bun"],
     "workspaces": ["packages/*"],
@@ -25,7 +25,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/lysand-org/server.git"
+        "url": "git+https://github.com/versia-pub/server.git"
     },
     "private": true,
     "scripts": {
diff --git a/packages/plugin-kit/package.json b/packages/plugin-kit/package.json
index 8d78a7e7..51000e0a 100644
--- a/packages/plugin-kit/package.json
+++ b/packages/plugin-kit/package.json
@@ -10,9 +10,9 @@
         "url": "https://cpluspatch.com"
     },
     "bugs": {
-        "url": "https://github.com/lysand-org/server/issues"
+        "url": "https://github.com/versia-pub/server/issues"
     },
-    "icon": "https://github.com/lysand-org/server",
+    "icon": "https://github.com/versia-pub/server",
     "license": "AGPL-3.0-or-later",
     "keywords": ["federated", "activitypub", "bun"],
     "maintainers": [
@@ -24,7 +24,7 @@
     ],
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/lysand-org/server.git"
+        "url": "git+https://github.com/versia-pub/server.git"
     },
     "private": true,
     "dependencies": {