diff --git a/.forgejo/workflows/ci.ncl b/.forgejo/workflows/ci.ncl
new file mode 100644
index 0000000..f343d60
--- /dev/null
+++ b/.forgejo/workflows/ci.ncl
@@ -0,0 +1,67 @@
+{
+  on = {
+    push.branches = ["main", "forgejo-ci-test"],
+    pull_request.types = ["opened", "synchronize", "reopened"],
+  },
+
+  jobs = {
+
+    nixosConfiguration-all = {
+      runs-on = "native",
+      steps = [
+        { uses = "actions/checkout@v4" },
+        { run = "nix build .#nixosConfigurations.all.config.system.build.toplevel" },
+      ],
+    },
+
+    check-pixelfed-garage = {
+      runs-on = "native",
+      steps = [
+        { uses = "actions/checkout@4" },
+        { run = "nix build .#checks.x86_64-linux.pixelfed-garage -L" },
+      ]
+    },
+  },
+}
+
+## jobs:
+
+##   ## NixOS configurations
+
+##   nixosConfiguration-all:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#nixosConfigurations.all.config.system.build.toplevel
+
+##   nixosConfiguration-mastodon:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#nixosConfigurations.mastodon.config.system.build.toplevel
+
+##   nixosConfiguration-peertube:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#nixosConfigurations.peertube.config.system.build.toplevel
+
+##   nixosConfiguration-pixelfed:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#nixosConfigurations.pixelfed.config.system.build.toplevel
+
+##   ## Checks
+
+##   check-mastodon-garage:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#checks.x86_64-linux.mastodon-garage -L
+
+##   check-pixelfed-garage:
+##     runs-on: native
+##     steps:
+##       - uses: actions/checkout@v4
+##       - run: nix build .#checks.x86_64-linux.pixelfed-garage -L
diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml
new file mode 100644
index 0000000..9644f64
--- /dev/null
+++ b/.forgejo/workflows/ci.yaml
@@ -0,0 +1,21 @@
+jobs:
+  check-pixelfed-garage:
+    runs-on: native
+    steps:
+    - uses: actions/checkout@4
+    - run: nix build .#checks.x86_64-linux.pixelfed-garage -L
+  nixosConfiguration-all:
+    runs-on: native
+    steps:
+    - uses: actions/checkout@v4
+    - run: nix build .#nixosConfigurations.all.config.system.build.toplevel
+on:
+  pull_request:
+    types:
+    - opened
+    - synchronize
+    - reopened
+  push:
+    branches:
+    - main
+    - forgejo-ci-test
diff --git a/.forgejo/workflows/test.yaml b/.forgejo/workflows/test.yaml
deleted file mode 100644
index 7bef77f..0000000
--- a/.forgejo/workflows/test.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-on:
-  push:
-    branches: [main, forgejo-ci-test]
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-
-  ## NixOS configurations
-
-  nixosConfiguration-all:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#nixosConfigurations.all.config.system.build.toplevel
-
-  nixosConfiguration-mastodon:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#nixosConfigurations.mastodon.config.system.build.toplevel
-
-  nixosConfiguration-peertube:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#nixosConfigurations.peertube.config.system.build.toplevel
-
-  nixosConfiguration-pixelfed:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#nixosConfigurations.pixelfed.config.system.build.toplevel
-
-  ## Checks
-
-  check-other-pixelfed-garage-fixme:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.pixelfed-garage -L
-
-  check-pixelfed-garage:
-    runs-on: native
-    steps:
-      - uses: actions/checkout@v4
-      - run: nix build .#checks.x86_64-linux.pixelfed-garage -L