diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ac4421618f..1d08ec0581 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,6 +8,7 @@ on:
   schedule:
     # Prime the caches every Monday
     - cron: 0 1 * * MON
+  workflow_dispatch:
 
 jobs:
   build:
@@ -22,7 +23,7 @@ jobs:
           - macos-latest
           - ubuntu-latest
         ocaml-compiler:
-          - "5.2"
+          - "5.2.0"
 
     steps:
       - name: Checkout Repo
diff --git a/.github/workflows/debug-ci.yml b/.github/workflows/debug-ci.yml
index e50d0555a3..0c10658e11 100644
--- a/.github/workflows/debug-ci.yml
+++ b/.github/workflows/debug-ci.yml
@@ -16,7 +16,7 @@ jobs:
           - macos-latest
           - ubuntu-latest
         ocaml-compiler:
-          - "4.14"
+          - "5.2.0"
 
     steps:
       - name: Checkout Repo
@@ -42,9 +42,15 @@ jobs:
       - name: Install opam dependencies
         run: opam install --deps-only --with-test .
 
+      - name: Install ocamlformat
+        run: opam install ocamlformat.0.26.2
+
       - name: Build project
         run: opam exec -- dune build @install
 
       - name: Run tests
         run: opam exec -- dune test
 
+      - name: Format code
+        run: opam exec -- dune build --auto-promote @fmt
+        if: runner.os == 'Linux'
diff --git a/dune-project b/dune-project
index 4aceff78d3..5b6c970615 100644
--- a/dune-project
+++ b/dune-project
@@ -33,6 +33,7 @@
   (ocaml
    (>= 4.14.0))
   dune
+  ppx_deriving
   cohttp
   cohttp-lwt-unix
   bos
diff --git a/ocamlorg.opam b/ocamlorg.opam
index 9b6def8e28..6290d70761 100644
--- a/ocamlorg.opam
+++ b/ocamlorg.opam
@@ -20,6 +20,7 @@ bug-reports: "https://github.com/ocaml/ocaml.org/issues"
 depends: [
   "ocaml" {>= "4.14.0"}
   "dune" {>= "3.15"}
+  "ppx_deriving"
   "cohttp"
   "cohttp-lwt-unix"
   "bos"