diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 3309daa60..cb4f25af0 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -111,7 +111,11 @@ jobs:
 
           echo "::warning Branch - ${GIT_BRANCH}"
 
-          TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}")
+          if [ "${GIT_BRANCH}" == "trunk" ]; then
+            TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}")
+          else
+            TAGS_ARRAY+=("$IMAGE_NAME:${{ matrix.os }}-${GIT_BRANCH}-latest")
+          fi
 
           if [ "${{ matrix.os }}" == "alpine" ] && [ "${LATEST_BRANCH}" == "${GIT_BRANCH}" ]; then
             TAGS_ARRAY+=("$IMAGE_NAME:latest")
@@ -217,4 +221,4 @@ jobs:
           for version in ${IMAGE_TAG_VERSIONS[@]}; do
               echo "Checking \"$version\"... "
               docker buildx imagetools inspect $version
-          done
\ No newline at end of file
+          done