diff --git a/.ci/template/sh-build-iso.yml.jinja2 b/.ci/template/sh-build-iso.yml.jinja2
index 1b07cb1..9ef63b9 100644
--- a/.ci/template/sh-build-iso.yml.jinja2
+++ b/.ci/template/sh-build-iso.yml.jinja2
@@ -19,7 +19,7 @@ jobs:
         with:
           image: archlinux:latest
 {%- raw %}
-          options: --privileged --volume ${{ github.workspace }}:/workspace
+          options: --privileged --rm --volume ${{ github.workspace }}:/workspace
 {%- endraw %}
           run: |
             # Exit on error
diff --git a/.github/workflows/sh-build-iso-rocm.yml b/.github/workflows/sh-build-iso-rocm.yml
index dde0349..f2840f6 100644
--- a/.github/workflows/sh-build-iso-rocm.yml
+++ b/.github/workflows/sh-build-iso-rocm.yml
@@ -18,7 +18,7 @@ jobs:
         uses: addnab/docker-run-action@v3
         with:
           image: archlinux:latest
-          options: --privileged --volume ${{ github.workspace }}:/workspace
+          options: --privileged --rm --volume ${{ github.workspace }}:/workspace
           run: |
             # Exit on error
             set -eu