diff --git a/.github/workflows/ros_nightly.yml b/.github/workflows/ros_nightly.yml
index 6e1209c..2d396cf 100644
--- a/.github/workflows/ros_nightly.yml
+++ b/.github/workflows/ros_nightly.yml
@@ -48,6 +48,9 @@ jobs:
             VERSION=pr-${{ github.event.number }}
           fi
           TAGS="${DOCKER_IMAGE}:${VERSION}"
+          if [[ $$VERSION = "nightly" ]]; then
+            TAGS="$TAGS,${DOCKER_IMAGE}:latest"
+          fi
           if [[ $VERSION =~ ^v[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then
             MINOR=${VERSION%.*}
             MAJOR=${MINOR%.*}
@@ -61,7 +64,6 @@ jobs:
           echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> "$GITHUB_OUTPUT"
 
       - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}