diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml
index 10551b42e..c1c47ef28 100644
--- a/.github/workflows/build_docker.yml
+++ b/.github/workflows/build_docker.yml
@@ -43,8 +43,10 @@ jobs:
           buildfile: puppetdb/Dockerfile
           tags: |
             ghcr.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }}
+            ghcr.io/${{ github.repository }}:${{ matrix.version }}-latest
             ghcr.io/${{ github.repository }}:latest
             docker.io/${{ github.repository }}:${{ matrix.version }}-${{ github.ref_name }}
+            docker.io/${{ github.repository }}:${{ matrix.version }}-latest
             docker.io/${{ github.repository }}:latest
 
       - name: Update Docker Hub Description