diff --git a/.forgejo/workflows/pmbootstrap-zap.yaml b/.forgejo/workflows/pmbootstrap-zap.yaml
new file mode 100644
index 0000000..98dfe2c
--- /dev/null
+++ b/.forgejo/workflows/pmbootstrap-zap.yaml
@@ -0,0 +1,16 @@
+name: "PostmarketOS: clean"
+run-name: "PostmarketOS: clean"
+on:
+  schedule:
+    - cron: "@daily"
+  workflow_dispatch:
+
+jobs:
+  pull-pmbootstrap:
+    name: Clean Pmbootstrap
+    runs-on: Pmbootstrap
+    steps:
+      - name: Zapping pmbootstrap
+        run: >
+          pmbootstrap -y zap -a || yes
+          pmbootstrap -y zap -a || yes
diff --git a/.forgejo/workflows/pmbootstrap.yaml b/.forgejo/workflows/pmbootstrap.yaml
index ae64bef..d74efdd 100644
--- a/.forgejo/workflows/pmbootstrap.yaml
+++ b/.forgejo/workflows/pmbootstrap.yaml
@@ -1,4 +1,5 @@
-name: PostmarketOS build instrumentary update
+name: "PostmarketOS: build instrumentary update"
+run-name: "PostmarketOS: build instrumentary update"
 on:
   schedule:
     - cron: "@every 10m"
diff --git a/pmb/env b/pmb/env
index d1883e5..0bc7de5 100644
--- a/pmb/env
+++ b/pmb/env
@@ -1,5 +1,5 @@
 PMB_DATA="/data"
-PMB_PMBOOTSTRAP=$PMB_DATA"/pmbootstrap"
-PMB_PMAPORTS=$PMB_DATA"/pmaports"
-PMB_APORTS=$PMB_DATA"/aports"
-PMB_WORK=$PMB_DATA"/work"
+PMB_PMBOOTSTRAP="${PMB_DATA}/pmbootstrap"
+PMB_PMAPORTS="${PMB_DATA}/pmaports"
+PMB_APORTS="${PMB_DATA}/aports"
+PMB_WORK="${PMB_DATA}/work"