diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml
index 1817b76..f14c415 100644
--- a/.github/workflows/build-and-publish.yml
+++ b/.github/workflows/build-and-publish.yml
@@ -12,7 +12,7 @@ on:
 env:
   dockerhub: ${{ secrets.DOCKERHUB_NAMESPACE }}/pihole
   ghcr: ghcr.io/${{ github.repository_owner }}/pihole
-  components_branch: ${{ github.event_name == 'schedule' && 'development' || 'master' }}
+  components_branch: ${{ github.event_name == 'release' && 'master' || 'development' }}
 
 jobs:
   build:
@@ -62,7 +62,7 @@ jobs:
             latest=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
             type=schedule,pattern=nightly
-            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
+            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }},pattern=nightly
             type=ref,event=tag
 
       -
@@ -148,7 +148,7 @@ jobs:
 
       - name: Docker meta
         id: meta
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0
+        uses: docker/metadata-action@c1e51972afc2121e065aed6d45c65596fe445f3f #v5.8.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           images: |
@@ -158,7 +158,7 @@ jobs:
             latest=${{ startsWith(github.ref, 'refs/tags/') }}
           tags: |
             type=schedule,pattern=nightly
-            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }}
+            type=ref,event=branch,enable=${{ github.event_name != 'schedule' }},pattern=nightly
             type=ref,event=tag
 
       -
diff --git a/README.md b/README.md
index 9e9b07e..73feb15 100644
--- a/README.md
+++ b/README.md
@@ -200,12 +200,11 @@ Release notes will always contain full details of changes in the container, incl
 
 | tag                 | description
 |---------------------|--------------------------------------------------------------------------------------------------------------------------------------------|
-| `latest`            | Always latest release                                                                                                                      |
+| `latest`            | Always the latest release                                                                                                                  |
 | `2022.04.0`         | Date-based release                                                                                                                         |
 | `2022.04.1`         | Second release in a given month                                                                                                            |
-| `development`               | Similar to `latest`, but for the development branch (pushed occasionally)                                                                  |
 | `*beta`             | Early beta releases of upcoming versions - here be dragons                                                                                 |
-| `nightly`           | Like `development` but pushed every night and pulls from the latest `development` branches of the core Pi-hole components (Pi-hole, web, FTL)      |
+| `nightly`           | Built and pushed whenever there are changes on the `development` branch and additionally produced by the scheduled nightly job. These are the most experimental development images and may change frequently |
 
 ## Upgrading, Persistence, and Customizations