diff --git a/appveyor.yml b/appveyor.yml
index 72ce178..cf2d717 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,9 +12,6 @@ platform: x64
 
 environment:
   global:
-    docker_login: infactum
-    docker_password:
-      secure: wWPsUiEtw8rfnjX2/Y3/AA==
     docker_image: infactum/tg2sip-builder
 
   matrix:
@@ -29,13 +26,9 @@ environment:
 
 init:
   - sh: |
-      docker login -u "$docker_login" -p "$docker_password"
       docker pull "$docker_image":"$docker_tag"
 
-install:
-  - sh: docker build buildenv/ -f buildenv/Dockerfile."$docker_tag" --cache-from "$docker_image":"$docker_tag" -t "$docker_image":"$docker_tag"
-
-build_script: 
+build_script:
   - sh: >- 
       if [ "$target_name" != "AppImage" ] ; then
       mkdir build;
@@ -74,7 +67,6 @@ build_script:
       fi;
 
 after_build:
-  - sh: docker push "$docker_image":"$docker_tag"
   - sh: >-
       if [ "$target_name" != "AppImage" ] ; then
         appveyor PushArtifact tg2sip.zip -FileName tg2sip_"$docker_tag".zip -DeploymentName "TG2SIP $target_name"
diff --git a/buildenv/prepare.sh b/buildenv/prepare.sh
new file mode 100755
index 0000000..5590b1b
--- /dev/null
+++ b/buildenv/prepare.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DOCKER_IMAGE=infactum/tg2sip-builder
+
+for DOCKER_TAG in bionic centos6 centos7
+do
+    docker build . -f Dockerfile."$DOCKER_TAG" -t "$DOCKER_IMAGE:$DOCKER_TAG"
+    docker push "$DOCKER_IMAGE:$DOCKER_TAG"
+done