diff --git a/Tools/create_upg_chk_files.ps1 b/Tools/create_upg_chk_files.ps1
index 6cfbcb75..47531398 100644
--- a/Tools/create_upg_chk_files.ps1
+++ b/Tools/create_upg_chk_files.ps1
@@ -100,7 +100,6 @@ function Resolve-UpdateCheckFileName {
 
 Write-Output "Begin create_upg_chk_files.ps1"
 
-
 # determine update channel
 if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
     write-host "UpdateChannel = Nightly"
@@ -129,11 +128,14 @@ if ($UpdateChannel -ne "" -and $buildFolder -ne "") {
         Write-Output "`n`nMSI Update Check File Contents ($msiUpdateFileName)`n------------------------------"
         Tee-Object -InputObject $msiUpdateContents -FilePath "$releaseFolder\$msiUpdateFileName"
         write-host "msiUpdateFileName $releaseFolder\$msiUpdateFileName"
+        
         # commit msi update txt file
-        if ((Test-Path -Path "$releaseFolder\$msiUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
-            Write-Output "Publish $msiUpdateFileName to $WebsiteTargetRepository"
-            $update_file_content_string = Get-Content "$releaseFolder\$msiUpdateFileName" | Out-String
-            Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $msiUpdateFileName -CommitMessage "Updating $msiUpdateFileName" -Content $update_file_content_string -BranchName main
+        if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
+            if ((Test-Path -Path "$releaseFolder\$msiUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
+                Write-Output "Publish $msiUpdateFileName to $WebsiteTargetRepository"
+                $update_file_content_string = Get-Content "$releaseFolder\$msiUpdateFileName" | Out-String
+                Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $msiUpdateFileName -CommitMessage "Build $ModifiedTagName" -Content $update_file_content_string -BranchName main
+            }
         }
     }
 
@@ -146,16 +148,18 @@ if ($UpdateChannel -ne "" -and $buildFolder -ne "") {
         Write-Output "`n`nZip Update Check File Contents ($zipUpdateFileName)`n------------------------------"
         Tee-Object -InputObject $zipUpdateContents -FilePath "$releaseFolder\$zipUpdateFileName"
         write-host "zipUpdateFileName $releaseFolder\$zipUpdateFileName"
+        
         # commit zip update txt file
-        if ((Test-Path -Path "$releaseFolder\$zipUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
-            Write-Output "Publish $zipUpdateFileName to $WebsiteTargetRepository"
-            $update_file_content_string = Get-Content "$releaseFolder\$zipUpdateFileName" | Out-String
-            Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $zipUpdateFileName -CommitMessage "Updating $zipUpdateFileName" -Content $update_file_content_string -BranchName main
+        if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
+            if ((Test-Path -Path "$releaseFolder\$zipUpdateFileName") -and (-not [string]::IsNullOrEmpty($WebsiteTargetRepository))) {
+                Write-Output "Publish $zipUpdateFileName to $WebsiteTargetRepository"
+                $update_file_content_string = Get-Content "$releaseFolder\$zipUpdateFileName" | Out-String
+                Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path $zipUpdateFileName -CommitMessage "Build $ModifiedTagName" -Content $update_file_content_string -BranchName main
+            }
         }
     }
 } else {
     write-host "BuildFolder not found"
 }
 
-
 Write-Output "End create_upg_chk_files.ps1"
diff --git a/Tools/postbuild_installer.ps1 b/Tools/postbuild_installer.ps1
index 7c5856ba..e95c65a9 100644
--- a/Tools/postbuild_installer.ps1
+++ b/Tools/postbuild_installer.ps1
@@ -48,6 +48,6 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\create_upg_chk_files.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
 
-#& "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
+& "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
 
 Write-Output "End mRemoteNG Installer Post Build"
diff --git a/Tools/postbuild_mremoteng.ps1 b/Tools/postbuild_mremoteng.ps1
index d1de47e0..57b92a7b 100644
--- a/Tools/postbuild_mremoteng.ps1
+++ b/Tools/postbuild_mremoteng.ps1
@@ -69,6 +69,6 @@ Format-Table -AutoSize -Wrap -InputObject @{
 
 & "$PSScriptRoot\create_upg_chk_files.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
 
-#& "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
+& "$PSScriptRoot\update_and_upload_website_release_json_file.ps1" -WebsiteTargetOwner $CURRENT_GITHUB_USER -WebsiteTargetRepository $env:WEBSITE_TARGET_REPOSITORY -PreTagName $env:NightlyBuildTagName -TagName $env:APPVEYOR_BUILD_VERSION -ProjectName $env:APPVEYOR_PROJECT_NAME
 
 Write-Output "End mRemoteNG Post Build"
diff --git a/Tools/update_and_upload_website_release_json_file.ps1 b/Tools/update_and_upload_website_release_json_file.ps1
index 3efb1a22..d9fbd9b8 100644
--- a/Tools/update_and_upload_website_release_json_file.ps1
+++ b/Tools/update_and_upload_website_release_json_file.ps1
@@ -29,12 +29,15 @@ Write-Output "Begin create_website_release_json_file.ps1"
 if ($env:APPVEYOR_PROJECT_NAME -match "(Nightly)") {
     write-host "UpdateChannel = Nightly"
     $UpdateChannel = "Nightly"
+    $ModifiedTagName = "$PreTagName-$TagName-NB"
 } elseif ($env:APPVEYOR_PROJECT_NAME -match "(Preview)") {
     write-host "UpdateChannel = Preview"
     $UpdateChannel = "Preview"
+    $ModifiedTagName = "v$TagName-PB"
 } elseif ($env:APPVEYOR_PROJECT_NAME -match "(Stable)") {
     write-host "UpdateChannel = Stable"
     $UpdateChannel = "Stable"
+    $ModifiedTagName = "v" + $TagName.Split("-")[0]
 } else {
     $UpdateChannel = ""
 }
@@ -99,9 +102,6 @@ if ($UpdateChannel -ne "" -and $buildFolder -ne "") {
         }
     }
 
-    # https://github.com/BlueBlock/mRemoteNG/releases/tag/20230218-1.77.3.405-NB
-    # https://github.com/mRemoteNG/mRemoteNG/releases/download//mRemoteNG-Installer-1.77.3.405.msi
-
 
     # portable
     $zipFile = Get-ChildItem -Path "$releaseFolder\*.zip" -Exclude "*-symbols-*.zip" | Sort-Object LastWriteTime | Select-Object -last 1
@@ -152,10 +152,12 @@ if ($UpdateChannel -ne "" -and $buildFolder -ne "") {
     $a | ConvertTo-Json -Depth 10 | set-content $websiteJsonReleaseFile
 
     # commit releases.json change
-    Write-Output "publish releases.json"
-    if (Test-Path -Path "$releaseFolder\releases.json") {
-        $releases_json_string = Get-Content "$releaseFolder\releases.json" | Out-String
-        Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path _data\releases.json -CommitMessage 'Updating releases.json' -Content $releases_json_string -BranchName main
+    if ($env:WEBSITE_UPDATE_ENABLED.ToLower() -eq "true") {
+        Write-Output "publish releases.json"
+        if (Test-Path -Path "$releaseFolder\releases.json") {
+            $releases_json_string = Get-Content "$releaseFolder\releases.json" | Out-String
+            Set-GitHubContent -OwnerName $WebsiteTargetOwner -RepositoryName $WebsiteTargetRepository -Path _data\releases.json -CommitMessage "Updated for $UpdateChannel $ModifiedTagName" -Content $releases_json_string -BranchName main
+        }
     }
 
 } else {