diff --git a/.github/bors.toml b/.github/bors.toml
index 5d1bf89..1733a86 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -1,5 +1,6 @@
 block_labels = [ "S-blocked" ]
 delete_merged_branches = true
+timeout_sec = 1200
 status = [
   "style",
   "test (stable)",
diff --git a/.github/workflows/hitl_trigger.yml b/.github/workflows/hitl_trigger.yml
index b275421..b0fafac 100644
--- a/.github/workflows/hitl_trigger.yml
+++ b/.github/workflows/hitl_trigger.yml
@@ -12,15 +12,25 @@ jobs:
     runs-on: ubuntu-latest
     environment: hitl
     steps:
+      - uses: LouisBrunner/checks-action@v1.1.1
+        id: hitl-check
+        with:
+          repo: ${{ github.repository }}
+          sha: ${{ github.event.head_commit.id }}
+          token: ${{ github.token }}
+          name: HITL Run Status
+          status: in_progress
+          details_url: "https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}"
+          output: |
+            {"summary": "Starting..."}
+
       - uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.DISPATCH_PAT }}
           event-type: stabilizer
           repository: quartiq/hitl
-          client-payload: '{"github": ${{ toJson(github) }}}'
-
-      - name: Wait for startup
-        run: sleep 30
+          client-payload: |
+            {"github": ${{ toJson(github) }}, "check_id": ${{steps.hitl-check.outputs.check_id}}}
 
       - uses: fountainhead/action-wait-for-check@v1.0.0
         with:
diff --git a/Cargo.lock b/Cargo.lock
index aef5a92..ae9ef69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -203,7 +203,7 @@ dependencies = [
 [[package]]
 name = "derive_miniconf"
 version = "0.1.0"
-source = "git+https://github.com/quartiq/miniconf.git?rev=c8d819c#c8d819cdab65f18396e65dafa3558daea29e3031"
+source = "git+https://github.com/quartiq/miniconf.git?rev=c6f2b28#c6f2b28f735e27b337eaa986846536e904c6f2bd"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -416,10 +416,9 @@ dependencies = [
 [[package]]
 name = "miniconf"
 version = "0.1.0"
-source = "git+https://github.com/quartiq/miniconf.git?rev=c8d819c#c8d819cdab65f18396e65dafa3558daea29e3031"
+source = "git+https://github.com/quartiq/miniconf.git?rev=c6f2b28#c6f2b28f735e27b337eaa986846536e904c6f2bd"
 dependencies = [
  "derive_miniconf",
- "heapless 0.6.1",
  "serde",
  "serde-json-core",
 ]
@@ -689,8 +688,9 @@ dependencies = [
 
 [[package]]
 name = "serde-json-core"
-version = "0.2.0"
-source = "git+https://github.com/rust-embedded-community/serde-json-core.git?rev=da460d1#da460d123e217f0e822a3977eb2170ed5d279d5e"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39af17f40c2a28d2c9a7918663ddc8a10f54cc6f109ead5c3f010869761df186"
 dependencies = [
  "heapless 0.6.1",
  "ryu",
diff --git a/Cargo.toml b/Cargo.toml
index 4ab885e..226e4d4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -56,7 +56,7 @@ version = "0.9.0"
 
 [patch.crates-io.miniconf]
 git = "https://github.com/quartiq/miniconf.git"
-rev = "c8d819c"
+rev = "c6f2b28"
 
 [dependencies.smoltcp-nal]
 git = "https://github.com/quartiq/smoltcp-nal.git"
@@ -66,10 +66,6 @@ rev = "8468f11"
 git = "https://github.com/quartiq/minimq.git"
 rev = "b3f364d"
 
-[patch.crates-io.serde-json-core]
-git = "https://github.com/rust-embedded-community/serde-json-core.git"
-rev = "da460d1"
-
 [features]
 semihosting = ["panic-semihosting", "cortex-m-log/semihosting"]
 bkpt = [ ]