diff --git a/.github/actions/setup-environment/action.yml b/.github/actions/setup-environment/action.yml
index 2a4b52480..03e8f1775 100644
--- a/.github/actions/setup-environment/action.yml
+++ b/.github/actions/setup-environment/action.yml
@@ -86,8 +86,10 @@ runs:
           echo "Setting up eve image ${image}"
           eve_pr_registry=$(echo "$image" |  cut -d ':' -f 1)
           eve_pr=$(echo "$image" |  cut -d ':' -f 2 | cut -d "-" -f1)
+          # this will be empty if there is no rc in the tag
+          eve_rc=$(echo "$image" |  cut -d ':' -f 2 | egrep -o "\-rc[0-9]+")
           ./eden config set default --key=eve.registry --value="$eve_pr_registry"
-          ./eden config set default --key=eve.tag --value="$eve_pr"
+          ./eden config set default --key=eve.tag --value="$eve_pr$eve_rc"
         else
           echo "Skipping setting up eve image ${image}"
         fi