diff --git a/Makefile.packaging b/Makefile.packaging
index 17a3bf1217f25a1e64ed33d455d6272ab3ba95a1..34f96ae2469c07927659c1ab8cf2bda558f6e487 100644
--- a/Makefile.packaging
+++ b/Makefile.packaging
@@ -106,6 +106,8 @@ package-all: package-debian_9 \
              package-ubuntu_19.10_i386_oci \
              package-ubuntu_20.04 \
              package-ubuntu_20.04_oci \
+             package-ubuntu_20.10 \
+             package-ubuntu_20.10_oci \
              package-fedora_31 \
              package-fedora_31_i386 \
              package-fedora_32 \
diff --git a/docker/Dockerfile_ubuntu_20.10 b/docker/Dockerfile_ubuntu_20.10
new file mode 100644
index 0000000000000000000000000000000000000000..9d97d3e1190f52863850e972027f332f84befa46
--- /dev/null
+++ b/docker/Dockerfile_ubuntu_20.10
@@ -0,0 +1,69 @@
+FROM ubuntu:20.10
+
+ENV DEBIAN_FRONTEND noninteractive
+
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y devscripts equivs
+
+# Speed up mk-build-deps
+RUN apt-get clean
+RUN apt-get update && \
+    apt-get install -y -o Acquire::Retries=3 \
+        git \
+        autoconf \
+        automake \
+        autopoint \
+        cmake \
+        libtool \
+        libdbus-1-dev \
+        libdbus-c++-dev \
+        libgnutls28-dev \
+        libargon2-0-dev \
+        libcanberra-gtk3-dev \
+        libclutter-gtk-1.0-dev \
+        libclutter-1.0-dev \
+        libglib2.0-dev \
+        libgtk-3-dev \
+        libnotify-dev \
+        qtbase5-dev \
+        qttools5-dev \
+        qttools5-dev-tools \
+        yasm \
+        nasm \
+        autotools-dev \
+        gettext \
+        libpulse-dev \
+        libasound2-dev \
+        libexpat1-dev \
+        libpcre3-dev \
+        libyaml-cpp-dev \
+        libboost-dev \
+        libxext-dev \
+        libxfixes-dev \
+        libspeex-dev \
+        libspeexdsp-dev \
+        uuid-dev \
+        libavcodec-dev \
+        libavutil-dev \
+        libavformat-dev \
+        libswscale-dev \
+        libavdevice-dev \
+        libopus-dev \
+        libudev-dev \
+        libgsm1-dev \
+        libjsoncpp-dev \
+        libmsgpack-dev \
+        libnatpmp-dev \
+        libayatana-appindicator3-dev \
+        libqrencode-dev \
+        libnm-dev \
+        libwebkit2gtk-4.0-dev \
+        libcrypto++-dev \
+        libva-dev \
+        libvdpau-dev \
+        libssl-dev
+
+ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
+
+CMD /opt/build-package-debian.sh
diff --git a/packaging/rules/debian-one-click-install/jami-all.postinst b/packaging/rules/debian-one-click-install/jami-all.postinst
index 8a60ae8a346a7ce53da79c0407426a08bd8fd0b4..a1d56ba1034a8712c62a8f5608f7d34890490eaf 100755
--- a/packaging/rules/debian-one-click-install/jami-all.postinst
+++ b/packaging/rules/debian-one-click-install/jami-all.postinst
@@ -113,6 +113,8 @@ if [ -f /etc/os-release ]; then
         ENDTAG="ubuntu_19.10"
     elif [ "${UBUNTU_CODENAME}" = "focal" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.04" ]; then
         ENDTAG="ubuntu_20.04"
+    elif [ "${UBUNTU_CODENAME}" = "groovy" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_20.10" ]; then
+        ENDTAG="ubuntu_20.10"
     else
         # Distribution is not supported. Don't provide automatic updates.
         CAN_ADD_DEB_SOURCE=false
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 310384e15ffed079c4f83c4faba999be94335ede..9b004e07da9cc7de420d7e024517bbcf017f184d 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -316,6 +316,20 @@ def run_generate_all(parsed_args):
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
             "version": "$(DEBIAN_OCI_VERSION)",
         },
+        {
+            "distribution": "ubuntu_20.10",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_DSC_FILENAME)",
+            "options": "--privileged --security-opt apparmor=docker-default",
+        },
+        {
+            "distribution": "ubuntu_20.10_oci",
+            "docker_image": "ubuntu_20.10",
+            "debian_packaging_override": "",
+            "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
+            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
+            "version": "$(DEBIAN_OCI_VERSION)",
+        },
 
         # Fedora
         {