diff --git a/.github/workflows/build_images.yaml b/.github/workflows/build_images.yaml
index c370559..e17ddfa 100644
--- a/.github/workflows/build_images.yaml
+++ b/.github/workflows/build_images.yaml
@@ -160,3 +160,22 @@ jobs:
             ROS_DISTRO=${{ matrix.version.ros_distro }}
             BUILD=true
             VERSION=${{ steps.get_tag.outputs.highest_tag }}
+
+  delete-untagged-images:
+    name: Delete Untagged Images
+    runs-on: ubuntu-latest
+    needs: [nightly_docker, release_docker]
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+    steps:
+      - uses: actions/delete-package-versions@v5
+        with:
+          owner: 'ros-navigation'
+          package-name: 'nav2_docker'
+          package-type: 'container'
+          min-versions-to-keep: 20
+          delete-only-untagged-versions: 'true'
+          token: ${{ secrets.GITHUB_TOKEN }}