diff --git a/appveyor.yml b/appveyor.yml
index cedba3b64..9937e3a3a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 image:
-#- Visual Studio 2017
+- Visual Studio 2017
 - Ubuntu1804
 
 branches:
@@ -37,13 +37,13 @@ install:
     sudo apt-get -qq update
     sudo apt-get -qqy install --no-install-recommends fdroidserver wget
 - sh: |
-    #if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
-    #then
+    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
+    then
       git config --global credential.helper store
       echo "https://${GH_TOKEN}:x-oauth-basic@github.com" >> ~/.git-credentials
       git config --global user.email "ci@bitwarden.com"
       git config --global user.name "Bitwarden CI"
-    #fi
+    fi
 - cmd: choco install cloc --no-progress
 - cmd: "cloc --vcs git --exclude-dir Resources,store,test,Properties --include-lang C#,XAML"
 #- cmd: appveyor DownloadFile https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
@@ -66,8 +66,8 @@ before_build:
 
 build_script:
 - sh: |
-    #if [ "${APPVEYOR_REPO_TAG}" == "true" ]
-    #then
+    if [ "${APPVEYOR_REPO_TAG}" == "true" ]
+    then
       mkdir dist
       cp CNAME ./dist
       cd store
@@ -80,7 +80,7 @@ build_script:
       echo "local_copy_dir=\"$TEMP_DIR\"" >>config.py
       mkdir -p repo
       curl -Lo repo/com.x8bit.bitwarden-fdroid.apk \
-        https://github.com/bitwarden/mobile/releases/download/v1.22.1/com.x8bit.bitwarden-fdroid.apk
+        https://github.com/bitwarden/mobile/releases/download/$APPVEYOR_REPO_TAG_NAME/com.x8bit.bitwarden-fdroid.apk
       fdroid update
       fdroid server update
       cd ..
@@ -89,7 +89,7 @@ build_script:
       cd fdroid
       cp index.html btn.png qr.png ../../dist/fdroid
       cd $APPVEYOR_BUILD_FOLDER
-    #fi
+    fi
 - ps: |
     if($isWindows -and $env:KEYSTORE_DEC_SECRET) {
       msbuild bitwarden-mobile.sln `
@@ -102,10 +102,10 @@ build_script:
 
 on_success:
 - sh: |
-    #if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
-    #then
+    if [ "${APPVEYOR_REPO_TAG}" == "true" -a "${GH_TOKEN}" != "" ]
+    then
       npm run deploy
-    #fi
+    fi
 - ps: |
     if($isWindows -and $env:PLAY_DEC_SECRET) {
       secure-file\tools\secure-file -decrypt store\google\Publisher\play_creds.json.enc -secret $env:PLAY_DEC_SECRET