diff --git a/scripts/Build-Electron.ps1 b/scripts/Build-Electron.ps1
index c2c11c80..a89fbbae 100644
--- a/scripts/Build-Electron.ps1
+++ b/scripts/Build-Electron.ps1
@@ -28,7 +28,10 @@ if ($electronbuild -eq "cloud") {
     }
     Body = @{
       'ref' = $branch_name
-      'inputs' = @{ 'target' = 'release' }
+      'inputs' = @{ 
+        'target' = 'release'
+        'version' = $release_tag_name
+      }
     } | ConvertTo-Json
     ContentType = "application/json"
   }
@@ -159,7 +162,7 @@ if ($electronbuild -eq "local" -and (-not $portableonly)) {
     }
   }
 }
-if ($old_windows_support) {
+if ($old_windows_support -and ($electronbuild -eq 'local')) {
   "`nSupport for XP and Vista was requested."
   "Searching for archives..."
   $nwjs_base = $PSScriptRoot -ireplace 'kiwix-js-windows.scripts.*$', 'kiwix-js-windows-nwjs'
diff --git a/scripts/Create-DraftRelease.ps1 b/scripts/Create-DraftRelease.ps1
index 1cf01260..900ba845 100644
--- a/scripts/Create-DraftRelease.ps1
+++ b/scripts/Create-DraftRelease.ps1
@@ -96,6 +96,7 @@ if ($updatewinget) {
 } else {
   "`nCreating release for $tag_name...`n"
 }
+$tag_name = $tag_name -creplace '-E', 'E'
 $base_tag = $tag_name -creplace '^v([\d.EN]+).*', '$1'
 $text_tag = $tag_name -creplace '^v[\d.EN+]+-?(.*)$', '$1'
 $numeric_tag = $base_tag -creplace "([\d.]+)[EN]", '$1'