diff --git a/accountfree-build-img-wine/Dockerfile b/accountfree-build-img-wine/Dockerfile
index 252af60..a1a92e7 100644
--- a/accountfree-build-img-wine/Dockerfile
+++ b/accountfree-build-img-wine/Dockerfile
@@ -1,17 +1,16 @@
-FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.12.2
-
+FROM ad5001/ubuntu-pyside2-xvfb-wine:win7-5.14.1
 RUN apt-get update
-# Installing tor to not get the popup
 RUN apt install unzip nsis -y
-RUN wget https://dist.torproject.org/torbrowser/9.0.1/tor-win32-0.4.1.6.zip
-RUN unzip tor-win32-0.4.1.6.zip -x Data/*
+# Installing tor to not get the popup
+RUN wget https://dist.torproject.org/torbrowser/9.0.5/tor-win64-0.4.2.6.zip
+RUN unzip tor-win64-0.4.2.6.zip -x Data/*
 RUN mv Tor /wine/drive_c/
 RUN wine reg ADD "HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" /v PATH /f /t REG_EXPAND_SZ /d "C:\windows\system32;C:\windows;C:\windows\system32\wbem;C:\Tor"
-RUN rm tor-win32-0.4.1.6.zip
+RUN rm tor-win64-0.4.2.6.zip
 
 # Installing pyinstaller
 RUN pip install pyinstaller
-RUN echo 'wine '\''C:\Python36\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller
+RUN echo 'wine '\''C:\Python37\Scripts\pyinstaller.exe'\'' "$@"' > /usr/bin/pyinstaller
 RUN chmod +x /usr/bin/pyinstaller
 
 # Installing dependencies
diff --git a/ubuntu-pyside2-xvfb-wine/Dockerfile b/ubuntu-pyside2-xvfb-wine/Dockerfile
index be4c6e8..f15f988 100644
--- a/ubuntu-pyside2-xvfb-wine/Dockerfile
+++ b/ubuntu-pyside2-xvfb-wine/Dockerfile
@@ -1,19 +1,25 @@
-FROM ubuntu:18.04
+FROM ubuntu:19.10
 
-# Much of the work here comes from cdrx/docker-pyinstaller adapted for drone and with modifications for Qt
+# Some of the work here comes from cdrx/docker-pyinstaller adapted for drone and with modifications for Qt
 ARG WINE_VERSION=winehq-staging
-ARG PYTHON_VERSION=3.6.4
-ARG PYINSTALLER_VERSION=3.4
+ARG PYTHON_VERSION=3.7.6
+ARG PYINSTALLER_VERSION=3.6
 
-# we need wine for this all to work, so we'll use the PPA
+# Installing dependencies
 RUN set -x \
     && dpkg --add-architecture i386 \
     && apt-get update -qy \
-    && apt-get install --no-install-recommends -qfy rename gpg-agent apt-transport-https software-properties-common wget \
+    && apt-get upgrade -qy \
+    && apt-get install --no-install-recommends -qfy rename gpg-agent apt-transport-https software-properties-common wget curl p7zip
+    #&& apt-get install --no-install-recommends -qfy gcc-multilib libasound2-dev:i386 libgsm1-dev:i386 libjpeg8-dev:i386 liblcms2-dev:i386 libldap2-dev:i386 libmpg123-dev:i386 libopenal-dev:i386 libv4l-dev:i386 libx11-dev:i386 libxinerama-dev:i386 libxml2-dev:i386 zlib1g-dev:i386 \
+    #&& apt-get install --no-install-recommends -qfy libcapi20-dev:i386 libcups2:i386 libdbus-1-3:i386 libfontconfig:i386 libfreetype6:i386 libglu1-mesa:i386 libgphoto2-6:i386 libncurses5:i386 libosmesa6:i386 libsane:i386 libxcomposite1:i386 libxcursor1:i386 libxi6:i386 libxrandr2:i386 libxslt1.1:i386 ocl-icd-libopencl1:i386 libgd3:i386
+# We need wine for this all to work, so we'll use the PPA
+RUN set -x \
     && wget -nv https://dl.winehq.org/wine-builds/winehq.key \
     && apt-key add winehq.key \
     && add-apt-repository 'https://dl.winehq.org/wine-builds/ubuntu/' \
     && apt-get update -qy \
+    && apt-get install --no-install-recommends -qfy wine-staging-amd64 wine-staging \
     && apt-get install --no-install-recommends -qfy $WINE_VERSION winbind cabextract \
     && apt-get clean \
     && wget -nv https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks \
@@ -36,16 +42,16 @@ RUN set -x \
     && winetricks win7 \
     && for msifile in `echo core dev exe lib path pip tcltk tools`; do \
         wget -nv "https://www.python.org/ftp/python/$PYTHON_VERSION/amd64/${msifile}.msi"; \
-        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python36; \
+        wine msiexec /i "${msifile}.msi" /qb TARGETDIR=C:/Python37; \
         rm ${msifile}.msi; \
     done \
-    && cd /wine/drive_c/Python36 \
-    && echo 'wine '\''C:\Python36\python.exe'\'' "$@"' > /usr/bin/python \
-    && echo 'wine '\''C:\Python36\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
-    && echo 'wine '\''C:\Python36\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
-    && echo 'wine '\''C:\Python36\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
+    && cd /wine/drive_c/Python37 \
+    && echo 'wine '\''C:\Python37\python.exe'\'' "$@"' > /usr/bin/python \
+    && echo 'wine '\''C:\Python37\Scripts\easy_install.exe'\'' "$@"' > /usr/bin/easy_install \
+    && echo 'wine '\''C:\Python37\Scripts\pip.exe'\'' "$@"' > /usr/bin/pip \
+    && echo 'wine '\''C:\Python37\Scripts\pyupdater.exe'\'' "$@"' > /usr/bin/pyupdater \
     && echo 'assoc .py=PythonScript' | wine cmd \
-    && echo 'ftype PythonScript=c:\Python36\python.exe "%1" %*' | wine cmd \
+    && echo 'ftype PythonScript=c:\Python37\python.exe "%1" %*' | wine cmd \
     && while pgrep wineserver >/dev/null; do echo "Waiting for wineserver"; sleep 1; done \
     && chmod +x /usr/bin/python /usr/bin/easy_install /usr/bin/pip /usr/bin/pyupdater \
     && (pip install -U pip || true) \
@@ -68,16 +74,17 @@ RUN set -x \
 && cp "$W_TMP"/*.dll "$W_SYSTEM64_DLLS"/
 
 # Installing Xvfb to display
-RUN apt-get install xvfb git -y
+RUN apt-get install xvfb git p7zip-full -y
+
+ARG QT_VERSION=5.14.1
+ARG QT_COMPONENTS="qtbase qtquickcontrols qtquickcontrols2 qtmultimedia qtimageformats qtgraphicaleffects qtdeclarative qtconnectivity qtcharts"
 
 # Installing Qt & PySide2
 # Gathering silent install script
-RUN wget https://download.ad5001.eu/other/qt-noninteractive-install.qs
-RUN mv qt-noninteractive-install.qs /wine/drive_c/ 
-# Getting official installer
-RUN wget https://download.qt.io/official_releases/qt/5.12/5.12.2/qt-opensource-windows-x86-5.12.2.exe
-RUN mv qt-opensource-windows-x86-5.12.2.exe /wine/drive_c/windows/qt.exe
-ENV QT_INSTALL_DIR="C:\\Qt"
-RUN xvfb-run wine qt --verbose --script "C:\\qt-noninteractive-install.qs"
-RUN rm /wine/drive_c/qt-noninteractive-install.qs /wine/drive_c/windows/qt.exe
+# RUN wget https://download.ad5001.eu/other/qt-noninteractive-install.qs
+# RUN mv qt-noninteractive-install.qs /wine/drive_c/
+RUN wget https://download.ad5001.eu/other/install-qt.sh \
+    && chmod +x install-qt.sh \
+    && ./install-qt.sh --host windows_x86 --version $QT_VERSION --directory /wine/drive_c/Qt --toolchain win64_msvc2017_64 $QT_COMPONENTS
+RUN rm install-qt.sh
 RUN pip install PySide2
diff --git a/ubuntu-pyside2-xvfb-wine/qtifwsilent.qs b/ubuntu-pyside2-xvfb-wine/qtifwsilent.qs
deleted file mode 100644
index 13b5f39..0000000
--- a/ubuntu-pyside2-xvfb-wine/qtifwsilent.qs
+++ /dev/null
@@ -1,54 +0,0 @@
-function Controller() {
-    installer.autoRejectMessageBoxes();
-    installer.installationFinished.connect(function() {
-        gui.clickButton(buttons.NextButton);
-    })
-}
-
-Controller.prototype.WelcomePageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.CredentialsPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.IntroductionPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.TargetDirectoryPageCallback = function() {
-    gui.currentPageWidget().TargetDirectoryLineEdit.setText(installer.environmentVariable("QT_INSTALL_DIR"));
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ComponentSelectionPageCallback = function() {
-    var widget = gui.currentPageWidget();
-    widget.deselectAll();
-    widget.selectComponent("qt.593.win32_msvc2015");
-    widget.selectComponent("qt.593.win64_msvc2015_64");
-    widget.selectComponent("qt.593.qtscript");
-    widget.selectComponent("qt.tools.vcredist_msvc2015_x86");
-    widget.selectComponent("qt.tools.vcredist_msvc2015_x64");
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.LicenseAgreementPageCallback = function() {
-    gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.StartMenuDirectoryPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.ReadyForInstallationPageCallback = function() {
-    gui.clickButton(buttons.NextButton);
-}
-
-Controller.prototype.FinishedPageCallback = function() {
-    var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm;
-    if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox)
-        checkBoxForm.launchQtCreatorCheckBox.checked = false;
-    gui.clickButton(buttons.FinishButton);
-}