diff --git a/.ci/distribution/debian/changelog b/.ci/distribution/debian/changelog
index 5b1912873..294d3b518 100644
--- a/.ci/distribution/debian/changelog
+++ b/.ci/distribution/debian/changelog
@@ -1,4 +1,4 @@
-aegisub-japan7 (3.3.2) UNRELEASED; urgency=low
+aegisub-japan7 (3.3.2); urgency=low
 
   * Initial release. Closes: #nnnn
     <nnnn is the bug number of your ITP>
diff --git a/.ci/distribution/debian/control b/.ci/distribution/debian/control
index bc73938a2..6f77e8480 100644
--- a/.ci/distribution/debian/control
+++ b/.ci/distribution/debian/control
@@ -2,7 +2,7 @@ Source: aegisub-japan7
 Section: video
 Priority: optional
 Maintainer: odrling <florianbadie@odrling.xyz>
-Build-Depends: debhelper (>=11~), dh-autoreconf, intltool, libasound2-dev [linux-any], libass-dev, libboost-dev, libboost-chrono-dev, libboost-filesystem-dev, libboost-locale-dev, libboost-regex-dev, libboost-system-dev, libboost-thread-dev, libffms2-dev (>= 2.19), libfftw3-dev, libfontconfig1-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libhunspell-dev, libicu-dev, libpulse-dev, libwxgtk3.0-dev, libssl-dev
+Build-Depends: debhelper, dh-autoreconf, intltool, libasound2-dev [linux-any], libass-dev, libboost-dev, libboost-chrono-dev, libboost-filesystem-dev, libboost-locale-dev, libboost-regex-dev, libboost-system-dev, libboost-thread-dev, libffms2-dev (>= 2.19), libfftw3-dev, libfontconfig1-dev, libfreetype6-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libhunspell-dev, libicu-dev, libpulse-dev, libwxgtk3.0-dev, libssl-dev
 Standards-Version: 4.1.4
 Homepage: https://github.com/odrling/Aegisub
 
diff --git a/.ci/distribution/debian/copyright b/.ci/distribution/debian/copyright
index 5e85b28f4..7113cdb11 100644
--- a/.ci/distribution/debian/copyright
+++ b/.ci/distribution/debian/copyright
@@ -1,6 +1,6 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: aegisub-japan7
-Source: <url://example.com>
+Source: <https://github.com/odrling/Aegisub>
 #
 # Please double check copyright with the licensecheck(1) command.
 
diff --git a/.ci/debian/Dockerfile b/.ci/docker/bionic/Dockerfile
similarity index 86%
rename from .ci/debian/Dockerfile
rename to .ci/docker/bionic/Dockerfile
index 5fc2a9a71..857d2686d 100644
--- a/.ci/debian/Dockerfile
+++ b/.ci/docker/bionic/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:testing-slim
+FROM ubuntu:bionic
 
 RUN apt-get update && apt-get upgrade -y
 RUN apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git
@@ -8,7 +8,7 @@ WORKDIR /aegisub
 RUN make clean
 RUN build/version.sh .
 RUN rm -rf .git
-RUN mv .ci/debian/entrypoint.sh /
+RUN mv .ci/docker/debian_entrypoint.sh /entrypoint.sh
 RUN mv .ci/distribution/debian /aegisub
 RUN chmod +x /entrypoint.sh
 
diff --git a/.ci/docker/buster/Dockerfile b/.ci/docker/buster/Dockerfile
new file mode 100644
index 000000000..55df536e3
--- /dev/null
+++ b/.ci/docker/buster/Dockerfile
@@ -0,0 +1,17 @@
+FROM debian:buster
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git
+
+COPY . /aegisub
+WORKDIR /aegisub
+RUN make clean
+RUN build/version.sh .
+RUN rm -rf .git
+RUN mv .ci/docker/debian_entrypoint.sh /entrypoint.sh
+RUN mv .ci/distribution/debian /aegisub
+RUN chmod +x /entrypoint.sh
+
+CMD ["/entrypoint.sh"]
+
diff --git a/.ci/debian/entrypoint.sh b/.ci/docker/debian_entrypoint.sh
similarity index 100%
rename from .ci/debian/entrypoint.sh
rename to .ci/docker/debian_entrypoint.sh
diff --git a/.ci/docker/disco/Dockerfile b/.ci/docker/disco/Dockerfile
new file mode 100644
index 000000000..003ed20c3
--- /dev/null
+++ b/.ci/docker/disco/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu:disco
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git
+
+COPY . /aegisub
+WORKDIR /aegisub
+RUN make clean
+RUN build/version.sh .
+RUN rm -rf .git
+RUN mv .ci/docker/debian_entrypoint.sh /entrypoint.sh
+RUN mv .ci/distribution/debian /aegisub
+RUN chmod +x /entrypoint.sh
+
+CMD ["/entrypoint.sh"]
+
diff --git a/.ci/docker/eoan/Dockerfile b/.ci/docker/eoan/Dockerfile
new file mode 100644
index 000000000..5b6527255
--- /dev/null
+++ b/.ci/docker/eoan/Dockerfile
@@ -0,0 +1,17 @@
+FROM ubuntu:eoan
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y dh-make build-essential libwxgtk3.0 libboost-all-dev icu-devtools libffms2-dev fontconfig libfreetype6-dev libass-dev zlib1g-dev libgl1 libssl-dev libasound2-dev libpulse-dev fftw3-dev libuchardet-dev libc6-dev intltool libhunspell-dev git
+
+COPY . /aegisub
+WORKDIR /aegisub
+RUN make clean
+RUN build/version.sh .
+RUN rm -rf .git
+RUN mv .ci/docker/debian_entrypoint.sh /entrypoint.sh
+RUN mv .ci/distribution/debian /aegisub
+RUN chmod +x /entrypoint.sh
+
+CMD ["/entrypoint.sh"]
+