diff --git a/.github/workflows/upload-idf-component.yml b/.github/workflows/upload-idf-component.yml
index c716e8144c2..bc544e02114 100644
--- a/.github/workflows/upload-idf-component.yml
+++ b/.github/workflows/upload-idf-component.yml
@@ -1,6 +1,11 @@
 name: Push components to https://components.espressif.com
 
 on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: 'Tag to push to the component registry'
+        required: true
   workflow_run:
     workflows: ["ESP32 Arduino Release"]
     types:
@@ -15,7 +20,7 @@ jobs:
     steps:
       - name: Get the release tag
         env:
-          head_branch: ${{ github.event.workflow_run.head_branch }}
+          head_branch: ${{ github.event.inputs.tag || github.event.workflow_run.head_branch }}
         run: |
           if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then
             echo "Release workflow failed. Exiting..."
@@ -39,6 +44,7 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
+          ref: ${{ env.RELEASE_TAG }}
           submodules: "recursive"
 
       - name: Upload components to the component registry