diff --git a/Makefile b/Makefile
index df6c96661..bd0e49dc5 100644
--- a/Makefile
+++ b/Makefile
@@ -303,19 +303,19 @@ ubuntu: $(REL_ARCH)-ubuntu ;
 
 amd64-packages: amd64-centos amd64-ubuntu amd64-debian amd64-fedora amd64-opensuse amd64-almalinux
 amd64-almalinux: almalinux8 almalinux8-clang almalinux8-dbg almalinux9 almalinux9-clang almalinux9-dbg
-amd64-centos: centos7 centos7-dbg centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
+amd64-centos: centos8 centos8-clang centos8-dbg centos9 centos9-clang centos9-dbg
 amd64-debian: debian10 debian10-dbg debian11 debian11-clang debian11-dbg debian12 debian12-clang debian12-dbg
 amd64-fedora: fedora38 fedora38-clang fedora38-dbg fedora39 fedora39-clang fedora39-dbg
 amd64-opensuse: opensuse15 opensuse15-clang opensuse15-dbg
-amd64-ubuntu: ubuntu16 ubuntu16-dbg ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
+amd64-ubuntu: ubuntu18 ubuntu18-dbg ubuntu20 ubuntu20-clang ubuntu20-dbg ubuntu22 ubuntu22-clang ubuntu22-dbg
 
 arm64-packages: arm64-centos arm64-debian arm64-ubuntu arm64-fedora arm64-opensuse arm64-almalinux
 arm64-almalinux: almalinux8 almalinux9
-arm64-centos: centos7 centos8 centos9
+arm64-centos: centos8 centos9
 arm64-debian: debian10 debian11 debian12
 arm64-fedora: fedora38 fedora39
 arm64-opensuse: opensuse15
-arm64-ubuntu: ubuntu16 ubuntu18 ubuntu20 ubuntu22
+arm64-ubuntu: ubuntu18 ubuntu20 ubuntu22
 
 almalinux%: build-almalinux% ;
 centos%: build-centos% ;
diff --git a/docker-compose.yml b/docker-compose.yml
index dc1935562..0d2ffd707 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,26 +16,6 @@ services:
     command: bash -l -c /opt/entrypoint/entrypoint.bash
 
 ####################################################################################################
-####################################################################################################
-  centos7_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-centos7
-    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=centos7
-
-  centos7_dbg_build:
-    extends:
-      service: centos7_build
-    environment:
-      - PKG_RELEASE=dbg-centos7
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   centos8_build:
     extends:
@@ -226,25 +206,6 @@ services:
       - PROXYSQL_BUILD_TYPE=debug
 
 ####################################################################################################
-####################################################################################################
-  ubuntu16_build:
-    extends:
-      service: _build
-    image: proxysql/packaging:build-ubuntu16
-    volumes:
-      - ./docker/images/proxysql/deb-compliant/pre-systemd/ctl/:/root/ctl/
-      - ./docker/images/proxysql/deb-compliant/entrypoint/:/opt/entrypoint/
-      - ./:/opt/proxysql/
-    environment:
-      - PKG_RELEASE=ubuntu16
-
-  ubuntu16_dbg_build:
-    extends:
-      service: ubuntu16_build
-    environment:
-      - PKG_RELEASE=dbg-ubuntu16
-      - PROXYSQL_BUILD_TYPE=debug
-
 ####################################################################################################
   ubuntu18_build:
     extends: