diff --git a/.github/workflows/reusable-industrial-ci-with-cache.yml b/.github/workflows/reusable-industrial-ci-with-cache.yml
index 56ac6d90..bd616646 100644
--- a/.github/workflows/reusable-industrial-ci-with-cache.yml
+++ b/.github/workflows/reusable-industrial-ci-with-cache.yml
@@ -157,10 +157,11 @@ jobs:
         if: ${{ always() && steps.ici.outcome == 'failure' && github.event_name == 'schedule' }}
         run:
           wget https://raw.githubusercontent.com/ros-controls/ros2_control_ci/master/.github/issue_template_failed_ci_downstream.md -O .github/issue_template_failed_ci_downstream.md
-      - uses: JasonEtco/create-an-issue@v2
+      - name: Create issue on failure (target workspace)
+        uses: JasonEtco/create-an-issue@v2
         # `make` and so `colcon build` returns 2 on errors, while `colcon test-result` returns 1 on
         # when any test failed.
-        if: ${{ always() && (steps.ici.outputs.build_target_workspace == '2' || steps.ici.outputs.target_test_results == '1') && github.event_name == 'schedule'}}
+        if: ${{ always() && ((steps.ici.outputs.build_target_workspace != '' && fromJSON(steps.ici.outputs.build_target_workspace) > 0) || steps.ici.outputs.target_test_results == '1') && github.event_name == 'schedule' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ACTION_NAME: ${{ inputs.ros_distro }}/${{ inputs.ros_repo }}
@@ -169,8 +170,9 @@ jobs:
         with:
           update_existing: true
           filename: .github/issue_template_failed_ci.md
-      - uses: JasonEtco/create-an-issue@v2
-        if: ${{ always() && (steps.ici.outputs.build_downstream_workspace == '2' || steps.ici.outputs.downstream_test_results == '1') && github.event_name == 'schedule'}}
+      - name: Create issue on failure (downstream workspace)
+        uses: JasonEtco/create-an-issue@v2
+        if: ${{ always() && ((steps.ici.outputs.build_downstream_workspace != '' && fromJSON(steps.ici.outputs.build_downstream_workspace) > 0) || steps.ici.outputs.downstream_test_results == '1') && github.event_name == 'schedule' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ACTION_NAME: ${{ inputs.ros_distro }}/${{ inputs.ros_repo }}