diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 00000000..602379b6
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,3 @@
+jobs:
+  -
+    template: internal/docker/docker_pipelines_template.yml
diff --git a/internal/cmd/setup/test.go b/internal/cmd/setup/test.go
index 5deb316a..ddbf0272 100644
--- a/internal/cmd/setup/test.go
+++ b/internal/cmd/setup/test.go
@@ -107,6 +107,8 @@ func Test(target string, docker, vagrant bool, vagrantsystem string) {
 
 			"sailfish": []string{"listview", "listview_variant"},
 
+			"showcases": []string{"sia"},
+
 			"sql": []string{"masterdetail", "masterdetail_qml", "querymodel"},
 
 			"uitools": []string{"calculator"},
@@ -146,7 +148,10 @@ func Test(target string, docker, vagrant bool, vagrantsystem string) {
 			}
 
 			if (target == "js" || target == "wasm") &&
-				cat == "charts" || cat == "uitools" || cat == "sql" {
+				cat == "charts" || cat == "uitools" || cat == "sql" ||
+				cat == "androidextras" || cat == "qt3d" || cat == "webchannel" ||
+				(cat == "widgets" && strings.HasPrefix(example, "treeview")) ||
+				example == "video_player" {
 				continue
 			}
 
diff --git a/internal/docker/docker_job_template.yml b/internal/docker/docker_job_template.yml
new file mode 100644
index 00000000..bc628dc5
--- /dev/null
+++ b/internal/docker/docker_job_template.yml
@@ -0,0 +1,11 @@
+jobs:
+  -
+    job: '${{ parameters.tag }}'
+    pool:
+      vmImage: ubuntu-16.04
+    dependsOn: '${{ parameters.dep }}'
+    steps:
+      -
+        script: 'docker build -f internal/docker/${{ parameters.file }} -t therecipe/qt:${{ parameters.tag }} .'
+      -
+        script: 'docker login -u therecipe -p $(DOCKER_PASSWORD) && docker push therecipe/qt:${{ parameters.tag }} && docker logout'
diff --git a/internal/docker/docker_pipelines_template.yml b/internal/docker/docker_pipelines_template.yml
new file mode 100644
index 00000000..d6ab2044
--- /dev/null
+++ b/internal/docker/docker_pipelines_template.yml
@@ -0,0 +1,221 @@
+jobs:
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: android/Dockerfile
+      tag: android
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: js/Dockerfile
+      tag: js
+      dep:
+        - js_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: js/Dockerfile.base
+      tag: js_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: js/Dockerfile.wasm
+      tag: wasm
+      dep:
+        - js_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile
+      tag: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile.56
+      tag: linux_56
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile.59
+      tag: linux_59
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile.arch
+      tag: linux_arch
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile.ubuntu_16_04
+      tag: linux_ubuntu_16_04
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: linux/Dockerfile.ubuntu_18_04
+      tag: linux_ubuntu_18_04
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: sailfish/Dockerfile
+      tag: sailfish
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: ubports/Dockerfile.64_vivid
+      tag: ubports_64_vivid
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: ubports/Dockerfile.64_xenial
+      tag: ubports_64_xenial
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: ubports/Dockerfile.arm_vivid
+      tag: ubports_arm_vivid
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: ubports/Dockerfile.arm_xenial
+      tag: ubports_arm_xenial
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_32_shared/Dockerfile
+      tag: windows_32_shared
+      dep:
+        - windows_32_shared_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_32_shared/Dockerfile.base
+      tag: windows_32_shared_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_32_static/Dockerfile
+      tag: windows_32_static
+      dep:
+        - windows_32_static_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_32_static/Dockerfile.base
+      tag: windows_32_static_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_64_shared/Dockerfile
+      tag: windows_64_shared
+      dep:
+        - windows_64_shared_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_64_shared/Dockerfile.base
+      tag: windows_64_shared_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_64_static/Dockerfile
+      tag: windows_64_static
+      dep:
+        - windows_64_static_base
+        - linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_64_static/Dockerfile.base
+      tag: windows_64_static_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_legacy/Dockerfile.32_shared
+      tag: windows_32_shared_legacy
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_legacy/Dockerfile.32_static
+      tag: windows_32_static_legacy
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_legacy/Dockerfile.64_shared
+      tag: windows_64_shared_legacy
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: windows_legacy/Dockerfile.64_static
+      tag: windows_64_static_legacy
+      dep: linux
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile
+      tag: windows_32_shared_wine
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.32_shared
+      tag: windows_32_shared_msys2
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.32_static
+      tag: windows_32_static_msys2
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.56
+      tag: windows_32_shared_56
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.56_xp
+      tag: windows_32_shared_56_xp
+      dep: wine_base_xp
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.59
+      tag: windows_32_shared_59
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.64_shared
+      tag: windows_64_shared_msys2
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.64_static
+      tag: windows_64_static_msys2
+      dep: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.base
+      tag: wine_base
+  -
+    template: docker_job_template.yml
+    parameters:
+      file: wine/Dockerfile.base_xp
+      tag: wine_base_xp
diff --git a/internal/docker/js/Dockerfile b/internal/docker/js/Dockerfile
index a116db1f..1ef39459 100644
--- a/internal/docker/js/Dockerfile
+++ b/internal/docker/js/Dockerfile
@@ -14,9 +14,9 @@ COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
 COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt
 COPY --from=therecipe/qt:linux /opt/Qt/5.11.1/gcc_64/include /opt/Qt/5.11.1/gcc_64/include
 COPY --from=therecipe/qt:linux /opt/Qt/Docs /opt/Qt/Docs
-COPY --from=therecipe/qt:js_base_4 $HOME/emsdk $HOME/emsdk
-COPY --from=therecipe/qt:js_base_4 $HOME/.emscripten $HOME/.emscripten
-COPY --from=therecipe/qt:js_base_4 /usr/local/Qt-5.12.0 /usr/local/Qt-5.12.0
+COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk
+COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten
+COPY --from=therecipe/qt:js_base /usr/local/Qt-5.12.0 /usr/local/Qt-5.12.0
 
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install git && apt-get -qq clean
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
diff --git a/internal/docker/js/Dockerfile.base b/internal/docker/js/Dockerfile.base
new file mode 100644
index 00000000..3a425c74
--- /dev/null
+++ b/internal/docker/js/Dockerfile.base
@@ -0,0 +1,50 @@
+FROM ubuntu:16.04
+LABEL maintainer therecipe
+
+ENV USER user
+ENV HOME /home/$USER
+
+RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential git
+
+RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre
+RUN ln -s /usr/bin/python2.7 /usr/bin/python
+RUN git clone https://github.com/juj/emsdk.git $HOME/emsdk && cd $HOME/emsdk && ./emsdk install latest && ./emsdk activate latest
+
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtbase.git /opt/qtbase
+RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
+	&& cd /opt/qtbase && ./configure -xplatform wasm-emscripten -nomake tests -nomake examples -confirm-license -opensource && make && make install" > $HOME/build.sh \
+	&& chmod +x $HOME/build.sh && $HOME/build.sh
+
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtdeclarative.git /opt/qtdeclarative
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtwebsockets.git /opt/qtwebsockets
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtgraphicaleffects.git /opt/qtgraphicaleffects
+
+RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
+	&& cd /opt/qtdeclarative && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtwebsockets && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtgraphicaleffects && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
+	&& chmod +x $HOME/build.sh && $HOME/build.sh
+
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtquickcontrols.git /opt/qtquickcontrols
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtquickcontrols2.git /opt/qtquickcontrols2
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtsvg.git /opt/qtsvg
+
+RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
+	&& cd /opt/qtquickcontrols && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtquickcontrols2 && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install\
+	&& cd /opt/qtsvg && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
+	&& chmod +x $HOME/build.sh && $HOME/build.sh
+
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtcharts.git /opt/qtcharts
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtxmlpatterns.git /opt/qtxmlpatterns
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtcanvas3d.git /opt/qtcanvas3d
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtdatavis3d.git /opt/qtdatavis3d
+RUN git clone -b 5.12.0 https://code.qt.io/qt/qtmultimedia.git /opt/qtmultimedia
+
+RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
+	&& cd /opt/qtcharts && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtxmlpatterns && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtcanvas3d && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtdatavis3d && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
+	&& cd /opt/qtmultimedia && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
+	&& chmod +x $HOME/build.sh && $HOME/build.sh
diff --git a/internal/docker/js/Dockerfile.base_1 b/internal/docker/js/Dockerfile.base_1
deleted file mode 100644
index d9a80a98..00000000
--- a/internal/docker/js/Dockerfile.base_1
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:16.04
-LABEL maintainer therecipe
-
-ENV USER user
-ENV HOME /home/$USER
-
-RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install build-essential git
-
-RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre
-RUN ln -s /usr/bin/python2.7 /usr/bin/python
-RUN git clone https://github.com/juj/emsdk.git $HOME/emsdk && cd $HOME/emsdk && ./emsdk install latest && ./emsdk activate latest
-
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtbase.git /opt/qtbase
-RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
-	&& cd /opt/qtbase && ./configure -xplatform wasm-emscripten -nomake tests -nomake examples -confirm-license -opensource && make && make install" > $HOME/build.sh \
-	&& chmod +x $HOME/build.sh && $HOME/build.sh
diff --git a/internal/docker/js/Dockerfile.base_2 b/internal/docker/js/Dockerfile.base_2
deleted file mode 100644
index 34ffddc0..00000000
--- a/internal/docker/js/Dockerfile.base_2
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM therecipe/qt:js_base_1
-LABEL maintainer therecipe
-
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtdeclarative.git /opt/qtdeclarative
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtwebsockets.git /opt/qtwebsockets
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtgraphicaleffects.git /opt/qtgraphicaleffects
-
-RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
-	&& cd /opt/qtdeclarative && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtwebsockets && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtgraphicaleffects && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
-	&& chmod +x $HOME/build.sh && $HOME/build.sh
diff --git a/internal/docker/js/Dockerfile.base_3 b/internal/docker/js/Dockerfile.base_3
deleted file mode 100644
index 3a8d6479..00000000
--- a/internal/docker/js/Dockerfile.base_3
+++ /dev/null
@@ -1,12 +0,0 @@
-FROM therecipe/qt:js_base_2
-LABEL maintainer therecipe
-
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtquickcontrols.git /opt/qtquickcontrols
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtquickcontrols2.git /opt/qtquickcontrols2
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtsvg.git /opt/qtsvg
-
-RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
-	&& cd /opt/qtquickcontrols && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtquickcontrols2 && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install\
-	&& cd /opt/qtsvg && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
-	&& chmod +x $HOME/build.sh && $HOME/build.sh
diff --git a/internal/docker/js/Dockerfile.base_4 b/internal/docker/js/Dockerfile.base_4
deleted file mode 100644
index 99cf3620..00000000
--- a/internal/docker/js/Dockerfile.base_4
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM therecipe/qt:js_base_3
-LABEL maintainer therecipe
-
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtcharts.git /opt/qtcharts
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtxmlpatterns.git /opt/qtxmlpatterns
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtcanvas3d.git /opt/qtcanvas3d
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtdatavis3d.git /opt/qtdatavis3d
-RUN git clone -b 5.12.0 https://code.qt.io/qt/qtmultimedia.git /opt/qtmultimedia
-
-RUN echo "#!/bin/bash\nsource $HOME/emsdk/emsdk_env.sh \
-	&& cd /opt/qtcharts && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtxmlpatterns && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtcanvas3d && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtdatavis3d && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install \
-	&& cd /opt/qtmultimedia && /usr/local/Qt-5.12.0/bin/qmake *.pro && make && make install" > $HOME/build.sh \
-	&& chmod +x $HOME/build.sh && $HOME/build.sh
diff --git a/internal/docker/js/Dockerfile.wasm b/internal/docker/js/Dockerfile.wasm
index 20b9d241..1c21bc2a 100644
--- a/internal/docker/js/Dockerfile.wasm
+++ b/internal/docker/js/Dockerfile.wasm
@@ -23,9 +23,9 @@ COPY --from=therecipe/qt:linux $GOPATH/bin $GOPATH/bin
 COPY --from=therecipe/qt:linux $GOPATH/src/github.com/therecipe/qt $GOPATH/src/github.com/therecipe/qt
 COPY --from=therecipe/qt:linux /opt/Qt/5.11.1/gcc_64/include /opt/Qt/5.11.1/gcc_64/include
 COPY --from=therecipe/qt:linux /opt/Qt/Docs /opt/Qt/Docs
-COPY --from=therecipe/qt:js_base_4 $HOME/emsdk $HOME/emsdk
-COPY --from=therecipe/qt:js_base_4 $HOME/.emscripten $HOME/.emscripten
-COPY --from=therecipe/qt:js_base_4 /usr/local/Qt-5.12.0 /usr/local/Qt-5.12.0
+COPY --from=therecipe/qt:js_base $HOME/emsdk $HOME/emsdk
+COPY --from=therecipe/qt:js_base $HOME/.emscripten $HOME/.emscripten
+COPY --from=therecipe/qt:js_base /usr/local/Qt-5.12.0 /usr/local/Qt-5.12.0
 
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install python2.7 nodejs cmake default-jre && apt-get -qq clean
 RUN ln -s /usr/bin/python2.7 /usr/bin/python
diff --git a/internal/docker/trigger/Dockerfile b/internal/docker/trigger/Dockerfile
deleted file mode 100644
index eeaf29d0..00000000
--- a/internal/docker/trigger/Dockerfile
+++ /dev/null
@@ -1,68 +0,0 @@
-FROM ubuntu:16.04
-LABEL maintainer therecipe
-
-ARG SECRET
-
-RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates curl && apt-get -qq clean
-
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "wine_base"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_wine"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "linux"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "android"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "js_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "js"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "wasm"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "rpi_base"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "rpi1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "rpi2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "rpi3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "sailfish"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "ubports_arm_vivid"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "ubports_64_vivid"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "ubports_arm_xenial"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "ubports_64_xenial"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_5"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_6"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_base_7"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_5"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_6"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_base_7"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_5"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_6"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_base_7"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_1"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_3"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_4"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_5"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_6"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-#RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_base_7"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "wine_base_xp"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_shared_msys2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_64_static_msys2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_msys2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_static_msys2"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_xp"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_56"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-RUN sleep 120 && curl -H "Content-Type: application/json" --data '{"docker_tag": "windows_32_shared_59"}' -X POST https://registry.hub.docker.com/u/therecipe/qt/trigger/$SECRET/
-
-RUN exit 1
diff --git a/internal/docker/trigger/hooks/build b/internal/docker/trigger/hooks/build
deleted file mode 100755
index d5acf0ac..00000000
--- a/internal/docker/trigger/hooks/build
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-docker build --build-arg SECRET=$SECRET -t $IMAGE_NAME .
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_1 b/internal/docker/windows_32_shared/Dockerfile.base
similarity index 90%
rename from internal/docker/windows_32_shared/Dockerfile.base_1
rename to internal/docker/windows_32_shared/Dockerfile.base
index f875e21f..2cd7a591 100644
--- a/internal/docker/windows_32_shared/Dockerfile.base_1
+++ b/internal/docker/windows_32_shared/Dockerfile.base
@@ -4,4 +4,5 @@ LABEL maintainer therecipe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
 RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' gcc gettext openssl glib lzo
+
+RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qt5 && rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
\ No newline at end of file
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_2 b/internal/docker/windows_32_shared/Dockerfile.base_2
deleted file mode 100644
index 62c3e1d3..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_2
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_1
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_3 b/internal/docker/windows_32_shared/Dockerfile.base_3
deleted file mode 100644
index 4690967b..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_3
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_2
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qtbase
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_4 b/internal/docker/windows_32_shared/Dockerfile.base_4
deleted file mode 100644
index 6b36c7f9..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_4
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_3
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qtdeclarative
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_5 b/internal/docker/windows_32_shared/Dockerfile.base_5
deleted file mode 100644
index 4e63923e..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_5
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_4
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qt3d
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_6 b/internal/docker/windows_32_shared/Dockerfile.base_6
deleted file mode 100644
index 1cdd988c..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_6
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_5
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
diff --git a/internal/docker/windows_32_shared/Dockerfile.base_7 b/internal/docker/windows_32_shared/Dockerfile.base_7
deleted file mode 100644
index 86235e84..00000000
--- a/internal/docker/windows_32_shared/Dockerfile.base_7
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM therecipe/qt:windows_32_shared_base_6 as base
-
-RUN mv /usr/lib/mxe/src/qtwebkit.mk /usr/lib/mxe/src/exclude_qtwebkit.mk
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.shared' qt5
-RUN mv /usr/lib/mxe/src/exclude_qtwebkit.mk /usr/lib/mxe/src/qtwebkit.mk
-RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_32_static/Dockerfile.base_1 b/internal/docker/windows_32_static/Dockerfile.base
similarity index 90%
rename from internal/docker/windows_32_static/Dockerfile.base_1
rename to internal/docker/windows_32_static/Dockerfile.base
index 6e748267..def531c5 100644
--- a/internal/docker/windows_32_static/Dockerfile.base_1
+++ b/internal/docker/windows_32_static/Dockerfile.base
@@ -4,4 +4,5 @@ LABEL maintainer therecipe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
 RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' gcc gettext openssl glib lzo
+
+RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qt5 && rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_32_static/Dockerfile.base_2 b/internal/docker/windows_32_static/Dockerfile.base_2
deleted file mode 100644
index a3fa5c86..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_2
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_1
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
diff --git a/internal/docker/windows_32_static/Dockerfile.base_3 b/internal/docker/windows_32_static/Dockerfile.base_3
deleted file mode 100644
index d1a5deed..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_3
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_2
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qtbase
diff --git a/internal/docker/windows_32_static/Dockerfile.base_4 b/internal/docker/windows_32_static/Dockerfile.base_4
deleted file mode 100644
index 8dbc17ce..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_4
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_3
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qtdeclarative
diff --git a/internal/docker/windows_32_static/Dockerfile.base_5 b/internal/docker/windows_32_static/Dockerfile.base_5
deleted file mode 100644
index 4daa7948..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_5
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_4
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qt3d
diff --git a/internal/docker/windows_32_static/Dockerfile.base_6 b/internal/docker/windows_32_static/Dockerfile.base_6
deleted file mode 100644
index 0cef3c70..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_6
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_5
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
diff --git a/internal/docker/windows_32_static/Dockerfile.base_7 b/internal/docker/windows_32_static/Dockerfile.base_7
deleted file mode 100644
index 9ba4d54f..00000000
--- a/internal/docker/windows_32_static/Dockerfile.base_7
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_32_static_base_6 as base
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='i686-w64-mingw32.static' qt5
-RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_1 b/internal/docker/windows_64_shared/Dockerfile.base
similarity index 90%
rename from internal/docker/windows_64_shared/Dockerfile.base_1
rename to internal/docker/windows_64_shared/Dockerfile.base
index 256dc1dc..2e795e3f 100644
--- a/internal/docker/windows_64_shared/Dockerfile.base_1
+++ b/internal/docker/windows_64_shared/Dockerfile.base
@@ -4,4 +4,5 @@ LABEL maintainer therecipe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
 RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' gcc gettext openssl glib lzo
+
+RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qt5 && rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_2 b/internal/docker/windows_64_shared/Dockerfile.base_2
deleted file mode 100644
index 0f7413e5..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_2
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_1
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_3 b/internal/docker/windows_64_shared/Dockerfile.base_3
deleted file mode 100644
index 46a09dcd..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_3
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_2
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtbase
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_4 b/internal/docker/windows_64_shared/Dockerfile.base_4
deleted file mode 100644
index f60f18a9..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_4
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_3
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtdeclarative
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_5 b/internal/docker/windows_64_shared/Dockerfile.base_5
deleted file mode 100644
index 5fcee764..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_5
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_4
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qt3d
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_6 b/internal/docker/windows_64_shared/Dockerfile.base_6
deleted file mode 100644
index fee0406b..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_6
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_5
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
diff --git a/internal/docker/windows_64_shared/Dockerfile.base_7 b/internal/docker/windows_64_shared/Dockerfile.base_7
deleted file mode 100644
index c36b1cda..00000000
--- a/internal/docker/windows_64_shared/Dockerfile.base_7
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM therecipe/qt:windows_64_shared_base_6 as base
-
-RUN mv /usr/lib/mxe/src/qtwebkit.mk /usr/lib/mxe/src/exclude_qtwebkit.mk
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.shared' qt5
-RUN mv /usr/lib/mxe/src/exclude_qtwebkit.mk /usr/lib/mxe/src/qtwebkit.mk
-RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_64_static/Dockerfile.base_1 b/internal/docker/windows_64_static/Dockerfile.base
similarity index 90%
rename from internal/docker/windows_64_static/Dockerfile.base_1
rename to internal/docker/windows_64_static/Dockerfile.base
index ad002323..6460cf89 100644
--- a/internal/docker/windows_64_static/Dockerfile.base_1
+++ b/internal/docker/windows_64_static/Dockerfile.base
@@ -4,4 +4,5 @@ LABEL maintainer therecipe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install ca-certificates git
 RUN git clone https://github.com/mxe/mxe.git /usr/lib/mxe
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install autoconf automake autopoint bash bison bzip2 flex g++ g++-multilib gettext git gperf intltool libc6-dev-i386 libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin libxml-parser-perl make openssl p7zip-full patch perl pkg-config python ruby scons sed unzip wget xz-utils
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' gcc gettext openssl glib lzo
+
+RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt5 && rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/windows_64_static/Dockerfile.base_2 b/internal/docker/windows_64_static/Dockerfile.base_2
deleted file mode 100644
index a7912148..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_2
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_1
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' icu4c bzip2 libpng freetype-bootstrap fontconfig freetds pixman cairo harfbuzz freetype jpeg cmake cmake-conf libmysqlclient pcre2 pthreads postgresql sqlite
diff --git a/internal/docker/windows_64_static/Dockerfile.base_3 b/internal/docker/windows_64_static/Dockerfile.base_3
deleted file mode 100644
index 60d38cbf..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_3
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_2
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtbase
diff --git a/internal/docker/windows_64_static/Dockerfile.base_4 b/internal/docker/windows_64_static/Dockerfile.base_4
deleted file mode 100644
index f1c00df8..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_4
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_3
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtdeclarative
diff --git a/internal/docker/windows_64_static/Dockerfile.base_5 b/internal/docker/windows_64_static/Dockerfile.base_5
deleted file mode 100644
index 5bdc1673..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_5
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_4
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt3d
diff --git a/internal/docker/windows_64_static/Dockerfile.base_6 b/internal/docker/windows_64_static/Dockerfile.base_6
deleted file mode 100644
index f59b15b4..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_6
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_5
-LABEL maintainer therecipe
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qtactiveqt qtcanvas3d qtmultimedia qtcharts qtconnectivity qtdatavis3d qtgraphicaleffects jasper xz tiff lcms libmng libwebp qtimageformats qtlocation
diff --git a/internal/docker/windows_64_static/Dockerfile.base_7 b/internal/docker/windows_64_static/Dockerfile.base_7
deleted file mode 100644
index 686e108a..00000000
--- a/internal/docker/windows_64_static/Dockerfile.base_7
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM therecipe/qt:windows_64_static_base_6 as base
-
-RUN cd /usr/lib/mxe && make MXE_TARGETS='x86_64-w64-mingw32.static' qt5
-RUN rm -rf /usr/lib/mxe/log && rm -rf /usr/lib/mxe/pkg
diff --git a/internal/docker/wine/Dockerfile.32_static b/internal/docker/wine/Dockerfile.32_static
index b1e4fbbb..7a30ee6a 100644
--- a/internal/docker/wine/Dockerfile.32_static
+++ b/internal/docker/wine/Dockerfile.32_static
@@ -106,7 +106,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq-
 RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w
 
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean
-ADD rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
+ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
 RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch
 RUN wine go install cmd/go cmd/link
 
diff --git a/internal/docker/wine/Dockerfile.64_static b/internal/docker/wine/Dockerfile.64_static
index c7dc44b7..700d9a5a 100644
--- a/internal/docker/wine/Dockerfile.64_static
+++ b/internal/docker/wine/Dockerfile.64_static
@@ -106,7 +106,7 @@ RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install winehq-
 RUN WINEDLLOVERRIDES="mscoree,mshtml=" wineboot && wineserver -w
 
 RUN apt-get -qq update && apt-get --no-install-recommends -qq -y install patch && apt-get -qq clean
-ADD rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
+ADD https://raw.githubusercontent.com/therecipe/qt/master/internal/docker/wine/rspfile.patch $HOME/.wine/drive_c/go/rspfile.patch
 RUN cd $HOME/.wine/drive_c/go && patch -p 1 < rspfile.patch
 RUN wine go install cmd/go cmd/link