diff --git a/.github/ISSUE_TEMPLATE/Issue-report.yml b/.github/ISSUE_TEMPLATE/Issue-report.yml
index 79d8adb71bb..af97de73644 100644
--- a/.github/ISSUE_TEMPLATE/Issue-report.yml
+++ b/.github/ISSUE_TEMPLATE/Issue-report.yml
@@ -44,7 +44,6 @@ body:
         - latest development Release Candidate (RC-X)
         - latest master (checkout manually)
         - v3.3.2
-        - v3.3.2
         - v3.3.1
         - v3.3.0
         - v3.2.1
diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh
index b65ab371640..e461e77b0c3 100755
--- a/.github/scripts/on-release.sh
+++ b/.github/scripts/on-release.sh
@@ -433,7 +433,8 @@ echo
 echo "Updating libs URLs in JSON template ..."
 
 # Update all libs URLs in the JSON template
-libs_jq_arg="(.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].url) = \"$LIBS_ZIP_URL\""
+libs_jq_arg="(.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].url) = \"$LIBS_ZIP_URL\" |\
+             (.packages[0].tools[] | select(.name == \"esp32-arduino-libs\") | .systems[].archiveFileName) = \"$LIBS_ZIP\""
 
 cat "$PACKAGE_JSON_TEMPLATE" | jq "$libs_jq_arg" > "$OUTPUT_DIR/package-libs-updated.json"
 PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-libs-updated.json"
diff --git a/.github/scripts/update-version.sh b/.github/scripts/update-version.sh
index ea680a6d801..5dd26d9f40a 100755
--- a/.github/scripts/update-version.sh
+++ b/.github/scripts/update-version.sh
@@ -39,8 +39,13 @@ echo "New Arduino Version: $ESP_ARDUINO_VERSION"
 echo "ESP-IDF Version: $ESP_IDF_VERSION"
 
 echo "Updating issue template..."
-cat .github/ISSUE_TEMPLATE/Issue-report.yml | \
-sed "s/.*\- latest master .*/        - latest master \(checkout manually\)\\n        - v$ESP_ARDUINO_VERSION/g" > __issue-report.yml && mv __issue-report.yml .github/ISSUE_TEMPLATE/Issue-report.yml
+if ! grep -q "v$ESP_ARDUINO_VERSION" .github/ISSUE_TEMPLATE/Issue-report.yml; then
+    cat .github/ISSUE_TEMPLATE/Issue-report.yml | \
+    sed "s/.*\- latest master .*/        - latest master \(checkout manually\)\\n        - v$ESP_ARDUINO_VERSION/g" > __issue-report.yml && mv __issue-report.yml .github/ISSUE_TEMPLATE/Issue-report.yml
+    echo "Issue template updated with version v$ESP_ARDUINO_VERSION"
+else
+    echo "Version v$ESP_ARDUINO_VERSION already exists in issue template, skipping update"
+fi
 
 echo "Updating GitLab variables..."
 cat .gitlab/workflows/common.yml | \
diff --git a/.github/workflows/upload-idf-component.yml b/.github/workflows/upload-idf-component.yml
index 687e721fbc2..8bb6956e6da 100644
--- a/.github/workflows/upload-idf-component.yml
+++ b/.github/workflows/upload-idf-component.yml
@@ -51,9 +51,9 @@ jobs:
           submodules: "recursive"
 
       - name: Upload components to the component registry
-        uses: espressif/upload-components-ci-action@b78a19fa5424714997596d3ecffa634aef8ae20b # v1.0.5
+        uses: espressif/upload-components-ci-action@df9e740b912c009996df639ba7090c24e9a542c2 # v2.2.0
         with:
-          name: arduino-esp32
+          components: "arduino-esp32: ." # component_name: directory
           version: ${{ env.RELEASE_TAG }}
           namespace: espressif
           api_token: ${{ secrets.IDF_COMPONENT_API_TOKEN }}