diff --git a/appveyor.yml b/appveyor.yml
index dc0f01e2..8fdf1640 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,6 +37,13 @@ install:
     choco install "opencover.portable" -y
 before_build:
 - ps: |
+    $Env:MAIN_REPO = $False
+
+    if($Env:APPVEYOR_REPO_NAME -eq "Vocaluxe/Vocaluxe"){
+        $Env:MAIN_REPO = $True
+        Write-Host "Main repo Vocaluxe/Vocaluxe detected"
+    }
+    
     Try
     {
         Start-FileDownload 'https://github.com/lukeIam/VocaluxeDependencies/blob/master/zips/themes/vocaluxe.themes.genius.video.zip?raw=true'
@@ -50,13 +57,13 @@ before_build:
     
     nuget restore -DisableParallelProcessing
     
-    if($Env:PLATFORM -eq 'x64')
+    if($Env:MAIN_REPO -and ($Env:PLATFORM -eq 'x64'))
     {        
         if ($Env:APPVEYOR_PULL_REQUEST_NUMBER){
             choco install "msbuild-sonarqube-runner" -y
             SonarScanner.MSBuild.exe begin `
-                /k:"lukeIam_Vocaluxe" `
-                /d:sonar.organization="lukeiam-github" `
+                /k:"Vocaluxe" `
+                /d:sonar.organization="vocaluxe" `
                 /d:sonar.host.url="https://sonarcloud.io" `
                 /d:sonar.login="$Env:SonarQubeToken" `
                 /d:"sonar.pullrequest.key=$env:APPVEYOR_PULL_REQUEST_NUMBER" `
@@ -66,8 +73,8 @@ before_build:
         elseif($Env:APPVEYOR_REPO_BRANCH -eq 'develop'){
             choco install "msbuild-sonarqube-runner" -y            
             SonarScanner.MSBuild.exe begin `
-                /k:"lukeIam_Vocaluxe" `
-                /d:sonar.organization="lukeiam-github" `
+                /k:"Vocaluxe" `
+                /d:sonar.organization="vocaluxe" `
                 /d:sonar.host.url="https://sonarcloud.io" `
                 /v:"$Env:GIT_VERSION_TAG" `
                 /d:sonar.login="$Env:SonarQubeToken" `
@@ -82,14 +89,7 @@ after_build:
 - ps: |
     ./.appveyor/runGitLink.ps1
     
-    cd Output
-
-    $Env:MAIN_REPO = $False
-
-    if($Env:APPVEYOR_REPO_NAME -eq "Vocaluxe/Vocaluxe"){
-        $Env:MAIN_REPO = $True
-        Write-Host "Main repo Vocaluxe/Vocaluxe detected"
-    }
+    cd Output   
 
     $forkBuildTag = ""
     if(($Env:MAIN_REPO -ne $True) -or ($Env:APPVEYOR_ACCOUNT_NAME -ne "VocaluxeBuildBot")){
@@ -111,7 +111,7 @@ after_build:
     }
 test_script:
 - ps: |
-    if ($Env:PLATFORM -eq 'x64' -and ($Env:APPVEYOR_PULL_REQUEST_NUMBER -or $Env:APPVEYOR_REPO_BRANCH -eq 'develop')){
+    if (($Env:MAIN_REPO) -and ($Env:PLATFORM -eq 'x64') -and ($Env:APPVEYOR_PULL_REQUEST_NUMBER -or $Env:APPVEYOR_REPO_BRANCH -eq 'develop')){
         OpenCover.Console.exe -register:user -target:"nunit3-console.exe" -targetargs:".\Tests\bin\Release\Tests.dll --result=.\TestResult.xml;format=AppVeyor" -output:".\CoverageResult.xml"
     }
     else{
@@ -122,7 +122,7 @@ test_script:
 
 after_test:
 - ps: |
-    if ($Env:PLATFORM -eq 'x64' -and ($Env:APPVEYOR_PULL_REQUEST_NUMBER -or $Env:APPVEYOR_REPO_BRANCH -eq 'develop')){
+    if (($Env:MAIN_REPO) -and ($Env:PLATFORM -eq 'x64') -and ($Env:APPVEYOR_PULL_REQUEST_NUMBER -or $Env:APPVEYOR_REPO_BRANCH -eq 'develop')){
         SonarScanner.MSBuild.exe end /d:sonar.login="$Env:SonarQubeToken"
     }
 before_deploy: