diff --git a/appveyor.yml b/appveyor.yml
index 36d114cffb..21b51b4217 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -20,14 +20,11 @@ init:
 
 install:
 - ps: |
-    $env:STUB_CORE_VER = "dev"
-    $env:STUB_WEB_VER = "dev"
     $env:PROD_DEPLOY = "false"
     $env:TAG_NAME = ""
     if($env:APPVEYOR_REPO_TAG -eq "true" -and $env:APPVEYOR_RE_BUILD -eq "True") {
       $env:PROD_DEPLOY = "true"
       $env:TAG_NAME = $env:APPVEYOR_REPO_TAG_NAME.TrimStart("v")
-      $env:STUB_CORE_VER = $env:TAG_NAME
       echo "This is a production deployment for ${env:TAG_NAME}."
     }
     if($isLinux) {
@@ -87,12 +84,15 @@ build_script:
     }
 - sh: |
     echo "Make docker stubs"
-    mkdir stub
-    docker run -it --rm --name setup -v stub:/bitwarden bitwarden/setup:$STUB_CORE_VER \
-      dotnet Setup.dll -stub 1 -install 1 -domain bitwarden.company.com -os lin \
-      -corev $STUB_CORE_VER -webv $STUB_WEB_VER
-    cd stub
-    ls
+    STUB_OUTPUT=$(pwd)/docker-stub
+    docker run -it --rm --name setup -v $STUB_OUTPUT:/bitwarden bitwarden/setup:dev \
+      dotnet Setup.dll -stub 1 -install 1 -domain bitwarden.company.com -os lin
+    rm -rf $STUB_OUTPUT/ca-certificates
+    rm -rf $STUB_OUTPUT/identity
+    rm -rf $STUB_OUTPUT/letsencrypt
+    rm -rf $STUB_OUTPUT/ssl
+    rm $STUB_OUTPUT/env/uid.env
+- ps: Push-AppveyorArtifact .\docker-stub
 
 
 after_build: