diff --git a/.github/workflows/cleanup.yml b/.github/workflows/cleanup.yml
new file mode 100644
index 0000000..c447232
--- /dev/null
+++ b/.github/workflows/cleanup.yml
@@ -0,0 +1,27 @@
+name: Cleanup
+
+on: workflow_dispatch
+
+env:
+  # Use docker.io for Docker Hub if empty
+  REGISTRY: ghcr.io
+  # github.repository as <account>/<repo>
+  IMAGE_NAME: ${{ github.repository }}
+
+
+jobs:
+  cleanup-images:
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/delete-package-versions@v4
+      with: 
+          package-name: goucrt
+          package-type: 'container'
+          min-versions-to-keep: 10
+          delete-only-untagged-versions: 'true'
+
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 7cdc53b..21ab6c1 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: Build
 
 on:
   push: