diff --git a/Makefile b/Makefile
index 500efc0eb26651eda0f0e610831ce6634c272315..974063fa2fb1f0aa78ca7f5f9f5bab6fae58d666 100644
--- a/Makefile
+++ b/Makefile
@@ -169,6 +169,7 @@ DISTRIBUTIONS := \
 	ubuntu_22.04 \
 	fedora_35 \
 	fedora_36 \
+	fedora_37 \
 	opensuse-leap_15.3 \
 	opensuse-leap_15.4 \
 	snap
diff --git a/docker/Dockerfile_fedora_37 b/docker/Dockerfile_fedora_37
new file mode 100644
index 0000000000000000000000000000000000000000..13968108634b9463fa4c35abb15b5ad6567f6a2a
--- /dev/null
+++ b/docker/Dockerfile_fedora_37
@@ -0,0 +1,103 @@
+FROM fedora:37
+
+RUN dnf clean all
+
+RUN dnf install -y dnf-command\(builddep\) rpmdevtools && \
+    dnf install -y mock
+
+RUN dnf groupinstall -y "X Software Development"
+
+RUN dnf install -y \
+        git \
+        rpm-build \
+        tar \
+        make \
+        autoconf \
+        automake \
+        nasm \
+        speexdsp-devel \
+        pulseaudio-libs-devel \
+        libcanberra-devel \
+        libcurl-devel \
+        libtool \
+        mesa-libgbm-devel \
+        mesa-dri-drivers \
+        dbus-devel \
+        expat-devel \
+        pcre-devel \
+        yaml-cpp-devel \
+        dbus-c++-devel \
+        dbus-devel \
+        libXext-devel \
+        libXfixes-devel \
+        yasm \
+        python2.7 \
+        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 \
+        clutter-devel \
+        clutter-gtk-devel \
+        libappindicator-gtk3-devel \
+        libnotify-devel \
+        libupnp-devel \
+        qrencode-devel \
+        libargon2-devel \
+        libsndfile-devel \
+        libdrm \
+        gperf \
+        bison \
+        clang \
+        clang-devel \
+        llvm-devel \
+        nodejs \
+        flex \
+        gstreamer1 gstreamer1-devel \
+        gstreamer1-plugins-base-devel \
+        gstreamer1-plugins-good \
+        gstreamer1-plugins-bad-free-devel \
+        nss-devel \
+        libxcb* \
+        libxkb* \
+        libX11-devel \
+        vulkan-devel \
+        libXrender-devel \
+        xcb-util-* \
+        xz \
+        xkeyboard-config \
+        libnotify \
+        wget \
+        libstdc++-static \
+        sqlite-devel \
+        perl-generators \
+        perl-English \
+        libxshmfence-devel \
+        ninja-build \
+        clang \
+        cmake
+
+ADD scripts/build-package-rpm.sh /opt/build-package-rpm.sh
+
+CMD ["/opt/build-package-rpm.sh"]
diff --git a/packaging/rules/rpm/jami-all.postinst b/packaging/rules/rpm/jami-all.postinst
index 9b229e61d35862a4567cc3a62474b07aa8f54f48..04df2e52f97049f6a3c441f48c33a4eb8f37915e 100755
--- a/packaging/rules/rpm/jami-all.postinst
+++ b/packaging/rules/rpm/jami-all.postinst
@@ -119,7 +119,7 @@ echo "$JAMI_KEY" > "$GPG_FILE"
 rm -f /var/lib/rpm/.rpm.lock > /dev/null 2>&1
 rpm --import "$GPG_FILE"  > /dev/null 2>&1
 
-jami_repo_name="$NAME \$releasever - \$basearch - Jami"
+jami_repo_name="$DISTRIBUTION \$releasever - \$basearch - Jami"
 jami_repo_base_url="$JAMI_REPO_BASE/$ID_\$releasever"
 
 # Add an entry for the package repository to the trusted package.
diff --git a/scripts/build-package-rpm.sh b/scripts/build-package-rpm.sh
index b4a965dbdfa07bbfa299b22634a39cb9ee12d13d..69321f43dd8d07558c8482e64fbd36bec051c22b 100755
--- a/scripts/build-package-rpm.sh
+++ b/scripts/build-package-rpm.sh
@@ -113,6 +113,8 @@ if [ ! -f "${RPM_PATH}" ]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc35.x86_64.rpm "${RPM_PATH}"
         elif [[ "${DISTRIBUTION}" == "fedora_36" ]]; then
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc36.x86_64.rpm "${RPM_PATH}"
+        elif [[ "${DISTRIBUTION}" == "fedora_37" ]]; then
+            cp /root/rpmbuild/RPMS/x86_64/jami-libqt-$QT_MAJOR_MINOR_PATCH-*.fc37.x86_64.rpm "${RPM_PATH}"
         else
             cp /root/rpmbuild/RPMS/x86_64/jami-libqt-*.rpm "${RPM_PATH}"
         fi
diff --git a/scripts/deploy-packages.sh b/scripts/deploy-packages.sh
index e3a1d91e62d220d7bdeff0bd0264d41f93104e78..4d3bb51c149752a37cd2f4d6cceb06ba52b534bc 100755
--- a/scripts/deploy-packages.sh
+++ b/scripts/deploy-packages.sh
@@ -151,7 +151,7 @@ function package_rpm()
     mkdir -p ${DISTRIBUTION_REPOSITORY_FOLDER}
 
     # .repo file
-    name="Jami \$releasever - \$basearch - jami"
+    name="${DISTRIBUTION%_*} \$releasever - \$basearch - jami"
     baseurl="https://dl.jami.net/${CHANNEL}/${DISTRIBUTION%_*}_\$releasever"
 
     cat << EOF > ${DISTRIBUTION_REPOSITORY_FOLDER}/jami-${CHANNEL}.repo