diff --git a/.github/workflows/housekeeping.yml b/.github/workflows/housekeeping.yml
new file mode 100644
index 0000000..bb6cf58
--- /dev/null
+++ b/.github/workflows/housekeeping.yml
@@ -0,0 +1,28 @@
+name: housekeeping
+on:
+  workflow_dispatch:
+
+jobs:
+    housekeeping:
+        runs-on: ubuntu-latest
+        steps:
+            -
+                name: Set up Docker Buildx
+                uses: docker/setup-buildx-action@v2
+            -
+                name: Login to GitHub Container Registry with PAT_TOKEN
+                uses: docker/login-action@v2
+                with:
+                    registry: ghcr.io
+                    username: ${{ github.actor }}
+                    password: ${{ secrets.PAT_TOKEN }}
+            -
+                name: Delete all containers from repository without tags
+                uses: Chizkiyahu/delete-untagged-ghcr-action@v2
+                with:
+                    token: ${{ secrets.PAT_TOKEN }}
+                    repository_owner: ${{ github.repository_owner }}
+                    repository: ${{ github.repository }}
+                    untagged_only: true
+                    owner_type: org # or user
+                    except_untagged_multiplatform: true
\ No newline at end of file
diff --git a/.github/workflows/test-and-build-v6.yml b/.github/workflows/test-and-build-v6.yml
index c520060..5d5edc7 100644
--- a/.github/workflows/test-and-build-v6.yml
+++ b/.github/workflows/test-and-build-v6.yml
@@ -1,11 +1,14 @@
 name: Build and Publish (development-v6-nightly)
 on:
+  workflow_dispatch:
   schedule:
     - cron: "0 5 * * *"
   push:
     branches:
       - development-v6
   pull_request:
+    branches:    
+      - development-v6
 
 env:
   dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole