diff --git a/.appveyor/moveTagForSpecialBranches.ps1 b/.appveyor/moveTagForSpecialBranches.ps1
index 88ce7aeb..dd6a70b6 100644
--- a/.appveyor/moveTagForSpecialBranches.ps1
+++ b/.appveyor/moveTagForSpecialBranches.ps1
@@ -1,7 +1,5 @@
-$Env:NIGHTLY_BUILD = false
 if($Env:APPVEYOR_REPO_TAG -ne "true") {
 	if($Env:APPVEYOR_REPO_BRANCH -eq "appveyorTest"){		
-		$targetTag = "Nightly"	
 		$Env:NIGHTLY_BUILD = true		
 	}
 	else{
diff --git a/.appveyor/prepareDeploy.ps1 b/.appveyor/prepareDeploy.ps1
index 9706988f..0ff8a05a 100644
--- a/.appveyor/prepareDeploy.ps1
+++ b/.appveyor/prepareDeploy.ps1
@@ -1,6 +1,10 @@
 if($Env:APPVEYOR_REPO_TAG -eq "true") {
 	$targetTag = $Env:APPVEYOR_REPO_TAG_NAME
 	Write-Host "Tag=$targetTag"
+	$Env:NIGHTLY_BUILD = "false"
+	if($targetTag -eq "Nightly") {
+		$Env:NIGHTLY_BUILD = "true"
+	}
 }
 else{
 	Return;