diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d286532..1b08ce0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,39 +4,38 @@ services:
   - docker:dind
 
 variables:
-  CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
   DOCKER_HOST: tcp://docker:2375
   DOCKER_DRIVER: overlay2
 
 before_script:
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
+  - echo "$DOCKER_TOKEN" | docker login --username "$DOCKER_USER" --password-stdin
 
 build-debian:
   stage: build
   script:
-    - docker pull $CONTAINER_IMAGE:debian || true
-    - docker build --cache-from $CONTAINER_IMAGE:debian --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:debian -f Dockerfile.debian .
-    - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_IMAGE:debian
+    - docker pull openlp/debian || true
+    - docker build --cache-from openlp/debian --tag openlp/debian:$CI_COMMIT_SHA --tag openlp/debian:latest -f Dockerfile.debian .
+    - docker push openlp/debian:$CI_COMMIT_SHA
+    - docker push openlp/debian:latest
   only:
     - master@openlp/runners
 
 build-ubuntu:
   stage: build
   script:
-    - docker pull $CONTAINER_IMAGE:ubuntu || true
-    - docker build --cache-from $CONTAINER_IMAGE:ubuntu --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:ubuntu -f Dockerfile.ubuntu .
-    - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_IMAGE:ubuntu
+    - docker pull openlp/ubuntu || true
+    - docker build --cache-from openlp/ubuntu --tag openlp/ubuntu:$CI_COMMIT_SHA --tag openlp/ubuntu:latest -f Dockerfile.ubuntu .
+    - docker push openlp/ubuntu:$CI_COMMIT_SHA
+    - docker push openlp/ubuntu:latest
   only:
     - master@openlp/runners
 
 build-fedora:
   stage: build
   script:
-    - docker pull $CONTAINER_IMAGE:fedora || true
-    - docker build --cache-from $CONTAINER_IMAGE:fedora --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:fedora -f Dockerfile.fedora .
-    - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_IMAGE:fedora
+    - docker pull openlp/fedora || true
+    - docker build --cache-from openlp/fedora --tag openlp/fedora:$CI_COMMIT_SHA --tag openlp/fedora:latest -f Dockerfile.fedora .
+    - docker push openlp/fedora:$CI_COMMIT_SHA
+    - docker push openlp/fedora:latest
   only:
     - master@openlp/runners
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 2d4fe2d..3f082c2 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -2,9 +2,9 @@ FROM debian:unstable
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
-                       python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
-                       python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
-                       python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
-                       python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
-                       python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
-                       python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
+                       python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebengine \
+                       python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic python3-chardet python3-lxml \
+                       python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
+                       python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
+                       python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
+                       python3-flake8 flake8 mediainfo mupdf-tools xvfb
diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index b4f58ea..99aa373 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -2,8 +2,8 @@ FROM fedora
 
 RUN dnf install -y https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
                    https://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
-RUN dnf install -y python3-PyQt5 python3-qt5-webkit python3-qt5-webengine python3-sqlalchemy python3-alembic \
-                   python3-beautifulsoup4 python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest \
-                   python3-websockets python3-appdirs python3-webob python3-QtAwesome python3-waitress \
-                   python3-pymediainfo python3-pyopengl python3-pylint python-pysword python3-requests \
-                   mediainfo patch xorg-x11-server-Xvfb python3-vlc python3-zeroconf
+RUN dnf install -y python3-PyQt5 python3-qt5-webengine python3-sqlalchemy python3-alembic python3-beautifulsoup4 \
+                   python3-chardet python3-enchant python3-lxml python3-pyxdg python3-pytest python3-websockets \
+                   python3-appdirs python3-webob python3-QtAwesome python3-waitress python3-vlc python3-pymediainfo \
+                   python3-pyopengl python-pysword python3-requests python3-zeroconf python3-flake8 mediainfo patch \
+                   xorg-x11-server-Xvfb ghostscript mupdf
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index b7f2951..48b4bdd 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -2,9 +2,9 @@ FROM ubuntu:rolling
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive \
     apt-get install -y python3 qttools5-dev-tools pyqt5-dev-tools python3-pyqt5 python3-pyqt5.qtmultimedia \
-                       python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebkit \
-                       python3-pyqt5.qtwebengine python3-sqlalchemy python3-chardet python3-lxml python3-enchant \
-                       python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov python3-pip \
-                       python3-alembic python3-xdg python3-dbus.mainloop.pyqt5 python3-pep8 python3-websockets \
-                       python3-waitress python3-webob python3-requests python3-pymediainfo python3-qtawesome \
-                       python3-opengl python3-appdirs python3-vlc python3-zeroconf mediainfo pylint3 xvfb
+                       python3-pyqt5.qtsvg python3-pyqt5.qtopengl python3-pyqt5.qtwebchannel python3-pyqt5.qtwebengine \
+                       python3-dbus.mainloop.pyqt5 python3-sqlalchemy python3-alembic python3-chardet python3-lxml \
+                       python3-enchant python3-bs4 python3-mako python3-uno python3-pytest python3-pytest-cov \
+                       python3-websockets python3-webob python3-waitress python3-requests python3-pymediainfo \
+                       python3-qtawesome python3-opengl python3-appdirs python3-vlc python3-zeroconf python3-pip \
+                       python3-flake8 flake8 mediainfo mupdf-tools xvfb