diff --git a/Makefile b/Makefile
index af12bf594..a6a5db9f6 100644
--- a/Makefile
+++ b/Makefile
@@ -234,7 +234,7 @@ amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensu
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
 amd64-centos: centos6 centos6-dbg centos7 centos7-dbg centos8 centos8-clang centos8-dbg
 amd64-debian: debian8 debian8-dbg debian9 debian9-dbg debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
-amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg fedora38 fedora38-clang fedora38-dbg
+amd64-fedora: fedora27 fedora27-dbg fedora28 fedora28-dbg fedora33 fedora33-dbg fedora34 fedora34-clang fedora34-dbg fedora36 fedora36-clang fedora36-dbg fedora37 fedora37-clang fedora37-dbg fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
 amd64-ubuntu: ubuntu14 ubuntu14-dbg ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
 
@@ -242,7 +242,7 @@ arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensu
 arm64-almalinux: almalinux8 almalinux9
 arm64-centos: centos7 centos8
 arm64-debian: debian9 debian10 debian11 debian12
-arm64-fedora: fedora33 fedora34 fedora36 fedora37 fedora38
+arm64-fedora: fedora33 fedora34 fedora36 fedora37 fedora38 fedora39
 arm64-opensuse: opensuse15
 arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22
 
diff --git a/docker-compose.yml b/docker-compose.yml
index e52dee22a..b4313d1db 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -266,6 +266,35 @@ services:
       - PKG_RELEASE=dbg-fedora38
       - PROXYSQL_BUILD_TYPE=debug
 
+####################################################################################################
+  fedora39_build:
+    extends:
+      service: _build
+    image: proxysql/packaging:build-fedora39
+    volumes:
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/rpmbuild/:/root/rpmbuild/
+      - ./docker/images/proxysql/rhel-compliant/rpmmacros/.rpmmacros:/root/.rpmmacros
+      - ./docker/images/proxysql/rhel-compliant/entrypoint/:/opt/entrypoint/
+      - ./:/opt/proxysql/
+    environment:
+      - PKG_RELEASE=fedora39
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora39_clang_build:
+    extends:
+      service: fedora39_build
+    image: proxysql/packaging:build-clang-fedora39
+    environment:
+      - PKG_RELEASE=fedora39-clang
+      - PROXYSQL_BUILD_TYPE=clickhouse
+
+  fedora39_dbg_build:
+    extends:
+      service: fedora39_build
+    environment:
+      - PKG_RELEASE=dbg-fedora39
+      - PROXYSQL_BUILD_TYPE=debug
+
 ####################################################################################################
 ####################################################################################################
   debian8_build: