diff --git a/.github/workflows/release_publish_docker-image.yml b/.github/workflows/release_publish_docker-image.yml
index 9e5933729..a9a8b9b47 100644
--- a/.github/workflows/release_publish_docker-image.yml
+++ b/.github/workflows/release_publish_docker-image.yml
@@ -26,19 +26,12 @@ jobs:
             VERSION=pr-${{ github.event.number }}
           fi
           TAGS="${DOCKER_IMAGE}:${VERSION}"
-          echo ::set-output name=docker_image::${DOCKER_IMAGE}
+          if [[ ${{ github.event.action }} == released ]]; then
+            TAGS=$TAGS,${DOCKER_IMAGE}:latest
+          fi
           echo ::set-output name=version::${VERSION}
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-      - 
-        name: Tag Latest
-        id: prep_tag_latest
-        if: " github.event.action == 'released' "
-        run: |
-          TAGS=${{ steps.prep.outputs.docker_image }}:latest
-          echo ::set-output name=tags::${TAGS}
-          echo ::set-output name=version::${{ steps.prep.outputs.version }}
-          echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
       - 
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1