diff --git a/.github/workflows/docker-dist-tests.yml b/.github/workflows/docker-dist-tests.yml
index d322194a..ee25cd10 100644
--- a/.github/workflows/docker-dist-tests.yml
+++ b/.github/workflows/docker-dist-tests.yml
@@ -26,5 +26,6 @@ jobs:
     with:
       nimflags: '-d:disableMarchNative -d:codex_enable_api_debug_peers=true -d:codex_enable_simulated_proof_failures'
       nat_ip_auto: true
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
       tag_suffix: dist-tests
     secrets: inherit
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b826b050..fb97c339 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -23,4 +23,6 @@ jobs:
   build-and-push:
     name: Build and Push
     uses: ./.github/workflows/docker-reusable.yml
+    with:
+      tag_latest: ${{ github.ref_name == github.event.repository.default_branch || startsWith(github.ref, 'refs/tags/') }}
     secrets: inherit