diff --git a/.dockerignore b/.dockerignore
index 4d11826c80cb953d9d51aa45d1fe14fa487c50e3..0ce15a54c28363c855755f8c51ba6aae20c07756 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,7 +6,8 @@ client-qt
 client-uwp
 daemon
 lrc
-ring_*
+jami_*
+packages
 plugins
 .git
 */.git
diff --git a/.gitignore b/.gitignore
index 5e135de74b32810f5d5495e19f49772f4c31f3c2..ee1732cf71e0ce9fef986b5f992676678e481b3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,12 +5,12 @@
 env
 docs/build
 packages
-ring_*.tar.gz
+jami_*.tar.gz
 Makefile.packaging.distro_targets
 repositories
+tarballs.manifest
 manual-download
 .docker-image-*
-qemu-static
 
 # QtCreator
 /build-*
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000000000000000000000000000000000000..3c22a775e17dd6238c9f47a5c79d768844eec679
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,93 @@
+// Packaging validation for supported GNU/Linux systems.
+//
+// Note: To work on this script without having to push a commit each
+// time, use the jenkins-cli command (see:
+// https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Usage_CLI_de_Jenkins).
+pipeline {
+    agent {
+        label 'guix'
+    }
+
+    environment {
+        TARBALLS = '/opt/ring-contrib' // set the cache directory
+    }
+
+    options {
+        ansiColor('xterm')
+    }
+
+    stages {
+        stage('Check configuration') {
+            when { not { expression { fileExists TARBALLS } } }
+            steps {
+                error "The ${TARBALLS} directory does not exist. \
+See https://wiki.savoirfairelinux.com/wiki/Jenkins.jami.net#Configuration"
+            }
+        }
+
+        stage('Fetch submodules') {
+            steps {
+                echo 'Updating relevant submodules to their latest commit'
+                sh 'git submodule update --init --recursive --remote' +
+                   'daemon lrc client-gnome client-qt'
+            }
+        }
+
+        stage('Generate release tarball') {
+            steps {
+                // The bundled tarballs included in the release
+                // tarball depend on what is available on the host.
+                // To ensure it can be shared across all different
+                // GNU/Linux distributions, generate it in a minimal
+                // container.  Wget uses GnuTLS, which looks up its
+                // certs from /etc/ssl/certs.
+                sh '''
+                   #!/usr/bin/env bash
+                   test -f $HOME/.bashrc && . $HOME/.bashrc
+                   guix environment --container --network -E TARBALLS --share=$TARBALLS \
+                       --expose=$SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt --ad-hoc \
+                       coreutils \
+                       gcc-toolchain \
+                       git-minimal \
+                       grep \
+                       gzip \
+                       make \
+                       nss-certs \
+                       pkg-config \
+                       python \
+                       sed \
+                       tar \
+                       wget \
+                       xz -- make release-tarball
+                   '''
+            }
+        }
+
+        stage('Build packages') {
+            environment {
+                DISABLE_CONTRIB_DOWNLOADS = 'TRUE'
+                // The following password is used to register with the
+                // RHEL subscription-manager tool, required to build on RHEL.
+                PASS = credentials('developers-redhat-com')
+            }
+            steps {
+                script {
+                    def targetsText = sh script: 'make -s list-package-targets', returnStdout: true
+                    def targets = targetsText.split('\n')
+                    def stages = [:]
+
+                    targets.each { target ->
+                        // Note: The stage calls are wrapped in closures, to
+                        // delay their execution.
+                        stages["${target}"] =  {
+                            stage("stage: ${target}") {
+                                sh "make ${target}"
+                            }
+                        }
+                    }
+                    parallel stages
+                }
+            }
+        }
+    }
+}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..bd31c3700fb345ff5c8a36d67cbd441de0d031f0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,146 @@
+# -*- mode: makefile; -*-
+# Copyright (C) 2016-2021 Savoir-faire Linux Inc.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+.DEFAULT_GOAL := package-all
+
+##############################
+## Version number variables ##
+##############################
+# YYYY-MM-DD
+LAST_COMMIT_DATE:=$(shell git log -1 --format=%cd --date=short)
+
+# number of commits that day
+NUMBER_OF_COMMITS:=$(shell git log --format=%cd --date=short | grep -c $(LAST_COMMIT_DATE))
+
+# YYMMDD
+LAST_COMMIT_DATE_SHORT:=$(shell echo $(LAST_COMMIT_DATE) | sed -s 's/-//g')
+
+# last commit id
+COMMIT_ID:=$(shell git rev-parse --short HEAD)
+
+RELEASE_VERSION:=$(LAST_COMMIT_DATE_SHORT).$(NUMBER_OF_COMMITS).$(COMMIT_ID)
+RELEASE_TARBALL_FILENAME:=jami_$(RELEASE_VERSION).tar.gz
+
+# Debian versions
+DEBIAN_VERSION:=$(RELEASE_VERSION)~dfsg1-1
+DEBIAN_DSC_FILENAME:=jami_$(DEBIAN_VERSION).dsc
+DEBIAN_OCI_VERSION:=$(RELEASE_VERSION)~dfsg1-0
+DEBIAN_OCI_DSC_FILENAME:=jami_$(DEBIAN_OCI_VERSION).dsc
+DEBIAN_OCI_PKG_DIR:="packaging/rules/debian-one-click-install"
+
+#####################
+## Other variables ##
+#####################
+TMPDIR := $(shell mktemp -d)
+CURRENT_UID:=$(shell id -u)
+CURRENT_GID:=$(shell id -g)
+
+#############################
+## Release tarball targets ##
+#############################
+.PHONY: release-tarball
+release-tarball: $(RELEASE_TARBALL_FILENAME)
+
+# Fetch the required contrib sources and copy them to
+# daemon/contrib/tarballs.  To use a custom tarballs cache directory,
+# export the TARBALLS environment variable.
+tarballs.manifest:
+	rm -rf daemon/contrib/native
+	mkdir -p daemon/contrib/native && \
+	cd daemon/contrib/native && \
+	../bootstrap && \
+        $(MAKE) list && \
+        $(MAKE) fetch -j && \
+	$(MAKE) --silent list-tarballs > $(CURDIR)/$@
+	rm -rf daemon/contrib/native
+
+# Generate the release tarball.  Note: to avoid building 1+ GiB
+# tarball containing all the bundled libraries, only the required
+# tarballs are included.  This means the resulting release tarball
+# content depends on what libraries the host has installed.  To build
+# a single release tarball that can be used for any GNU/Linux machine,
+# it should be built in a minimal container.)
+$(RELEASE_TARBALL_FILENAME): tarballs.manifest
+# Prepare the sources of the top repository and relevant submodules.
+	rm -f "$@"
+	mkdir $(TMPDIR)/ring-project
+	git archive HEAD | tar xf - -C $(TMPDIR)/ring-project
+	for m in daemon lrc client-gnome; do \
+		(cd "$$m" && git archive --prefix "$$m/" HEAD \
+			| tar xf - -C $(TMPDIR)/ring-project); \
+	done
+# Create the base archive.
+	tar --create --file $(TMPDIR)/ring-project.tar $(TMPDIR)/ring-project \
+		--transform 's,.*/ring-project,ring-project,'
+# Append the cached tarballs listed in the manifest.
+	tar --append --file $(TMPDIR)/ring-project.tar \
+		--files-from $< \
+		--transform 's,^.*/,ring-project/daemon/contrib/tarballs/,'
+	gzip $(TMPDIR)/ring-project.tar
+	mv $(TMPDIR)/ring-project.tar.gz "$@"
+	rm -rf $(TMPDIR)
+
+#######################
+## Packaging targets ##
+#######################
+
+# Append the output of make-packaging-target to this Makefile
+# see Makefile.packaging.distro_targets
+$(shell scripts/make-packaging-target.py --generate-all > Makefile.packaging.distro_targets)
+include Makefile.packaging.distro_targets
+
+package-all: $(PACKAGE-TARGETS)
+
+.PHONY: list-package-targets
+list-package-targets:
+	$(foreach p,$(PACKAGE-TARGETS),\
+		echo $(p);)
+
+docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
+	if patch -p1 -fR --dry-run < $< >/dev/null 2>&1; then \
+	  echo "Patching $@... skipped (already patched)"; \
+	else \
+	  echo "Patching $@..."; \
+	  patch -p1 -Ns < $< || { echo "Patching $@... failed" >&2 && exit 1; }; \
+	  echo "Patching $@... done"; \
+	fi
+.PHONY: docker/Dockerfile_snap
+
+###################
+## Other targets ##
+###################
+.PHONY: docs
+
+# Build the documentation
+# Note that newly added RST files will likely not display on all documents'
+# navigation bar unless the docs/build folder is manually deleted.
+docs: env
+	env/bin/sphinx-build -b html docs/source docs/build/html
+	env/bin/sphinx-build -b texinfo docs/source docs/build/texinfo
+
+env:
+	virtualenv env
+	env/bin/pip install Sphinx==1.4.1 sphinx-rtd-theme==0.1.9
+
+.PHONY: clean
+clean:
+	rm -rf env
+	rm -rf docs/build
+	rm -f jami_*.tar.gz
+	rm -rf packages
+	rm -f Makefile.packaging.distro_targets
+	rm -f .docker-image-*
+	rm -rf daemon/contrib/tarballs/*
diff --git a/Makefile.packaging b/Makefile.packaging
deleted file mode 100644
index 5544c57620a790f77f2c20189134549194b083b0..0000000000000000000000000000000000000000
--- a/Makefile.packaging
+++ /dev/null
@@ -1,165 +0,0 @@
-# -*- mode: makefile; -*-
-# Copyright (C) 2016-2019 Savoir-faire Linux Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-.DEFAULT_GOAL := package-all
-
-##############################
-## Version number variables ##
-##############################
-# YYYY-MM-DD
-LAST_COMMIT_DATE:=$(shell git log -1 --format=%cd --date=short)
-
-# number of commits that day
-NUMBER_OF_COMMITS:=$(shell git log --format=%cd --date=short | grep -c $(LAST_COMMIT_DATE))
-
-# YYMMDD
-LAST_COMMIT_DATE_SHORT:=$(shell echo $(LAST_COMMIT_DATE) | sed -s 's/-//g')
-
-# last commit id
-COMMIT_ID:=$(shell git rev-parse --short HEAD)
-
-RELEASE_VERSION:=$(LAST_COMMIT_DATE_SHORT).$(NUMBER_OF_COMMITS).$(COMMIT_ID)
-RELEASE_TARBALL_FILENAME:=jami_$(RELEASE_VERSION).tar.gz
-
-# Debian versions
-DEBIAN_VERSION:=$(RELEASE_VERSION)~dfsg1-1
-DEBIAN_DSC_FILENAME:=jami_$(DEBIAN_VERSION).dsc
-DEBIAN_OCI_VERSION:=$(RELEASE_VERSION)~dfsg1-0
-DEBIAN_OCI_DSC_FILENAME:=jami_$(DEBIAN_OCI_VERSION).dsc
-DEBIAN_OCI_PKG_DIR:="packaging/rules/debian-one-click-install"
-
-#####################
-## Other variables ##
-#####################
-TMPDIR := $(shell mktemp -d)
-CURRENT_UID:=$(shell id -u)
-CURRENT_GID:=$(shell id -g)
-
-#############################
-## Release tarball targets ##
-#############################
-.PHONY: release-tarball
-release-tarball: $(RELEASE_TARBALL_FILENAME)
-
-$(RELEASE_TARBALL_FILENAME):
-	# Fetch tarballs
-	mkdir -p daemon/contrib/native
-	cd daemon/contrib/native && \
-	    ../bootstrap && make list && \
-	    make fetch-all -j || make fetch-all || make fetch-all
-	rm -rf daemon/contrib/native
-
-	cd $(TMPDIR) && \
-	    tar -C $(CURDIR)/.. \
-	        --exclude-vcs \
-	        -zcf $(RELEASE_TARBALL_FILENAME) \
-	        $(shell basename $(CURDIR)) && \
-	    mv $(RELEASE_TARBALL_FILENAME) $(CURDIR)
-
-	rm -rf $(CURDIR)/daemon/contrib/tarballs/*
-
-#######################
-## Packaging targets ##
-#######################
-
-.PHONY: package-all
-package-all: package-debian_9 \
-             package-debian_9_i386 \
-             package-debian_9_armhf \
-             package-debian_9_arm64 \
-             package-debian_9_oci \
-             package-debian_9_i386_oci \
-             package-debian_9_armhf_oci \
-             package-debian_9_arm64_oci \
-             package-debian_10 \
-             package-debian_10_i386 \
-             package-debian_10_armhf \
-             package-debian_10_arm64 \
-             package-debian_10_oci \
-             package-debian_10_i386_oci \
-             package-debian_10_armhf_oci \
-             package-debian_10_arm64_oci \
-             package-raspbian_10_armhf \
-             package-ubuntu_18.04 \
-             package-ubuntu_18.04_i386 \
-             package-ubuntu_18.04_oci \
-             package-ubuntu_18.04_i386_oci \
-             package-ubuntu_18.10 \
-             package-ubuntu_18.10_i386 \
-             package-ubuntu_18.10_oci \
-             package-ubuntu_18.10_i386_oci \
-             package-ubuntu_19.10 \
-             package-ubuntu_19.10_i386 \
-             package-ubuntu_19.10_oci \
-             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 \
-             package-fedora_32_i386 \
-             package-fedora_33 \
-             package-fedora_33_i386 \
-             package-rhel_8 \
-             package-opensuse-leap_15.1 \
-             package-opensuse-leap_15.2 \
-             package-opensuse-tumbleweed \
-             package-gentoo \
-             package-snap
-
-
-# Append the output of make-packaging-target to this Makefile
-# see Makefile.packaging.distro_targets
-$(shell scripts/make-packaging-target.py --generate-all > Makefile.packaging.distro_targets)
-include Makefile.packaging.distro_targets
-
-docker/Dockerfile_snap: patches/docker-snap-build-scripts.patch
-	if patch -p1 -fR --dry-run < $< >/dev/null 2>&1; then \
-	  echo "Patching $@... skipped (already patched)"; \
-	else \
-	  echo "Patching $@..."; \
-	  patch -p1 -Ns < $< || { echo "Patching $@... failed" >&2 && exit 1; }; \
-	  echo "Patching $@... done"; \
-	fi
-.PHONY: docker/Dockerfile_snap
-
-###################
-## Other targets ##
-###################
-.PHONY: docs
-
-# Build the documentation
-# Note that newly added RST files will likely not display on all documents'
-# navigation bar unless the docs/build folder is manually deleted.
-docs: env
-	env/bin/sphinx-build -b html docs/source docs/build/html
-	env/bin/sphinx-build -b texinfo docs/source docs/build/texinfo
-
-env:
-	virtualenv env
-	env/bin/pip install Sphinx==1.4.1 sphinx-rtd-theme==0.1.9
-
-.PHONY: clean
-clean:
-	rm -rf env
-	rm -rf docs/build
-	rm -f jami_*.tar.gz
-	rm -rf packages
-	rm -f Makefile.packaging.distro_targets
-	rm -f .docker-image-*
-	rm -fr qemu-static
diff --git a/Makefile.packaging b/Makefile.packaging
new file mode 120000
index 0000000000000000000000000000000000000000..33ceb8f075f63b101889c5301869c6cf049584fe
--- /dev/null
+++ b/Makefile.packaging
@@ -0,0 +1 @@
+Makefile
\ No newline at end of file
diff --git a/client-gnome b/client-gnome
index 2f4e9872b1dda1929441026c0ab0fcacd649c210..1195ef03ff9622eb54f4de313c12af40079f0fd5 160000
--- a/client-gnome
+++ b/client-gnome
@@ -1 +1 @@
-Subproject commit 2f4e9872b1dda1929441026c0ab0fcacd649c210
+Subproject commit 1195ef03ff9622eb54f4de313c12af40079f0fd5
diff --git a/client-qt b/client-qt
index 4d6f5b34100a1a9192d5555daa6f81a510f26e11..2a9e62400788b9ef2dd6deec687cf46f5d575190 160000
--- a/client-qt
+++ b/client-qt
@@ -1 +1 @@
-Subproject commit 4d6f5b34100a1a9192d5555daa6f81a510f26e11
+Subproject commit 2a9e62400788b9ef2dd6deec687cf46f5d575190
diff --git a/docker/Dockerfile_debian_10_arm64 b/docker/Dockerfile_debian_10_arm64
index 77c9e711c61440d816f725a06283ebe107f06a15..0a1024efc7f9c495f82f886432685ecf73551cf5 100644
--- a/docker/Dockerfile_debian_10_arm64
+++ b/docker/Dockerfile_debian_10_arm64
@@ -1,9 +1,5 @@
 FROM arm64v8/debian:buster
 
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get clean
diff --git a/docker/Dockerfile_debian_10_armhf b/docker/Dockerfile_debian_10_armhf
index e1d12e5efd584fbe3c83be4bab2dd249fda599b6..a6e8f8c66a106fac9b843dd96b58d89644f2fe37 100644
--- a/docker/Dockerfile_debian_10_armhf
+++ b/docker/Dockerfile_debian_10_armhf
@@ -1,9 +1,5 @@
 FROM arm32v7/debian:buster
 
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static
-
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get clean
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
deleted file mode 100644
index a07d3e9dd1da0346cc1f8dba226fc67ad8018fb1..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_debian_9
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM debian:9
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retires=10 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        nasm \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-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 \
-        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 \
-        libappindicator3-dev \
-        libqrencode-dev \
-        libnm-dev \
-        libwebkit2gtk-4.0-dev \
-        libcrypto++-dev \
-        libva-dev \
-        libvdpau-dev \
-        libssl-dev \
-        libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_debian_9_arm64 b/docker/Dockerfile_debian_9_arm64
deleted file mode 100644
index db22a8020d421f903985d1e31a247a95cfffbc62..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_debian_9_arm64
+++ /dev/null
@@ -1,72 +0,0 @@
-FROM arm64v8/debian:9
-
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-aarch64-static /usr/bin/qemu-aarch64-static
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retires=10 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-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 \
-        libappindicator3-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/docker/Dockerfile_debian_9_armhf b/docker/Dockerfile_debian_9_armhf
deleted file mode 100644
index 2dbafcb13facc7447e1747e2c92604578365dcfc..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_debian_9_armhf
+++ /dev/null
@@ -1,72 +0,0 @@
-FROM arm32v7/debian:9
-
-# FIXME: dirty qemu-static hack required because our Jenkins node runs Docker 17
-# Remove next line as soon as we get Docker 18 +
-COPY qemu-static/qemu-arm-static /usr/bin/qemu-arm-static
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retires=10 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        nasm \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-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 \
-        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 \
-        libappindicator3-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/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
deleted file mode 100644
index a89302735ca6e8e2c2a01631f16b1ce1b9022e98..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_debian_9_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/debian:9
-
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y vim devscripts
-
-# Speed up mk-build-deps
-RUN apt-get clean
-RUN apt-get update && \
-    apt-get install -y -o Acquire::Retires=10 \
-        git \
-        autoconf \
-        automake \
-        autopoint \
-        cmake \
-        nasm \
-        libtool \
-        libdbus-1-dev \
-        libdbus-c++-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 \
-        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 \
-        libappindicator3-dev \
-        libqrencode-dev \
-        libnm-dev \
-        libwebkit2gtk-4.0-dev \
-        libcrypto++-dev \
-        libva-dev \
-        libvdpau-dev \
-        libssl-dev \
-        libsndfile1-dev
-
-ADD scripts/build-package-debian.sh /opt/build-package-debian.sh
-
-CMD /opt/build-package-debian.sh
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
deleted file mode 100644
index cdb5f8ea42926d6178d2d4c3a610087bf8bfd7ff..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_fedora_27
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM fedora:27
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
-    dnf install -y \
-        git \
-        rpm-build \
-        tar \
-        nasm \
-        make \
-        autoconf \
-        automake \
-        cmake \
-        speexdsp-devel \
-        pulseaudio-libs-devel \
-        libcanberra-devel \
-        libtool \
-        dbus-devel \
-        expat-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        dbus-c++-devel \
-        dbus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        gsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-c++-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        nettle-devel \
-        opus-devel \
-        patch \
-        jsoncpp-devel \
-        libnatpmp-devel \
-        webkitgtk4-devel \
-        cryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        NetworkManager-libnm-devel \
-        openssl-devel \
-        openssl-static \
-        sqlite-devel \
-        libsndfile-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28
deleted file mode 100644
index cfaad5cab7df5795b2dbd114b3934d97a3c2b5e6..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_fedora_28
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM fedora:28
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
-    dnf install -y \
-        git \
-        rpm-build \
-        tar \
-        nasm \
-        make \
-        autoconf \
-        automake \
-        cmake \
-        speexdsp-devel \
-        pulseaudio-libs-devel \
-        libcanberra-devel \
-        libtool \
-        dbus-devel \
-        expat-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        dbus-c++-devel \
-        dbus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        gsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-c++-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        nettle-devel \
-        opus-devel \
-        patch \
-        jsoncpp-devel \
-        libnatpmp-devel \
-        webkitgtk4-devel \
-        cryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        NetworkManager-libnm-devel \
-        openssl-devel \
-        openssl-static \
-        sqlite-devel \
-        libsndfile-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_29 b/docker/Dockerfile_fedora_29
deleted file mode 100644
index da6376fef53e1165950051e6ca6c237e3a3b6fe6..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_fedora_29
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM fedora:29
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
-    dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
-    dnf install -y libinput-devel && \
-    dnf install -y qt5-qtbase-5.11.1-7.fc29 qt5-linguist-5.11.1-2.fc29 qt5-qtbase-devel-5.11.1-7.fc29 qt5-qttools-devel-5.11.1-2.fc29 && \
-    dnf install -y \
-        git \
-        rpm-build \
-        tar \
-        nasm \
-        make \
-        autoconf \
-        automake \
-        cmake \
-        speexdsp-devel \
-        pulseaudio-libs-devel \
-        libcanberra-devel \
-        libcurl-devel \
-        libtool \
-        dbus-devel \
-        expat-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        dbus-c++-devel \
-        dbus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        gsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-c++-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        nettle-devel \
-        opus-devel \
-        patch \
-        jsoncpp-devel \
-        libnatpmp-devel \
-        webkitgtk4-devel \
-        cryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        NetworkManager-libnm-devel \
-        openssl-devel \
-        openssl-static \
-        sqlite-devel \
-        libsndfile-devel
-
-RUN echo "exclude=qt5-qtbase* qt5-linguist* qt5-qttools-devel*" >> /etc/dnf/dnf.conf
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_30 b/docker/Dockerfile_fedora_30
deleted file mode 100644
index a80d8cdfbffb5d3645a4afb5355038b724ec0149..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_fedora_30
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM fedora:30
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
-    dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
-    dnf install -y libinput-devel && \
-    dnf install -y \
-        git \
-        rpm-build \
-        tar \
-        make \
-        autoconf \
-        automake \
-        nasm \
-        cmake \
-        speexdsp-devel \
-        pulseaudio-libs-devel \
-        libcanberra-devel \
-        libcurl-devel \
-        libtool \
-        dbus-devel \
-        expat-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        dbus-c++-devel \
-        dbus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        gsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-c++-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        nettle-devel \
-        opus-devel \
-        patch \
-        jsoncpp-devel \
-        libnatpmp-devel \
-        webkitgtk4-devel \
-        cryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        NetworkManager-libnm-devel \
-        openssl-devel \
-        openssl-static \
-        sqlite-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_fedora_31 b/docker/Dockerfile_fedora_31
deleted file mode 100644
index ce62df9ea8cacc10b8522d0ef463e0c96fa34e57..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_fedora_31
+++ /dev/null
@@ -1,65 +0,0 @@
-FROM fedora:31
-
-RUN dnf clean all
-RUN dnf install -y dnf-command\(builddep\) rpmdevtools
-
-RUN dnf clean all
-RUN dnf upgrade -y && \
-    dnf install -y mesa-libgbm-devel mesa-dri-drivers && \
-    dnf install -y libinput-devel && \
-    dnf install -y \
-        git \
-        rpm-build \
-        tar \
-        make \
-        autoconf \
-        automake \
-        nasm \
-        cmake \
-        speexdsp-devel \
-        pulseaudio-libs-devel \
-        libcanberra-devel \
-        libcurl-devel \
-        libtool \
-        dbus-devel \
-        expat-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        dbus-c++-devel \
-        dbus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        gsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-c++-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        nettle-devel \
-        opus-devel \
-        patch \
-        jsoncpp-devel \
-        libnatpmp-devel \
-        webkitgtk4-devel \
-        cryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        NetworkManager-libnm-devel \
-        openssl-devel \
-        openssl-static \
-        sqlite-devel
-
-ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh
-
-CMD /opt/build-package-fedora.sh
diff --git a/docker/Dockerfile_opensuse-leap_15.1 b/docker/Dockerfile_opensuse-leap_15.1
deleted file mode 100644
index 0bb7a9641203de888a3bb025a152cf5a6f209ccd..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_opensuse-leap_15.1
+++ /dev/null
@@ -1,88 +0,0 @@
-FROM opensuse/leap:15.1
-RUN zypper --non-interactive install  dnf
-RUN dnf clean all
-RUN zypper --non-interactive lr
-RUN zypper --non-interactive  --gpg-auto-import-keys refresh
-RUN zypper --non-interactive lr
-RUN zypper --non-interactive  install -y dnf-command\(builddep\) rpmdevtools
-
-RUN zypper --non-interactive clean
-RUN zypper --non-interactive up -y && \
-    zypper --non-interactive install -y  Mesa-dri-devel Mesa-dri && \
-    zypper --non-interactive install -y libinput-devel && \
-    zypper --non-interactive install -y \
-        git \
-        gcc8 \
-        gcc8-c++ \
-        rpm-build \
-        tar \
-        make \
-        autoconf \
-        automake \
-        cmake \
-        nasm \
-        speexdsp-devel \
-        libpulse-devel \
-        libcanberra-devel \
-        libcurl-devel \
-        libtool \
-        libQt5DBus-devel \
-        pcre-devel \
-        yaml-cpp-devel \
-        boost-devel \
-        libdbus-c++-devel \
-        libQt5DBus-devel \
-        libXext-devel \
-        libXfixes-devel \
-        yasm \
-        speex-devel \
-        libgsm-devel \
-        chrpath \
-        check \
-        astyle \
-        uuid-devel \
-        gettext-devel \
-        gcc-c++ \
-        which \
-        alsa-lib-devel \
-        systemd-devel \
-        libuuid-devel \
-        uuid-devel \
-        gnutls-devel \
-        libopus-devel \
-        patch \
-        jsoncpp-devel \
-        webkit2gtk3-devel \
-        libcryptopp-devel \
-        libva-devel \
-        libvdpau-devel \
-        msgpack-devel \
-        clutter-devel \
-        openssl-devel \
-        clutter-gtk-devel \
-        libnma-devel \
-        libcryptopp-devel \
-        libdbus-c++-devel \
-        libQt5DBus-devel \
-        libexpat-devel \
-        gnome-icon-theme-symbolic \
-        libgsm-devel \
-        gtk3-devel \
-        libappindicator-devel \
-        sqlite-devel \
-        libQt5Sql-devel \
-        libQt5Gui-devel  \
-        ffmpeg-4-libavutil-devel \
-        gtk3-devel\
-        qrencode-devel \
-        python3-python-dateutil \
-        libqt5-linguist-devel \
-        libsndfile-devel \
-        evolution-devel
-
-RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
-RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 50
-
-ADD scripts/build-package-opensuse-leap.sh  /opt/build-package-opensuse-leap.sh
-
-CMD /opt/build-package-opensuse-leap.sh
diff --git a/docker/Dockerfile_ubuntu_19.10 b/docker/Dockerfile_ubuntu_19.10
deleted file mode 100644
index fff233c5682061b3ff0cbeea257b42eafc740f85..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.10
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM ubuntu:19.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=10 \
-        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/docker/Dockerfile_ubuntu_19.10_i386 b/docker/Dockerfile_ubuntu_19.10_i386
deleted file mode 100644
index e87532a6252fbd324137c8660c8fca3d194819e7..0000000000000000000000000000000000000000
--- a/docker/Dockerfile_ubuntu_19.10_i386
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM i386/ubuntu:19.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=10 \
-        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/lrc b/lrc
index 461e0fcff1e5aa1fff3ca4aaa498b407e80d4841..bae0c7e740b12dc80af4fabae7520b1f856a44c5 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit 461e0fcff1e5aa1fff3ca4aaa498b407e80d4841
+Subproject commit bae0c7e740b12dc80af4fabae7520b1f856a44c5
diff --git a/packaging/rules/debian-one-click-install/jami-all.postinst b/packaging/rules/debian-one-click-install/jami-all.postinst
index a1d56ba1034a8712c62a8f5608f7d34890490eaf..3eef137e2a91779755bf7c72fe20048c54bcc729 100755
--- a/packaging/rules/debian-one-click-install/jami-all.postinst
+++ b/packaging/rules/debian-one-click-install/jami-all.postinst
@@ -20,18 +20,17 @@ set -e
 # depending on the system the postinst script is run on. Examples:
 #
 # Ubuntu 18.04:
-# $RING_REPO = $RING_REPO_BASE/ubuntu_18.04/
+# $JAMI_REPO = $JAMI_REPO_BASE/ubuntu_18.04/
 #
-# Debian 9:
-# $RING_REPO = $RING_REPO_BASE/debian_9
+# Debian 10:
+# $JAMI_REPO = $JAMI_REPO_BASE/debian_10
 #
 # To update the appended end tags, modify the switch in [2].
-# FIXME As soon as the repo get renamed to /nightly fix this url
-RING_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/nightly"
 
 # Jami release key.
-RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
-RING_KEY="\
+JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+JAMI_KEY="\
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2
 
@@ -76,10 +75,10 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # postrm paths should be modified as well
 APT_FILE="/etc/apt/sources.list.d/jami-main.list"
 UPDATE_MANAGER_PATH="/etc/update-manager/release-upgrades.d/"
-RING_UPDATE_MANAGER_ID="jami-main"
+JAMI_UPDATE_MANAGER_ID="jami-main"
 
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
-UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${RING_UPDATE_MANAGER_CFG}"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
+UPDATE_MANAGER_CFG_PATH="${UPDATE_MANAGER_PATH}/${JAMI_UPDATE_MANAGER_CFG}"
 
 
 ###############################################################################
@@ -95,22 +94,12 @@ if [ -f /etc/os-release ]; then
     . /etc/os-release
 
     # Set-up Jami repository end tag
-    if [ "${DEBIAN_CODENAME}" = "stretch" ] || [ "${ID}_${VERSION_ID}" = "debian_9" ]; then
-        ENDTAG="debian_9"
-    elif [ "${DEBIAN_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
+    if [ "${DEBIAN_CODENAME}" = "buster" ] || [ "${ID}_${VERSION_ID}" = "debian_10" ]; then
         ENDTAG="debian_10"
-    elif [ "${ID}_${VERSION_ID}" = "trisquel_8.0" ]; then
-        ENDTAG="ubuntu_16.04"
-    elif [ "${UBUNTU_CODENAME}" = "xenial" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_16.04" ]; then
-        ENDTAG="ubuntu_16.04"
+    elif [ "${ID}_${VERSION_ID}" = "trisquel_9.0" ]; then
+        ENDTAG="ubuntu_18.04"
     elif [ "${UBUNTU_CODENAME}" = "bionic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.04" ]; then
         ENDTAG="ubuntu_18.04"
-    elif [ "${UBUNTU_CODENAME}" = "cosmic" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_18.10" ]; then
-        ENDTAG="ubuntu_18.10"
-    elif [ "${UBUNTU_CODENAME}" = "disco" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.04" ]; then
-        ENDTAG="ubuntu_19.04"
-    elif [ "${UBUNTU_CODENAME}" = "eoan" ] || [ "${ID}_${VERSION_ID}" = "ubuntu_19.10" ]; 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
@@ -136,18 +125,17 @@ case "$1" in
         fi
 
         if [ "${CAN_ADD_DEB_SOURCE}" = "true" ]; then
-            RING_REPO="${RING_REPO_BASE}/${ENDTAG}"
+            JAMI_REPO="${JAMI_REPO_BASE}/${ENDTAG}"
 
             # We first add the key to the trusted keyring.
             apt-key add - > /dev/null 2>&1 << EOF
-$RING_KEY
+$JAMI_KEY
 EOF
 
             # Add an entry for the package repository to the trusted package
             # sources (DEB822 format)
-	    # FIXME As soon as we rename the repo use ring instead of jami
             cat > $APT_FILE <<EOF
-deb ${RING_REPO} ring main
+deb ${JAMI_REPO} jami main
 EOF
 
             # Additionally, if update manager is installed we inform it about
@@ -160,7 +148,7 @@ EOF
 # Added by Jami to prevent disabling of Jami repository sources on
 # distribution release upgrade.
 [ThirdPartyMirrors]
-ring/${RING_UPDATE_MANAGER_ID}=${RING_REPO}
+jami/${JAMI_UPDATE_MANAGER_ID}=${JAMI_REPO}
 EOF
             fi
         fi
diff --git a/packaging/rules/debian-one-click-install/rules b/packaging/rules/debian-one-click-install/rules
index 32134cb276a748b4a9fb67a9cafbdd6f30dbb303..e9ffc2709a37ecc77651ca644d6e6a807f89a362 100755
--- a/packaging/rules/debian-one-click-install/rules
+++ b/packaging/rules/debian-one-click-install/rules
@@ -13,7 +13,7 @@ NO_CPUS=1
 endif
 
 # Binary package names
-RING_ALL_IN_ONE_PKG_NAME="jami-all"
+JAMI_ALL_IN_ONE_PKG_NAME="jami-all"
 
 # Bundled packages from contrib
 BUNDLED_PKGS = .ffmpeg
@@ -157,23 +157,23 @@ override_dh_auto_install:
 	######################
 
         ## daemon
-	cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
+	cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
 
         ## LibRingClient
-	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
 
 	# This is a symlink, should be in -dev package
-	rm -v $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
+	rm -v $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
 
 	# cmake files
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
 
         ## GNOME client
-	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
 	ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
 
 tmpdir:= $(shell mktemp -d)
diff --git a/packaging/rules/debian/rules b/packaging/rules/debian/rules
index eeb1965ec390498293f3d12b10f17657b2e11733..2c098c6a339de240b6aeaad334519799d3efa7dd 100755
--- a/packaging/rules/debian/rules
+++ b/packaging/rules/debian/rules
@@ -13,9 +13,9 @@ NO_CPUS=1
 endif
 
 # Binary package names
-RING_ALL_IN_ONE_PKG_NAME="jami-all"
-RING_CLIENT_PKG_NAME="jami"
-RING_DAEMON_PKG_NAME="jami-daemon"
+JAMI_ALL_IN_ONE_PKG_NAME="jami-all"
+JAMI_CLIENT_PKG_NAME="jami"
+JAMI_DAEMON_PKG_NAME="jami-daemon"
 
 # Bundled packages from contrib
 BUNDLED_PKGS = .ffmpeg
@@ -158,27 +158,27 @@ override_dh_auto_install:
 	## Ring daemon install ##
 	#########################
 
-	cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_DAEMON_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/include
-	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.a
-	rm -rfv $(CURDIR)/debian/$(RING_DAEMON_PKG_NAME)/usr/lib/*.la
+	cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/include
+	rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/lib/*.a
+	rm -rfv $(CURDIR)/debian/$(JAMI_DAEMON_PKG_NAME)/usr/lib/*.la
 
 	#########################
 	## Jami client install ##
 	#########################
 
         ## LibRingClient
-	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/include
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/include
 
 	# This is a symlink, should be in -dev package
-	rm -v $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/libringclient.so
+	rm -v $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/libringclient.so
 
 	# cmake files
-	rm -rfv $(CURDIR)/debian/$(RING_CLIENT_PKG_NAME)/usr/lib/cmake
+	rm -rfv $(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME)/usr/lib/cmake
 
         ## GNOME client
-	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_CLIENT_PKG_NAME) install
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_CLIENT_PKG_NAME) install
 	ln -sf /usr/bin/jami $(CURDIR)/debian/jami/usr/bin/ring.cx
 
 	######################
@@ -186,23 +186,23 @@ override_dh_auto_install:
 	######################
 
         ## daemon
-	cd daemon && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
+	cd daemon && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.a
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/*.la
 
         ## LibRingClient
-	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/include
+	cd lrc/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/include
 
 	# This is a symlink, should be in -dev package
-	rm -v $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
+	rm -v $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/libringclient.so
 
 	# cmake files
-	rm -rfv $(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
+	rm -rfv $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)/usr/lib/cmake
 
         ## GNOME client
-	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(RING_ALL_IN_ONE_PKG_NAME) install
+	cd client-gnome/build && make DESTDIR=$(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME) install
 	ln -sf /usr/bin/jami $(CURDIR)/debian/jami-all/usr/bin/ring.cx
 
 tmpdir:= $(shell mktemp -d)
diff --git a/packaging/rules/fedora/jami-all.postinst b/packaging/rules/fedora/jami-all.postinst
index 2e5c85d2b2519c5ac83d517f5977e638d5d85ef5..4e59d7890162653f39b065369232cb93af53923c 100755
--- a/packaging/rules/fedora/jami-all.postinst
+++ b/packaging/rules/fedora/jami-all.postinst
@@ -19,8 +19,7 @@
 # depending on the system the postinst script is run on.
 #
 # To update the appended end tags, modify the switch in [2].
-# FIXME As soon as the repo get renamed to /nightly fix this url
-JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/nightly"
 
 # Jami release key.
 JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
@@ -69,8 +68,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # postrm paths should be modified as well
 YUM_FILE="/etc/yum.repos.d/jami-main.repo"
 GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
 
 ###############################################################################
 # [2] Set package repo url depending on distribution and version              #
@@ -89,22 +88,12 @@ JAMI_REPO='
 name='"${NAME}"' $releasever - $basearch - Jami
 baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
 gpgcheck=1
-gpgkey=https://dl.jami.net/ring.pub.key
+gpgkey=https://dl.jami.net/jami.pub.key
 enabled=1'
 
     # Set-up Jami repository end tag
     if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
         ENDTAG="rhel_8"
-    elif [ "${PLATFORM_ID}" = "platform:f27" ] || [ "${ID}_${VERSION_ID}" = "fedora_27" ]; then
-        ENDTAG="fedora_27"
-    elif [ "${PLATFORM_ID}" = "platform:f28" ] || [ "${ID}_${VERSION_ID}" = "fedora_28" ]; then
-        ENDTAG="fedora_28"
-    elif [ "${PLATFORM_ID}" = "platform:f29" ] || [ "${ID}_${VERSION_ID}" = "fedora_29" ]; then
-        ENDTAG="fedora_29"
-    elif [ "${PLATFORM_ID}" = "platform:f30" ] || [ "${ID}_${VERSION_ID}" = "fedora_30" ]; then
-        ENDTAG="fedora_30"
-    elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
-        ENDTAG="fedora_31"
     elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
         ENDTAG="fedora_32"
     elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
@@ -137,7 +126,6 @@ EOF
         /usr/bin/rpm --import $GPG_FILE  > /dev/null 2>&1
 
         # Add an entry for the package repository to the trusted package
-        # FIXME As soon as we rename the repo use ring instead of jami
         cat > $YUM_FILE <<EOF
 $JAMI_REPO
 EOF
diff --git a/packaging/rules/opensuse-leap/jami-all.postinst b/packaging/rules/opensuse-leap/jami-all.postinst
index 289822b26792c052b05c51baa1c38831b838378d..6dffc5c6ed22f6c0f9e2a2e068bf08c5f6f608b4 100755
--- a/packaging/rules/opensuse-leap/jami-all.postinst
+++ b/packaging/rules/opensuse-leap/jami-all.postinst
@@ -19,8 +19,7 @@
 # depending on the system the postinst script is run on.
 #
 # To update the appended end tags, modify the switch in [2].
-# FIXME As soon as the repo get renamed to /nightly fix this url
-JAMI_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/nightly"
 
 # Jami release key.
 JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
@@ -69,8 +68,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # postrm paths should be modified as well
 REPO_FILE="/etc/yum.repos.d/jami-main.repo"
 GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
 
 ###############################################################################
 # [2] Set package repo url depending on distribution and version              #
@@ -89,30 +88,26 @@ JAMI_REPO='
 name='"${NAME}"' $releasever - $basearch - Jami
 baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
 gpgcheck=1
-gpgkey=https://dl.jami.net/ring.pub.key
+gpgkey=https://dl.jami.net/jami.pub.key
 enabled=1'
 
     # Set-up Jami repository end tag
-    if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
-        ENDTAG="rhel_8"
-    elif [ "${PLATFORM_ID}" = "platform:f27" ] || [ "${ID}_${VERSION_ID}" = "fedora_27" ]; then
-        ENDTAG="fedora_27"
-    elif [ "${PLATFORM_ID}" = "platform:f28" ] || [ "${ID}_${VERSION_ID}" = "fedora_28" ]; then
-        ENDTAG="fedora_28"
-    elif [ "${PLATFORM_ID}" = "platform:f29" ] || [ "${ID}_${VERSION_ID}" = "fedora_29" ]; then
-        ENDTAG="fedora_29"
-    elif [ "${PLATFORM_ID}" = "platform:f30" ] || [ "${ID}_${VERSION_ID}" = "fedora_30" ]; then
-        ENDTAG="fedora_30"
-    elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
-        ENDTAG="fedora_31"
-    elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
-        ENDTAG="fedora_32"
-    elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
-        ENDTAG="fedora_33"
-    elif [ "${PLATFORM_ID}" = "opensuse-leap:15.1" ] || [ "${ID}_${VERSION_ID}" = "opensuse-leap_15.1" ]; then
-        ENDTAG="opensuse-leap_15.1"
-	REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
-	GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
+    if [ "${PLATFORM_ID}" = "opensuse-leap:15.2" ]; then
+        ENDTAG="opensuse-leap_15.2"
+        REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
+        GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
+    elif [ "${PLATFORM_ID}" = "opensuse-tumbleweed" ]; then
+        ENDTAG="opensuse-tumbleweed"
+        REPO_FILE="/etc/zypp/repos.d/jami-main.repo"
+        GPG_FILE="/tmp/RPM-GPG-KEY-JAMI"
+        # Remove releasever for tumbleweed as it's a rolling release
+        JAMI_REPO='
+[jami]
+name='"${NAME}"' $basearch - Jami
+baseurl='"${JAMI_REPO_BASE}"/"${ID}"'
+gpgcheck=1
+gpgkey=https://dl.jami.net/jami.pub.key
+enabled=1'
     else
         # Distribution is not supported. Don't provide automatic updates.
         CAN_ADD_YUM_SOURCE=false
@@ -139,7 +134,7 @@ $JAMI_KEY
 EOF
         /usr/bin/rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
         /usr/bin/rpm --import $GPG_FILE  > /dev/null 2>&1
-	if [ "${ENDTAG}" = "opensuse-leap_15.1" ]; then
+	if [ "${ENDTAG}" = "opensuse-leap_15.2" ] || [ "${ENDTAG}" = "opensuse-tumbleweed" ]; then
 		rm -f $GPG_FILE
 	fi
         # Add an entry for the package repository to the trusted package
diff --git a/packaging/rules/rhel/jami-all.postinst b/packaging/rules/rhel/jami-all.postinst
index 39b54db5eab0f2c806450b565c237b244883747f..aa8d8111b7632613e36f633359dbb6cd74766712 100755
--- a/packaging/rules/rhel/jami-all.postinst
+++ b/packaging/rules/rhel/jami-all.postinst
@@ -19,12 +19,11 @@
 # depending on the system the postinst script is run on.
 #
 # To update the appended end tags, modify the switch in [2].
-# FIXME As soon as the repo get renamed to /nightly fix this url
-RING_REPO_BASE="https://dl.jami.net/ring-nightly"
+JAMI_REPO_BASE="https://dl.jami.net/nightly"
 
 # Jami release key.
-RING_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
-RING_KEY="\
+JAMI_KEY_FINGERPRINT="A295D773307D25A33AE72F2F64CD5FA175348F84"
+JAMI_KEY="\
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v2
 
@@ -69,8 +68,8 @@ HUFCGSHO3/kzxSlkE1PBUX3IZ8PSFijyopBnWUhlSXuyRjte8OR7Fl/Rlf0IaOD1
 # postrm paths should be modified as well
 YUM_FILE="/etc/yum.repos.d/jami-main.repo"
 GPG_FILE="/etc/pki/rpm-gpg/RPM-GPG-KEY-JAMI"
-RING_UPDATE_MANAGER_ID="jami-main"
-RING_UPDATE_MANAGER_CFG="${RING_UPDATE_MANAGER_ID}.cfg"
+JAMI_UPDATE_MANAGER_ID="jami-main"
+JAMI_UPDATE_MANAGER_CFG="${JAMI_UPDATE_MANAGER_ID}.cfg"
 
 ###############################################################################
 # [2] Set package repo url depending on distribution and version              #
@@ -84,19 +83,17 @@ CAN_ADD_YUM_SOURCE=true
 if [ -f /etc/os-release ]; then
     . /etc/os-release
 
-RING_REPO='
+JAMI_REPO='
 [jami]
 name=Jami $releasever - $basearch - jami
-baseurl='"${RING_REPO_BASE}"/"${ID}"'_$releasever
+baseurl='"${JAMI_REPO_BASE}"/"${ID}"'_$releasever
 gpgcheck=1
-gpgkey=https://dl.jami.net/ring.pub.key
+gpgkey=https://dl.jami.net/jami.pub.key
 enabled=1'
 
     # Set-up Jami repository end tag
     if [ "${PLATFORM_ID}" = "platform:el8" ] || [ "${ID}_${VERSION_ID%.*}" = "rhel_8" ]; then
         ENDTAG="rhel_8"
-    elif [ "${PLATFORM_ID}" = "platform:f31" ] || [ "${ID}_${VERSION_ID}" = "fedora_31" ]; then
-        ENDTAG="fedora_31"
     elif [ "${PLATFORM_ID}" = "platform:f32" ] || [ "${ID}_${VERSION_ID}" = "fedora_32" ]; then
         ENDTAG="fedora_32"
     elif [ "${PLATFORM_ID}" = "platform:f33" ] || [ "${ID}_${VERSION_ID}" = "fedora_33" ]; then
@@ -123,7 +120,7 @@ fi
 #       # We first add the key to the trusted keyring.
         cat > $GPG_FILE <<EOF
           
-$RING_KEY
+$JAMI_KEY
 EOF
         /usr/bin/rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
         /usr/bin/rpm --import $GPG_FILE  > /dev/null 2>&1
@@ -131,7 +128,7 @@ EOF
         # Add an entry for the package repository to the trusted package
         # FIXME As soon as we rename the repo use ring instead of jami
         cat > $YUM_FILE <<EOF
-$RING_REPO
+$JAMI_REPO
 EOF
  fi
 exit 0
diff --git a/scripts/build-package-gentoo.sh b/scripts/build-package-gentoo.sh
deleted file mode 100644
index e5082232836c9604afdc463f11153e70d6089a65..0000000000000000000000000000000000000000
--- a/scripts/build-package-gentoo.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (C) 2016-2019 Savoir-faire Linux Inc.
-#
-# Author: Stefan Langenmaier <stefan.langenmaier@savoirfairelinux.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# This script is used in the packaging containers to build packages on
-# rpm-based distros.
-#
-
-set -e
-
-layman -f -a ring-overlay
-
-cp /opt/ring-project-ro/${RELEASE_TARBALL_FILENAME} /usr/portage/distfiles
-
-cd /var/lib/layman/ring-overlay && bash scripts/bump-ring-ebuilds.sh /usr/portage/distfiles/${RELEASE_TARBALL_FILENAME}
-
-# problem with cirrcular deps
-USE="-qt5" emerge -1 dev-util/cmake
-
-emerge jami-gnome kde-ring
-
-touch /opt/output/.packages-built
-chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output
diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh
index 676747e304965cd294f7acbf9779b5864a4f07a7..98d0581fd0cb9a0352edecf4c7aaea22d3d19bbe 100755
--- a/scripts/deploy-packages.sh
+++ b/scripts/deploy-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2016-2017 Savoir-faire Linux Inc.
+# Copyright (C) 2016-2021 Savoir-faire Linux Inc.
 #
 # Author: Alexandre Viau <alexandre.viau@savoirfairelinux.com>
 # Author: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
@@ -20,7 +20,7 @@
 #
 
 #
-# This script sings and deploys pacakges from packages/distro.
+# This script syncs and deploys packages from packages/distro.
 # It should be ran from the project root directory.
 #
 
@@ -45,6 +45,15 @@ function package_deb()
 
     # Distributions file
     cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/distributions
+Origin: jami
+Label: Jami ${DISTRIBUTION} Repository
+Codename: jami
+Architectures: i386 amd64 armhf arm64
+Components: main
+Description: This repository contains Jami ${DISTRIBUTION} packages
+SignWith: ${KEYID}
+
+# TODO: Remove when April 2024 comes.
 Origin: ring
 Label: Ring ${DISTRIBUTION} Repository
 Codename: ring
@@ -52,19 +61,12 @@ Architectures: i386 amd64 armhf arm64
 Components: main
 Description: This repository contains Ring ${DISTRIBUTION} packages
 SignWith: ${KEYID}
-EOF
-
-    # Options file
-    cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/conf/options
-basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER}
 EOF
 
     ####################################
     ## Add packages to the repository ##
     ####################################
-
     for package in packages/${DISTRIBUTION}*/*.deb; do
-
         # Sign the deb
         echo "## signing: ${package} ##"
         dpkg-sig -k ${KEYID} --sign builder ${package}
@@ -76,15 +78,23 @@ EOF
         if [ ${package_arch} = "all" ]; then
             # Removing to avoid the error of adding the same deb twice.
             # This happens with arch all packages, which are generated in amd64 and i386.
+            reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} remove jami ${package_name}
+            # TODO: Remove when April 2024 comes.
             reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} remove ring ${package_name}
         fi
+        reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} includedeb jami ${package}
+        # TODO: Remove when April 2024 comes.
         reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} includedeb ring ${package}
     done
 
     # Rebuild the index
+    reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} export jami
+    # TODO: Remove when April 2024 comes.
     reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} export ring
 
     # Show the contents
+    reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} list jami
+    # TODO: Remove when April 2024 comes.
     reprepro --verbose --basedir ${DISTRIBUTION_REPOSITOIRY_FOLDER} list ring
 
     #######################################
@@ -121,16 +131,27 @@ function package_rpm()
     echo "## Creating repository ##"
     echo "#########################"
 
+    local name
+    local baseurl
+
     DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION}
     mkdir -p ${DISTRIBUTION_REPOSITOIRY_FOLDER}
 
     # .repo file
-    cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/ring-nightly.repo
-[ring]
-name=Ring \$releasever - \$basearch - ring
-baseurl=https://dl.jami.net/ring-nightly/${DISTRIBUTION%_*}_\$releasever
+    if [ "${DISTRIBUTION:0:19}" == "opensuse-tumbleweed" ]; then
+        name="Jami \$basearch - jami"
+        baseurl="https://dl.jami.net/nightly/${DISTRIBUTION%_*}"
+    else
+        name="Jami \$releasever - \$basearch - jami"
+        baseurl="https://dl.jami.net/nightly/${DISTRIBUTION%_*}_\$releasever"
+    fi
+
+    cat << EOF > ${DISTRIBUTION_REPOSITOIRY_FOLDER}/jami-nightly.repo
+[jami]
+name=$name
+baseurl=$baseurl
 gpgcheck=1
-gpgkey=https://dl.jami.net/ring.pub.key
+gpgkey=https://dl.jami.net/jami.pub.key
 enabled=1
 EOF
 
@@ -161,24 +182,23 @@ EOF
     #######################################
     ## create the manual download folder ##
     #######################################
+    local packages
+
     DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER=$(realpath manual-download)/${DISTRIBUTION}
     mkdir -p ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
-    if [ -d "packages/${DISTRIBUTION}/one-click-install/" ];
-    then
-        for package in packages/${DISTRIBUTION}*/one-click-install/*.rpm; do
-            cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
-            package_name=$(rpm -qp --queryformat '%{NAME}' ${package})
-            package_arch=$(rpm -qp --queryformat '%{ARCH}' ${package})
-            cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}/${package_name}_${package_arch}.rpm
-        done
+
+    if [ -d "packages/${DISTRIBUTION}/one-click-install/" ]; then
+        packages=(packages/${DISTRIBUTION}*/one-click-install/*.rpm)
     else
-        for package in packages/${DISTRIBUTION}*/*.rpm; do
-            cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
-            package_name=$(rpm -qp --queryformat '%{NAME}' ${package})
-            package_arch=$(rpm -qp --queryformat '%{ARCH}' ${package})
-            cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}/${package_name}_${package_arch}.rpm
-        done
+        packages=(packages/${DISTRIBUTION}*/*.rpm)
     fi
+
+    for package in "${packages[@]}"; do
+        cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}
+        package_name=$(rpm -qp --queryformat '%{NAME}' ${package})
+        package_arch=$(rpm -qp --queryformat '%{ARCH}' ${package})
+        cp ${package} ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER}/${package_name}_${package_arch}.rpm
+    done
 }
 
 
@@ -192,17 +212,14 @@ function package_snap()
     echo "## deploying snap ##"
     echo "####################"
 
-    if [[ "${CHANNEL:0:19}" == "internal_experiment" ]];
-    then
+    if [[ "${CHANNEL:0:19}" == "internal_experiment" ]]; then
         DISTRIBUTION_REPOSITOIRY_FOLDER=$(realpath repositories)/${DISTRIBUTION}
         mkdir -p ${DISTRIBUTION_REPOSITOIRY_FOLDER}
         cp packages/${DISTRIBUTION}*/*.snap ${DISTRIBUTION_REPOSITOIRY_FOLDER}/
-    elif [[ "${CHANNEL:0:7}" == "nightly" ]];
-    then
+    elif [[ "${CHANNEL:0:7}" == "nightly" ]]; then
         snapcraft login --with ${SNAPCRAFT_LOGIN}
         snapcraft push packages/${DISTRIBUTION}*/*.snap --release edge
-    elif [[ "${CHANNEL:0:6}" == "stable" ]];
-    then
+    elif [[ "${CHANNEL:0:6}" == "stable" ]]; then
         snapcraft login --with ${SNAPCRAFT_LOGIN}
         snapcraft push packages/${DISTRIBUTION}*/*.snap --release stable
     fi
@@ -220,19 +237,20 @@ function deploy()
         RSYNC_RSH="ssh -i ${SSH_IDENTIY_FILE}"
     fi
 
-    # Deploy the repository
     echo "##########################"
     echo "## deploying repository ##"
     echo "##########################"
     echo "Using RSYNC_RSH='${RSYNC_RSH}'"
-    rsync --archive --recursive --verbose --delete ${DISTRIBUTION_REPOSITOIRY_FOLDER} ${REMOTE_REPOSITORY_LOCATION}
+    rsync --archive --recursive --verbose \
+          --delete ${DISTRIBUTION_REPOSITOIRY_FOLDER} \
+          ${REMOTE_REPOSITORY_LOCATION}
 
-    # deploy the manual download files
     echo "#####################################"
     echo "## deploying manual download files ##"
     echo "#####################################"
-    rsync --archive --recursive --verbose --delete ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER} ${REMOTE_MANUAL_DOWNLOAD_LOCATION}
-
+    rsync --archive --recursive --verbose \
+          --delete ${DISTRIBUTION_MANUAL_DOWNLOAD_FOLDER} \
+          ${REMOTE_MANUAL_DOWNLOAD_LOCATION}
 }
 
 
@@ -242,14 +260,16 @@ function deploy()
 
 function package()
 {
-    if [[ "${DISTRIBUTION:0:6}" == "debian" || "${DISTRIBUTION:0:6}" == "ubuntu" || "${DISTRIBUTION:0:8}" == "raspbian" ]];
-    then
+    if [[ "${DISTRIBUTION:0:6}" == "debian" \
+              || "${DISTRIBUTION:0:6}" == "ubuntu" \
+              || "${DISTRIBUTION:0:8}" == "raspbian" ]]; then
         package_deb
-    elif [[ "${DISTRIBUTION:0:6}" == "fedora" || "${DISTRIBUTION:0:4}" == "rhel" || "${DISTRIBUTION:0:13}" == "opensuse-leap" || "${DISTRIBUTION:0:19}" == "opensuse-tumbleweed" ]];
-    then
+    elif [[ "${DISTRIBUTION:0:6}" == "fedora" \
+                || "${DISTRIBUTION:0:4}" == "rhel" \
+                || "${DISTRIBUTION:0:13}" == "opensuse-leap" \
+                || "${DISTRIBUTION:0:19}" == "opensuse-tumbleweed" ]]; then
         package_rpm
-    elif [[ "${DISTRIBUTION:0:4}" == "snap" ]];
-    then
+    elif [[ "${DISTRIBUTION:0:4}" == "snap" ]]; then
         package_snap
     else
         echo "ERROR: Distribution '${DISTRIBUTION}' is unsupported"
diff --git a/scripts/gentoo/portage/bashrc b/scripts/gentoo/portage/bashrc
deleted file mode 100644
index 14b80f021f3d0a8939daccbd61b241b666bfe314..0000000000000000000000000000000000000000
--- a/scripts/gentoo/portage/bashrc
+++ /dev/null
@@ -1,5 +0,0 @@
-updatePkgs() {
-	chown -R ${CURRENT_UID}:${CURRENT_UID} /opt/output
-}
-
-[[ $EBUILD_PHASE == "postinst" || $EBUILD_PHASE == "clean" ]] && updatePkgs
diff --git a/scripts/gentoo/portage/make.conf b/scripts/gentoo/portage/make.conf
deleted file mode 100644
index b6d4c3532c791eaf44a469d838f333371ee8c174..0000000000000000000000000000000000000000
--- a/scripts/gentoo/portage/make.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-# standard configuration to maximise portability
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-CHOST="x86_64-pc-linux-gnu"
-USE="bindist -qt4 qt5"
-CPU_FLAGS_X86="mmx mmxext sse sse2"
-PORTDIR="/usr/portage"
-DISTDIR="${PORTDIR}/distfiles"
-
-# modification to ouput built packages to a non standard folder
-PKGDIR="/opt/output/packages"
-FEATURES="$FEATURES buildpkg"
-EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --usepkg"
-
-# necessary for current layman version, should be removed with layman >2.0.0
-# cannot be specified from the beginning because layman is not yet installed
-#source /var/lib/layman/make.conf
diff --git a/scripts/gentoo/portage/package.env/ring b/scripts/gentoo/portage/package.env/ring
deleted file mode 100644
index eb42c7cadb2b692697f994e4e36343f7b1a4a2c0..0000000000000000000000000000000000000000
--- a/scripts/gentoo/portage/package.env/ring
+++ /dev/null
@@ -1,19 +0,0 @@
-# docker build
-# not necessary when docker runs with PTRACE capability
-dev-libs/gobject-introspection docker-build
-app-text/poppler docker-build
-dev-libs/crypto++ docker-build
-dev-libs/libical docker-build
-dev-libs/appstream-glib docker-build
-net-libs/webkit-gtk docker-build
-net-libs/gnome-online-accounts docker-build
-sys-libs/ncurses docker-build
-
-# build pkg
-dev-libs/msgpack build-pkg
-net-libs/libringclient build-pkg
-net-libs/opendht build-pkg
-net-voip/jami-gnome build-pkg
-net-voip/kde-ring build-pkg
-net-voip/ring-daemon build-pkg
-
diff --git a/scripts/gentoo/portage/package.keywords/ring b/scripts/gentoo/portage/package.keywords/ring
deleted file mode 100644
index b3dd4f2a52a081aecb373d8c8b135a4e24d95852..0000000000000000000000000000000000000000
--- a/scripts/gentoo/portage/package.keywords/ring
+++ /dev/null
@@ -1,16 +0,0 @@
-# overlay
-net-voip/jami-gnome ~amd64
-=net-voip/kde-ring-99999999 **
-net-libs/libringclient ~amd64
-net-voip/ring-daemon ~amd64
-dev-libs/msgpack ~amd64
-net-libs/opendht ~amd64
-
-# deps
-dev-libs/crypto++ ~amd64
-dev-libs/jsoncpp ~amd64
-net-libs/libupnp ~amd64
-media-libs/opus ~amd64
-media-libs/libvpx ~amd64
-dev-libs/dbus-c++ ~amd64
-
diff --git a/scripts/gentoo/portage/package.use/ring b/scripts/gentoo/portage/package.use/ring
deleted file mode 100644
index ecfef2d11ad0b20b054eea96db0a6b85ebdc47b4..0000000000000000000000000000000000000000
--- a/scripts/gentoo/portage/package.use/ring
+++ /dev/null
@@ -1,13 +0,0 @@
-dev-libs/libpcre pcre16
-
-sys-libs/zlib minizip
-dev-libs/libdbusmenu-qt qt5
-media-libs/phonon-gstreamer qt5
-dev-qt/qtcore icu
-media-libs/phonon-vlc qt5
-sys-auth/polkit-qt qt5
-media-libs/phonon qt5
-
-# avoiding a cirrcular dep
-media-libs/harfbuzz -graphite
-dev-util/cmake -qt5
diff --git a/scripts/make-packaging-target.py b/scripts/make-packaging-target.py
index 67ce44c6b829731b13fc35f74af03ece83ed4d4d..37bcf94be786b976dee312eeb5804e8422fc7f4e 100755
--- a/scripts/make-packaging-target.py
+++ b/scripts/make-packaging-target.py
@@ -23,11 +23,10 @@
 
 import argparse
 
-target_template = """\
-##
-## Distro: %(distribution)s
-##
-
+template_header = """\
+# -*- mode: makefile -*-
+# This file was auto-generated by: scripts/make-packaging-target.py.
+#
 # We don't simply use jami-packaging-distro as the docker image name because
 # we want to be able to build multiple versions of the same distro at the
 # same time and it could result in race conditions on the machine as we would
@@ -35,10 +34,17 @@ target_template = """\
 #
 # This does not impact caching as the docker daemon does not care about the image
 # names, just about the contents of the Dockerfile.
+"""
+
+target_template = """\
+##
+## Distro: %(distribution)s
+##
+
 PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME:=jami-packaging-%(distribution)s$(RING_PACKAGING_IMAGE_SUFFIX)
 PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE:=.docker-image-$(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
 DOCKER_EXTRA_ARGS =
-QEMU_STATIC_%(distribution)s = %(qemu_static)s
+
 
 PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\
     --rm \\
@@ -54,12 +60,7 @@ PACKAGE_%(distribution)s_DOCKER_RUN_COMMAND = docker run \\
     -t $(DOCKER_EXTRA_ARGS) %(options)s \\
     $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME)
 
-# FIXME: dirty qemu-static hack required because our Jenkis node runs Docker 17
-# Remove all the qemu-static / QEMU-STATIC stuff as soon as we get Docker 18 +
-QEMU_STATIC_%(distribution)s:
-	if [ ! -z $(QEMU_STATIC_%(distribution)s) ]; then mkdir -p qemu-static && cp -af /usr/bin/$(QEMU_STATIC_%(distribution)s) qemu-static/; fi
-
-$(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): QEMU_STATIC_%(distribution)s docker/Dockerfile_%(docker_image)s
+$(PACKAGE_%(distribution)s_DOCKER_IMAGE_FILE): docker/Dockerfile_%(docker_image)s
 	docker build \\
         -t $(PACKAGE_%(distribution)s_DOCKER_IMAGE_NAME) \\
         -f docker/Dockerfile_%(docker_image)s %(password_rhel8)s \\
@@ -75,6 +76,7 @@ packages/%(distribution)s/%(output_file)s: $(RELEASE_TARBALL_FILENAME) packages/
 
 .PHONY: package-%(distribution)s
 package-%(distribution)s: packages/%(distribution)s/%(output_file)s
+PACKAGE-TARGETS += package-%(distribution)s
 
 .PHONY: package-%(distribution)s-interactive
 package-%(distribution)s-interactive: DOCKER_EXTRA_ARGS = -i
@@ -83,7 +85,7 @@ package-%(distribution)s-interactive: $(RELEASE_TARBALL_FILENAME) packages/%(dis
 """
 
 
-def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', qemu_static='', password_rhel8 = ''):
+def generate_target(distribution, debian_packaging_override, output_file, options='', docker_image='', version='', password_rhel8 = ''):
     if (docker_image == ''):
         docker_image = distribution
     if (docker_image == 'rhel_8'):
@@ -97,7 +99,6 @@ def generate_target(distribution, debian_packaging_override, output_file, option
         "output_file": output_file,
         "options": options,
         "version": version,
-        "qemu_static": qemu_static,
         "password_rhel8": password_rhel8,
     }
 
@@ -108,71 +109,12 @@ def run_generate(parsed_args):
                           parsed_args.output_file,
                           parsed_args.options,
                           parsed_args.docker_image,
-                          parsed_args.version,
-                          parsed_args.qemu_static))
+                          parsed_args.version))
 
 
 def run_generate_all(parsed_args):
     targets = [
         # Debian
-        {
-            "distribution": "debian_9",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-        },
-        {
-            "distribution": "debian_9_i386",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-        },
-        {
-            "distribution": "debian_9_armhf",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
-            "qemu_static": 'qemu-arm-static',
-        },
-        {
-            "distribution": "debian_9_arm64",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
-            "qemu_static": 'qemu-aarch64-static',
-        },
-        {
-            "distribution": "debian_9_oci",
-            "docker_image": "debian_9",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
-            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
-            "version": "$(DEBIAN_OCI_VERSION)",
-        },
-        {
-            "distribution": "debian_9_i386_oci",
-            "docker_image": "debian_9_i386",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_OCI_DSC_FILENAME)",
-            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
-            "version": "$(DEBIAN_OCI_VERSION)",
-        },
-        {
-            "distribution": "debian_9_armhf_oci",
-            "docker_image": "debian_9_armhf",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
-            "version": "$(DEBIAN_OCI_VERSION)",
-            "qemu_static": 'qemu-arm-static',
-        },
-        {
-            "distribution": "debian_9_arm64_oci",
-            "docker_image": "debian_9_arm64",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
-            "version": "$(DEBIAN_OCI_VERSION)",
-            "qemu_static": 'qemu-aarch64-static',
-        },
         {
             "distribution": "debian_10",
             "debian_packaging_override": "",
@@ -190,14 +132,12 @@ def run_generate_all(parsed_args):
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
             "options": "--privileged --security-opt apparmor=docker-default",
-            "qemu_static": 'qemu-arm-static',
         },
         {
             "distribution": "debian_10_arm64",
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
-            "qemu_static": 'qemu-aarch64-static',
+            "options": "--privileged --security-opt apparmor=docker-default"
         },
         {
             "distribution": "debian_10_oci",
@@ -221,8 +161,7 @@ def run_generate_all(parsed_args):
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
-            "version": "$(DEBIAN_OCI_VERSION)",
-            "qemu_static": 'qemu-arm-static',
+            "version": "$(DEBIAN_OCI_VERSION)"
         },
         {
             "distribution": "debian_10_arm64_oci",
@@ -230,8 +169,7 @@ def run_generate_all(parsed_args):
             "debian_packaging_override": "",
             "output_file": "$(DEBIAN_DSC_FILENAME)",
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR) --privileged --security-opt apparmor=docker-default",
-            "version": "$(DEBIAN_OCI_VERSION)",
-            "qemu_static": 'qemu-aarch64-static',
+            "version": "$(DEBIAN_OCI_VERSION)"
         },
         # Raspbian
         {
@@ -275,34 +213,6 @@ def run_generate_all(parsed_args):
             "options": "-e OVERRIDE_PACKAGING_DIR=$(DEBIAN_OCI_PKG_DIR)",
             "version": "$(DEBIAN_OCI_VERSION)",
         },
-        {
-            "distribution": "ubuntu_19.10",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
-        },
-        {
-            "distribution": "ubuntu_19.10_i386",
-            "debian_packaging_override": "",
-            "output_file": "$(DEBIAN_DSC_FILENAME)",
-            "options": "--privileged --security-opt apparmor=docker-default",
-        },
-        {
-            "distribution": "ubuntu_19.10_oci",
-            "docker_image": "ubuntu_19.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)",
-        },
-        {
-            "distribution": "ubuntu_19.10_i386_oci",
-            "docker_image": "ubuntu_19.10_i386",
-            "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)",
-        },
         {
             "distribution": "ubuntu_20.04",
             "debian_packaging_override": "",
@@ -333,42 +243,18 @@ def run_generate_all(parsed_args):
         },
 
         # Fedora
-        {
-            "distribution": "fedora_31",
-            "debian_packaging_override": "",
-            "output_file": ".packages-built",
-            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
-        },
-        {
-            "distribution": "fedora_31_i386",
-            "debian_packaging_override": "",
-            "output_file": ".packages-built",
-            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
-        },
         {
             "distribution": "fedora_32",
             "debian_packaging_override": "",
             "output_file": ".packages-built",
             "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
         },
-        {
-            "distribution": "fedora_32_i386",
-            "debian_packaging_override": "",
-            "output_file": ".packages-built",
-            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
-        },
         {
             "distribution": "fedora_33",
             "debian_packaging_override": "",
             "output_file": ".packages-built",
             "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
         },
-        {
-            "distribution": "fedora_33_i386",
-            "debian_packaging_override": "",
-            "output_file": ".packages-built",
-            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
-        },
         {
             "distribution": "rhel_8",
             "debian_packaging_override": "",
@@ -376,13 +262,7 @@ def run_generate_all(parsed_args):
             "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged",
             "password_rhel8": "--build-arg PASS=${PASS}"
         },
-        #opensuse_leap
-        {
-            "distribution": "opensuse-leap_15.1",
-            "debian_packaging_override": "",
-            "output_file": ".packages-built",
-            "options": "--security-opt seccomp=./docker/profile-seccomp-fedora_28.json --privileged"
-        },
+        # OpenSUSE
         {
             "distribution": "opensuse-leap_15.2",
             "debian_packaging_override": "",
@@ -430,7 +310,6 @@ def parse_args():
     ap.add_argument('--options', default='')
     ap.add_argument('--docker_image', default='')
     ap.add_argument('--version', default='')
-    ap.add_argument('--qemu_static', default='')
 
     parsed_args = ap.parse_args()
 
@@ -440,6 +319,7 @@ def parse_args():
 def main():
     parsed_args = parse_args()
 
+    print(template_header)
     if parsed_args.generate:
         run_generate(parsed_args)
     elif parsed_args.generate_all: