diff --git a/.github/workflows/ci-ifcopenshell-docker.yml b/.github/workflows/ci-ifcopenshell-docker.yml
index ae8142375b..a1c7a336c1 100644
--- a/.github/workflows/ci-ifcopenshell-docker.yml
+++ b/.github/workflows/ci-ifcopenshell-docker.yml
@@ -116,6 +116,8 @@ jobs:
       with: 
         context: artifacts
         repository: aecgeeks/ifcopenshell
-        tags: aecgeeks/ifcopenshell:latest
+        # Since the dispatch is set to `tag`, `github.ref_name` should evaluate to the pushed tag
+        # On a workflow dispatch, `ref_name` will take on the value from the dispatch payload
+        tags: aecgeeks/ifcopenshell:${{ github.ref_name }}${{ github.ref_name == github.event.repository.default_branch && ',aecgeeks/ifcopenshell:latest' }}
         file: ./Dockerfile
         push: true