diff --git a/README.md b/README.md
index dc3406d..7ca5ec6 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Windows build scripts are at
 | [`OpenModelica-doc/debian/`](./OpenModelica-doc/debian) | Older standalone source package, not built by the current pipeline                             |
 | [`rpm/`](./rpm)                                         | Spec template and patches for the Fedora/EL packages                                           |
 | [`macports/`](./macports)                               | Portfile templates for macOS                                                                   |
-| [`docker/`](./docker)                                   | Dockerfiles for the `build-deps` images on docker.openmodelica.org                             |
+| [`docker/`](./docker)                                   | Dockerfiles for older images; build images come from [build-deps]                              |
 | [`.ci/`](./.ci)                                         | The checks GitHub Actions runs on every pull request                                           |
 
 `OpenModelica/debian` is a symlink to the top-level [`debian/`](./debian), so every
@@ -182,19 +182,13 @@ It uses the Autoconf + Makefile build; switching it to the CMake build is a late
 
 ## Docker Images
 
-Docker images are hosted on [docker.openmodelica.org](docker.openmodelica.org) and need to
-be uploaded manually.
+The images OpenModelica is built in, `build-deps`, come from the
+[build-deps] repository, whose CI builds them for each distribution and publishes them to
+`ghcr.io/openmodelica/build-deps` and `docker.openmodelica.org/build-deps`. They used to
+be built by hand from `Dockerfile.build-deps*` here.
 
-### Example
+The Dockerfiles still in [`docker/`](./docker) are for other, older images. Each has a
+script next to it that builds and pushes it, e.g. [`nightly.sh`](./docker/nightly.sh)
+for [`Dockerfile.nightly`](./docker/Dockerfile.nightly).
 
-To add a new image to [docker.openmodelica.org](docker.openmodelica.org)
-the image needs to be build, tagged correctly and then pushed to the server.
-
-For example for [Dockerfile.build-deps-cmake-1.16.3](./docker/Dockerfile.build-deps-cmake-1.16.3)
-one would run:
-
-```bash
-docker build --tag build-deps-cmake:v1.16.3 -f Dockerfile.build-deps-cmake-1.16.3 .
-docker tag build-deps-cmake:v1.16.3 docker.openmodelica.org/build-deps-cmake:v1.16.3
-docker push docker.openmodelica.org/build-deps-cmake:v1.16.3
-```
+[build-deps]: https://github.com/OpenModelica/build-deps
diff --git a/docker/Dockerfile.build-deps b/docker/Dockerfile.build-deps
deleted file mode 100644
index 7fbe7eb..0000000
--- a/docker/Dockerfile.build-deps
+++ /dev/null
@@ -1,27 +0,0 @@
-# Or ubuntu:bionic
-# ARG REPO=docker.openmodelica.org/build-deps:v1.16.2
-ARG REPO=ubuntu:focal
-FROM ${REPO}
-
-ARG OCL=16.1.2_x64_rh_6.4.0.37
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -qy ca-certificates && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget apt-transport-https devscripts equivs python3-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex libgfortran5 aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape g++-7 texlive-lang-greek xvfb curl libcurl4-openssl-dev \
-    && (test "`pandoc --version | head -1`" == "pandoc 2.2.3.2" || (wget https://github.com/jgm/pandoc/releases/download/2.2.3.2/pandoc-2.2.3.2-1-amd64.deb && dpkg -i pandoc-2.2.3.2-1-amd64.deb && apt-get install -qyf)) \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/UsersGuide/source/requirements.txt \
-    && test -e /opt/intel/opencl || ( \
-      wget http://registrationcenter-download.intel.com/akdlm/irc_nas/12556/opencl_runtime_${OCL}.tgz \
-      && tar xzvf opencl_runtime_${OCL}.tgz \
-      && sed -i -e s/=decline/=accept/ -e s/=RPM/=NONRPM/ opencl_runtime_${OCL}/silent.cfg \
-      && (cd opencl_runtime_16.1.2_x64_rh_6.4.0.37 && ./install.sh -s silent.cfg) \
-      && rm -rf opencl_runtime_* \
-    ) \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip2 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson svgwrite # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.13 b/docker/Dockerfile.build-deps-1.13
deleted file mode 100644
index 7c25b10..0000000
--- a/docker/Dockerfile.build-deps-1.13
+++ /dev/null
@@ -1,26 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps
-FROM ${REPO}
-
-ARG OCL=16.1.2_x64_rh_6.4.0.37
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex libgfortran3 aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape g++-4.8 g++-5 g++-6 g++-7 \
-    && (test "`pandoc --version | head -1`" == "pandoc 2.2.3.2" || (wget https://github.com/jgm/pandoc/releases/download/2.2.3.2/pandoc-2.2.3.2-1-amd64.deb && dpkg -i pandoc-2.2.3.2-1-amd64.deb && apt-get install -qyf)) \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/UsersGuide/source/requirements.txt \
-    && test -e /opt/intel/opencl || ( \
-      wget http://registrationcenter-download.intel.com/akdlm/irc_nas/12556/opencl_runtime_${OCL}.tgz \
-      && tar xzvf opencl_runtime_${OCL}.tgz \
-      && sed -i -e s/=decline/=accept/ -e s/=RPM/=NONRPM/ opencl_runtime_${OCL}/silent.cfg \
-      && (cd opencl_runtime_16.1.2_x64_rh_6.4.0.37 && ./install.sh -s silent.cfg) \
-      && rm -rf opencl_runtime_* \
-    ) \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip2 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.14 b/docker/Dockerfile.build-deps-1.14
deleted file mode 100644
index 4d873b4..0000000
--- a/docker/Dockerfile.build-deps-1.14
+++ /dev/null
@@ -1,26 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps:v1.14.1
-FROM ${REPO}
-
-ARG OCL=16.1.2_x64_rh_6.4.0.37
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex libgfortran3 aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape g++-4.8 g++-5 g++-6 g++-7 texlive-lang-greek \
-    && (test "`pandoc --version | head -1`" == "pandoc 2.2.3.2" || (wget https://github.com/jgm/pandoc/releases/download/2.2.3.2/pandoc-2.2.3.2-1-amd64.deb && dpkg -i pandoc-2.2.3.2-1-amd64.deb && apt-get install -qyf)) \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/UsersGuide/source/requirements.txt \
-    && test -e /opt/intel/opencl || ( \
-      wget http://registrationcenter-download.intel.com/akdlm/irc_nas/12556/opencl_runtime_${OCL}.tgz \
-      && tar xzvf opencl_runtime_${OCL}.tgz \
-      && sed -i -e s/=decline/=accept/ -e s/=RPM/=NONRPM/ opencl_runtime_${OCL}/silent.cfg \
-      && (cd opencl_runtime_16.1.2_x64_rh_6.4.0.37 && ./install.sh -s silent.cfg) \
-      && rm -rf opencl_runtime_* \
-    ) \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip2 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson svgwrite # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.15 b/docker/Dockerfile.build-deps-1.15
deleted file mode 100644
index e32d0b3..0000000
--- a/docker/Dockerfile.build-deps-1.15
+++ /dev/null
@@ -1,26 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps:v1.15
-FROM ${REPO}
-
-ARG OCL=16.1.2_x64_rh_6.4.0.37
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex libgfortran3 aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape g++-4.8 g++-5 g++-6 g++-7 texlive-lang-greek xvfb \
-    && (test "`pandoc --version | head -1`" == "pandoc 2.2.3.2" || (wget https://github.com/jgm/pandoc/releases/download/2.2.3.2/pandoc-2.2.3.2-1-amd64.deb && dpkg -i pandoc-2.2.3.2-1-amd64.deb && apt-get install -qyf)) \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/UsersGuide/source/requirements.txt \
-    && test -e /opt/intel/opencl || ( \
-      wget http://registrationcenter-download.intel.com/akdlm/irc_nas/12556/opencl_runtime_${OCL}.tgz \
-      && tar xzvf opencl_runtime_${OCL}.tgz \
-      && sed -i -e s/=decline/=accept/ -e s/=RPM/=NONRPM/ opencl_runtime_${OCL}/silent.cfg \
-      && (cd opencl_runtime_16.1.2_x64_rh_6.4.0.37 && ./install.sh -s silent.cfg) \
-      && rm -rf opencl_runtime_* \
-    ) \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip2 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson svgwrite # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.16 b/docker/Dockerfile.build-deps-1.16
deleted file mode 100644
index adcfa99..0000000
--- a/docker/Dockerfile.build-deps-1.16
+++ /dev/null
@@ -1,26 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps:v1.16.2
-FROM ${REPO}
-
-ARG OCL=16.1.2_x64_rh_6.4.0.37
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex libgfortran3 aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape g++-4.8 g++-5 g++-6 g++-7 texlive-lang-greek xvfb libcurl4-gnutls-dev \
-    && (test "`pandoc --version | head -1`" == "pandoc 2.2.3.2" || (wget https://github.com/jgm/pandoc/releases/download/2.2.3.2/pandoc-2.2.3.2-1-amd64.deb && dpkg -i pandoc-2.2.3.2-1-amd64.deb && apt-get install -qyf)) \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica-doc/master/UsersGuide/source/requirements.txt \
-    && test -e /opt/intel/opencl || ( \
-      wget http://registrationcenter-download.intel.com/akdlm/irc_nas/12556/opencl_runtime_${OCL}.tgz \
-      && tar xzvf opencl_runtime_${OCL}.tgz \
-      && sed -i -e s/=decline/=accept/ -e s/=RPM/=NONRPM/ opencl_runtime_${OCL}/silent.cfg \
-      && (cd opencl_runtime_16.1.2_x64_rh_6.4.0.37 && ./install.sh -s silent.cfg) \
-      && rm -rf opencl_runtime_* \
-    ) \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip2 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson svgwrite # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.16.3 b/docker/Dockerfile.build-deps-1.16.3
deleted file mode 100644
index f333658..0000000
--- a/docker/Dockerfile.build-deps-1.16.3
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM docker.openmodelica.org/build-deps:v1.16.2
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -qy ca-certificates \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
diff --git a/docker/Dockerfile.build-deps-1.16.4 b/docker/Dockerfile.build-deps-1.16.4
deleted file mode 100644
index c9273b2..0000000
--- a/docker/Dockerfile.build-deps-1.16.4
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM docker.openmodelica.org/build-deps:v1.16.3
-
-RUN export DEBIAN_FRONTEND=noninteractive && pip3 install --no-cache-dir PyGithub \
-    && rm -Rf /root/.cache/pip
diff --git a/docker/Dockerfile.build-deps-1.16.5 b/docker/Dockerfile.build-deps-1.16.5
deleted file mode 100644
index aa3175d..0000000
--- a/docker/Dockerfile.build-deps-1.16.5
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM docker.openmodelica.org/build-deps:v1.16.4
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install -qyy texlive-bibtex-extra \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
diff --git a/docker/Dockerfile.build-deps-1.21.0 b/docker/Dockerfile.build-deps-1.21.0
deleted file mode 100644
index 799905e..0000000
--- a/docker/Dockerfile.build-deps-1.21.0
+++ /dev/null
@@ -1,28 +0,0 @@
-ARG REPO=ubuntu:focal
-FROM ${REPO}
-
-RUN sed -i s,http://archive.ubuntu.com/ubuntu/,mirror://mirrors.ubuntu.com/mirrors.txt, /etc/apt/sources.list \
-    && export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip libmldbm-perl docker.io sudo git subversion texlive-base texlive-latex-extra latexmk gnuplot-nox doxygen poppler-utils flex aspell bibtex2html zip unzip ocl-icd-opencl-dev cpio xsltproc inkscape intel-opencl-icd g++ texlive-lang-greek xvfb libcurl4-gnutls-dev pandoc \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelica/master/doc/UsersGuide/source/requirements.txt \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && pip3 install --no-cache-dir --upgrade -r requirements.txt \
-    && pip3 install --no-cache-dir --upgrade junit_xml simplejson svgwrite PyGithub # ComplianceSuite \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean \
-    && rm -f control requirements.txt *.deb
-
-# 1.21.1
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
-    && apt-get install -qy pocl-opencl-icd \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
-
-# 1.21.2 - TODO?
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update \
-    && apt-get install -qy texlive-bibtex-extra \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean
\ No newline at end of file
diff --git a/docker/Dockerfile.build-deps-arm b/docker/Dockerfile.build-deps-arm
deleted file mode 100644
index 8ebd33f..0000000
--- a/docker/Dockerfile.build-deps-arm
+++ /dev/null
@@ -1,16 +0,0 @@
-# Or ubuntu
-ARG REPO=docker.openmodelica.org/build-deps
-# Or bionic
-ARG DISTRO=v1.13-arm32
-FROM ${REPO}:${DISTRO}
-
-MAINTAINER Martin Sjölund <martin.sjolund@liu.se>
-USER root
-
-RUN apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo flex zip unzip \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean autoclean \
-    && rm -f control
diff --git a/docker/Dockerfile.build-deps-cmake-1.16.3 b/docker/Dockerfile.build-deps-cmake-1.16.3
deleted file mode 100644
index 7a15c64..0000000
--- a/docker/Dockerfile.build-deps-cmake-1.16.3
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM docker.openmodelica.org/build-deps:v1.16.3
-
-# Install cmake 3.17.2.
-RUN wget cmake.org/files/v3.17/cmake-3.17.2-Linux-x86_64.sh \
-    && mkdir -p /opt/cmake-3.17.2 \
-    && sh cmake-3.17.2-Linux-x86_64.sh --prefix=/opt/cmake-3.17.2 --skip-license \
-    && rm cmake-3.17.2-Linux-x86_64.sh
diff --git a/docker/Dockerfile.build-deps-i386 b/docker/Dockerfile.build-deps-i386
deleted file mode 100644
index 2bf8bf1..0000000
--- a/docker/Dockerfile.build-deps-i386
+++ /dev/null
@@ -1,16 +0,0 @@
-# Or ubuntu
-ARG REPO=docker.openmodelica.org/build-deps
-# Or bionic
-ARG DISTRO=v1.13-i386
-FROM ${REPO}:${DISTRO}
-
-MAINTAINER Martin Sjölund <martin.sjolund@liu.se>
-USER root
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy gnupg wget git subversion ca-certificates apt-transport-https devscripts equivs python3-pip python-pip libmldbm-perl docker.io sudo flex zip unzip libgfortran3 \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && rm -rf /var/lib/apt/lists/* \
-    && apt-get clean autoclean \
-    && rm -f control
diff --git a/docker/Dockerfile.build-deps-qt4-1.13 b/docker/Dockerfile.build-deps-qt4-1.13
deleted file mode 100644
index 06ead70..0000000
--- a/docker/Dockerfile.build-deps-qt4-1.13
+++ /dev/null
@@ -1,15 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps:v1.13-qt4-xenial
-FROM ${REPO}
-
-WORKDIR /data
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy --no-install-recommends gnupg wget git subversion ca-certificates apt-transport-https devscripts equivs libmldbm-perl docker.io sudo flex libgfortran3 zip unzip xsltproc gnuplot-nox \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && sed -i /qt/d control \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && apt-get install -qy --no-install-recommends qt4-qmake libqt4-dev libqtwebkit-dev libqt4-opengl-dev \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* ./* /tmp/* \
-    && rm -f control requirements.txt
diff --git a/docker/Dockerfile.build-deps-qt4-1.13.1 b/docker/Dockerfile.build-deps-qt4-1.13.1
deleted file mode 100644
index 1eff762..0000000
--- a/docker/Dockerfile.build-deps-qt4-1.13.1
+++ /dev/null
@@ -1,10 +0,0 @@
-# Or ubuntu:bionic
-ARG REPO=docker.openmodelica.org/build-deps:v1.13-qt4-xenial
-FROM ${REPO}
-
-WORKDIR /data
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get install ca-certificates \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* ./* /tmp/* \
-    && rm -f control requirements.txt
diff --git a/docker/Dockerfile.build-deps-stretch b/docker/Dockerfile.build-deps-stretch
deleted file mode 100644
index 1be7b68..0000000
--- a/docker/Dockerfile.build-deps-stretch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Or ubuntu:bionic
-# ARG REPO=docker.openmodelica.org/build-deps:v1.19-stretch
-ARG REPO=debian:stretch
-FROM ${REPO}
-
-WORKDIR /data
-
-RUN export DEBIAN_FRONTEND=noninteractive && apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy\
-    && apt-get install -qy --no-install-recommends gnupg wget git subversion ca-certificates apt-transport-https devscripts equivs libmldbm-perl docker.io sudo flex libgfortran3 zip unzip xsltproc gnuplot-nox libcurl4-gnutls-dev \
-    && wget https://raw.githubusercontent.com/OpenModelica/OpenModelicaBuildScripts/master/debian/control \
-    && sed -i /qt/d control \
-    && mk-build-deps --install -t 'apt-get --force-yes -y' control \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/* ./* /tmp/* \
-    && rm -f control requirements.txt
diff --git a/docker/Dockerfile.build-deps-v1.22.6-qttools b/docker/Dockerfile.build-deps-v1.22.6-qttools
deleted file mode 100644
index 84d7547..0000000
--- a/docker/Dockerfile.build-deps-v1.22.6-qttools
+++ /dev/null
@@ -1,85 +0,0 @@
-FROM docker.openmodelica.org/build-deps:v1.22.5-qttools
-
-RUN apt-get update && apt-get upgrade -qy && apt-get dist-upgrade -qy
-RUN apt-get install -qy \
-    qt6-base-dev \
-    qt6-base-dev-tools \
-    qt6-webengine-dev \
-    qt6-webengine-dev-tools \
-    qt6-l10n-tools \
-    qt6-tools-dev \
-    qt6-tools-dev-tools \
-    qt6-translations-l10n \
-    qt6-declarative-dev \
-    qt6-declarative-dev-tools \
-    qt6-webview-dev \
-    qt6-webview-plugins \
-    libqt6svg6 \
-    libqt6svgwidgets6 \
-    libqt6svg6-dev \
-    libqt6core5compat6-dev \
-    libqt6concurrent6 \
-    libqt6core5compat6 \
-    libqt6core6 \
-    libqt6dbus6 \
-    libqt6designer6 \
-    libqt6designercomponents6 \
-    libqt6gui6 \
-    libqt6help6 \
-    libqt6labsanimation6 \
-    libqt6labsfolderlistmodel6 \
-    libqt6labsqmlmodels6 \
-    libqt6labssettings6 \
-    libqt6labssharedimage6 \
-    libqt6labswavefrontmesh6 \
-    libqt6network6 \
-    libqt6opengl6-dev \
-    libqt6opengl6 \
-    libqt6openglwidgets6 \
-    libqt6pdf6 \
-    libqt6pdfquick6 \
-    libqt6pdfwidgets6 \
-    libqt6positioning6-plugins \
-    libqt6positioning6 \
-    libqt6positioningquick6 \
-    libqt6printsupport6 \
-    libqt6qml6 \
-    libqt6qmlcore6 \
-    libqt6qmllocalstorage6 \
-    libqt6qmlmodels6 \
-    libqt6qmlworkerscript6 \
-    libqt6qmlxmllistmodel6 \
-    libqt6quick6 \
-    libqt6quickcontrols2-6 \
-    libqt6quickcontrols2impl6 \
-    libqt6quickdialogs2-6 \
-    libqt6quickdialogs2quickimpl6 \
-    libqt6quickdialogs2utils6 \
-    libqt6quicklayouts6 \
-    libqt6quickparticles6 \
-    libqt6quickshapes6 \
-    libqt6quicktemplates2-6 \
-    libqt6quicktest6 \
-    libqt6quickwidgets6 \
-    libqt6serialport6 \
-    libqt6sql6-sqlite \
-    libqt6sql6 \
-    libqt6test6 \
-    libqt6uitools6 \
-    libqt6waylandclient6 \
-    libqt6waylandcompositor6 \
-    libqt6waylandeglclienthwintegration6 \
-    libqt6waylandeglcompositorhwintegration6 \
-    libqt6webchannel6-dev \
-    libqt6webchannel6 \
-    libqt6webengine6-data \
-    libqt6webenginecore6-bin \
-    libqt6webenginecore6 \
-    libqt6webenginequick6 \
-    libqt6webenginequickdelegatesqml6 \
-    libqt6webenginewidgets6 \
-    libqt6webview6 \
-    libqt6webviewquick6 \
-    libqt6widgets6 \
-    libqt6wlshellintegration6 \
-    libqt6xml6
diff --git a/docker/build-deps-32-squeeze.sh b/docker/build-deps-32-squeeze.sh
deleted file mode 100755
index 64620f7..0000000
--- a/docker/build-deps-32-squeeze.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -xe
-
-docker login docker.openmodelica.org
-if false; then
-  ARGS="--build-arg REPO=i386/ubuntu --build-arg DISTRO=bionic"
-fi
-
-TAG=docker.openmodelica.org/build-deps:v1.13-i386
-docker build $ARGS -t "$TAG" - < Dockerfile.build-deps-i386
-docker push "$TAG"
diff --git a/docker/build-deps-32.sh b/docker/build-deps-32.sh
deleted file mode 100755
index 64620f7..0000000
--- a/docker/build-deps-32.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -xe
-
-docker login docker.openmodelica.org
-if false; then
-  ARGS="--build-arg REPO=i386/ubuntu --build-arg DISTRO=bionic"
-fi
-
-TAG=docker.openmodelica.org/build-deps:v1.13-i386
-docker build $ARGS -t "$TAG" - < Dockerfile.build-deps-i386
-docker push "$TAG"
diff --git a/docker/build-deps-arm.sh b/docker/build-deps-arm.sh
deleted file mode 100755
index 7ed0866..0000000
--- a/docker/build-deps-arm.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -xe
-
-docker login docker.openmodelica.org
-if false; then
-  ARGS="--build-arg REPO=arm32v7/ubuntu --build-arg DISTRO=bionic"
-fi
-
-TAG=docker.openmodelica.org/build-deps:v1.13-arm32
-docker build $ARGS -t "$TAG" - < Dockerfile.build-deps-arm
-docker push "$TAG"
diff --git a/docker/build-deps-qt4-xenial.sh b/docker/build-deps-qt4-xenial.sh
deleted file mode 100755
index 0f3c10b..0000000
--- a/docker/build-deps-qt4-xenial.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -xe
-
-docker login docker.openmodelica.org
-
-TAG=docker.openmodelica.org/build-deps:v1.16-qt4-xenial
-
-if true; then
-  ARGS="--build-arg REPO=ubuntu:xenial"
-else
-  ARGS="--build-arg REPO=$TAG"
-fi
-
-docker build --pull $ARGS -t "$TAG" - < Dockerfile.build-deps-qt4
-docker push "$TAG"
diff --git a/docker/build-deps-v1.22.6-qttools.sh b/docker/build-deps-v1.22.6-qttools.sh
deleted file mode 100755
index 66d2d5d..0000000
--- a/docker/build-deps-v1.22.6-qttools.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-export TAG=v1.22.6-qttools
-export REGISTRY=docker.openmodelica.org
-docker build --pull --no-cache --tag build-deps:$TAG - < Dockerfile.build-deps-$TAG
-docker login
-docker image tag build-deps:$TAG $REGISTRY/build-deps:$TAG
-docker push $REGISTRY/build-deps:$TAG
diff --git a/docker/build-deps.sh b/docker/build-deps.sh
deleted file mode 100755
index 7c6a6d1..0000000
--- a/docker/build-deps.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -xe
-
-docker login docker.openmodelica.org
-
-if false; then
-  ARGS="--build-arg REPO=ubuntu:bionic"
-fi
-
-LATEST=docker.openmodelica.org/build-deps:latest
-TAG=docker.openmodelica.org/build-deps:v1.16
-docker build --pull $ARGS -t "$TAG" - < Dockerfile.build-deps
-docker tag "$TAG" "$LATEST"
-docker push "$TAG"
-docker push "$LATEST"