diff --git a/.github/data/matrices.yaml b/.github/data/matrices.yaml
index 9597f8a..ecd1685 100644
--- a/.github/data/matrices.yaml
+++ b/.github/data/matrices.yaml
@@ -52,8 +52,6 @@ package-builders:
       platforms:
         - linux/amd64
         - linux/arm64/v8
-    - <<: *centos-stream
-      os: centos-stream8
     - os: centos7
       revisions: *pkg-builder-revs
       platforms:
@@ -78,10 +76,6 @@ package-builders:
         - linux/arm64/v8
     - <<: *fedora
       os: fedora39
-    - <<: *fedora
-      os: fedora38
-      revisions:
-        - v1
     - &opensuse
       os: opensusetumbleweed
       revisions: *pkg-builder-revs
@@ -90,10 +84,6 @@ package-builders:
         - linux/arm64/v8
     - <<: *opensuse
       os: opensuse15.5
-    - <<: *opensuse
-      os: opensuse15.4
-      revisions:
-        - v1
     - &oracle
       os: oraclelinux9
       revisions: *pkg-builder-revs
@@ -117,8 +107,6 @@ package-builders:
         - linux/amd64
         - linux/arm/v7
         - linux/arm64/v8
-    - <<: *ubuntu
-      os: ubuntu23.10
     - <<: *ubuntu
       os: ubuntu22.04
     - <<: *ubuntu
diff --git a/package-builders/Dockerfile.centos-stream8.v1 b/package-builders/Dockerfile.centos-stream8.v1
deleted file mode 100644
index a4da682..0000000
--- a/package-builders/Dockerfile.centos-stream8.v1
+++ /dev/null
@@ -1,83 +0,0 @@
-FROM quay.io/centos/centos:stream8
-
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
-LABEL org.opencontainers.image.source="https://github.com/netdata/helper-images"
-LABEL org.opencontainers.image.title="Netdata Package Builder for CentOS-Stream 8"
-LABEL org.opencontainers.image.description="Package builder image for Netdata official RPM packages for CentOS-Stream 8"
-LABEL org.opencontainers.image.vendor="Netdata Inc."
-
-ENV VERSION=$VERSION
-# Dummy Sentry DSN
-ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
-
-RUN dnf distro-sync -y --nodocs && \
-    dnf install -y --nodocs 'dnf-command(config-manager)' epel-release && \
-    dnf config-manager --set-enabled powertools && \
-    dnf clean packages && \
-    dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
-        autoconf \
-        autoconf-archive \
-        autogen \
-        automake \
-        bash \
-        bison \
-        cmake \
-        cups-devel \
-        curl \
-        libcurl-devel \
-        diffutils \
-        elfutils-libelf-devel \
-        findutils \
-        flex \
-        freeipmi-devel \
-        gcc \
-        gcc-c++ \
-        git \
-        json-c-devel \
-        libatomic \
-        libmnl-devel \
-        libtool \
-        libuuid-devel \
-        libuv-devel \
-        libyaml-devel \
-        libzstd-devel \
-        lm_sensors \
-        lz4-devel \
-        make \
-        ninja-build \
-        nc \
-        openssl-devel \
-        openssl-perl \
-        patch \
-        pcre2-devel \
-        pkgconfig \
-        'pkgconfig(libmongoc-1.0)' \
-        procps \
-        protobuf-c-devel \
-        protobuf-compiler \
-        protobuf-devel \
-        python3 \
-        python3-pyyaml \
-        rpm-build \
-        rpm-devel \
-        rpmdevtools \
-        snappy-devel \
-        systemd-devel \
-        wget \
-        zlib-devel && \
-    rm -rf /var/cache/dnf && \
-    c_rehash && \
-    mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS
-
-COPY package-builders/entrypoint.sh /entrypoint.sh
-COPY package-builders/fedora-build.sh /build.sh
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-ADD https://raw.githubusercontent.com/netdata/netdata/master/packaging/check-for-go-toolchain.sh /tmp/check-for-go-toolchain.sh
-RUN . /tmp/check-for-go-toolchain.sh && \
-    if ! ensure_go_toolchain; then \
-        echo "ERROR: ${GOLANG_FAILURE_REASON}" && exit 1 ; \
-    fi
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/build.sh"]
diff --git a/package-builders/Dockerfile.centos-stream8.v2 b/package-builders/Dockerfile.centos-stream8.v2
deleted file mode 100644
index 33d63c8..0000000
--- a/package-builders/Dockerfile.centos-stream8.v2
+++ /dev/null
@@ -1,75 +0,0 @@
-FROM quay.io/centos/centos:stream8
-
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
-LABEL org.opencontainers.image.source="https://github.com/netdata/helper-images"
-LABEL org.opencontainers.image.title="Netdata Package Builder for CentOS-Stream 8"
-LABEL org.opencontainers.image.description="Package builder image for Netdata official RPM packages for CentOS-Stream 8"
-LABEL org.opencontainers.image.vendor="Netdata Inc."
-
-ENV VERSION=$VERSION
-# Dummy Sentry DSN
-ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
-
-RUN dnf distro-sync -y --nodocs && \
-    dnf install -y --nodocs 'dnf-command(config-manager)' epel-release && \
-    dnf config-manager --set-enabled powertools && \
-    dnf clean packages && \
-    dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
-        bash \
-        bison \
-        cmake \
-        cups-devel \
-        curl \
-        libcurl-devel \
-        diffutils \
-        elfutils-libelf-devel \
-        findutils \
-        flex \
-        freeipmi-devel \
-        gcc \
-        gcc-c++ \
-        git \
-        json-c-devel \
-        libatomic \
-        libmnl-devel \
-        libuuid-devel \
-        libuv-devel \
-        libyaml-devel \
-        libzstd-devel \
-        lm_sensors \
-        lz4-devel \
-        make \
-        ninja-build \
-        openssl-devel \
-        openssl-perl \
-        patch \
-        pcre2-devel \
-        pkgconfig \
-        'pkgconfig(libmongoc-1.0)' \
-        procps \
-        protobuf-c-devel \
-        protobuf-compiler \
-        protobuf-devel \
-        python3 \
-        python3-pyyaml \
-        rpmdevtools \
-        snappy-devel \
-        systemd-devel \
-        systemd-rpm-macros \
-        wget \
-        zlib-devel && \
-    rm -rf /var/cache/dnf && \
-    c_rehash
-
-COPY package-builders/entrypoint.sh /entrypoint.sh
-COPY package-builders/cpack-rpm.sh /build.sh
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-ADD https://raw.githubusercontent.com/netdata/netdata/master/packaging/check-for-go-toolchain.sh /tmp/check-for-go-toolchain.sh
-RUN . /tmp/check-for-go-toolchain.sh && \
-    if ! ensure_go_toolchain; then \
-        echo "ERROR: ${GOLANG_FAILURE_REASON}" && exit 1 ; \
-    fi
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/build.sh"]
diff --git a/package-builders/Dockerfile.fedora38.v1 b/package-builders/Dockerfile.fedora38.v1
deleted file mode 100644
index 33c88ab..0000000
--- a/package-builders/Dockerfile.fedora38.v1
+++ /dev/null
@@ -1,80 +0,0 @@
-FROM fedora:38
-
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
-LABEL org.opencontainers.image.source="https://github.com/netdata/helper-images"
-LABEL org.opencontainers.image.title="Netdata Package Builder for Fedora 38"
-LABEL org.opencontainers.image.description="Package builder image for Netdata official RPM packages for Fedora 38"
-LABEL org.opencontainers.image.vendor="Netdata Inc."
-
-ENV VERSION=$VERSION
-# Dummy Sentry DSN
-ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
-
-RUN dnf distro-sync -y --nodocs && \
-    dnf clean -y packages && \
-    dnf install -y --nodocs --setopt=install_weak_deps=False --setopt=diskspacecheck=False \
-        autoconf \
-        autoconf-archive \
-        autogen \
-        automake \
-        bash \
-        bison \
-        cmake \
-        cups-devel \
-        curl \
-        diffutils \
-        elfutils-libelf-devel \
-        findutils \
-        flex \
-        freeipmi-devel \
-        gcc \
-        gcc-c++ \
-        git-core \
-        json-c-devel \
-        libyaml-devel \
-        Judy-devel \
-        libatomic \
-        libcurl-devel \
-        libmnl-devel \
-        libnetfilter_acct-devel \
-        libtool \
-        libuuid-devel \
-        libuv-devel \
-        libzstd-devel \
-        lz4-devel \
-        make \
-        ninja-build \
-        openssl-devel \
-        openssl-perl \
-        patch \
-        pcre2-devel \
-        pkgconfig \
-        'pkgconfig(libmongoc-1.0)' \
-        procps \
-        protobuf-c-devel \
-        protobuf-compiler \
-        protobuf-devel \
-        rpm-build \
-        rpm-devel \
-        rpmdevtools \
-        snappy-devel \
-        systemd-devel \
-        wget \
-        xen-devel \
-        zlib-devel && \
-    rm -rf /var/cache/dnf && \
-    c_rehash && \
-    mkdir -p /root/rpmbuild/BUILD /root/rpmbuild/RPMS /root/rpmbuild/SOURCES /root/rpmbuild/SPECS /root/rpmbuild/SRPMS
-
-COPY package-builders/entrypoint.sh /entrypoint.sh
-COPY package-builders/fedora-build.sh /build.sh
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-ADD https://raw.githubusercontent.com/netdata/netdata/master/packaging/check-for-go-toolchain.sh /tmp/check-for-go-toolchain.sh
-RUN . /tmp/check-for-go-toolchain.sh && \
-    if ! ensure_go_toolchain; then \
-        echo "ERROR: ${GOLANG_FAILURE_REASON}" && exit 1 ; \
-    fi
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/build.sh"]
diff --git a/package-builders/Dockerfile.ubuntu23.10.v1 b/package-builders/Dockerfile.ubuntu23.10.v1
deleted file mode 100644
index 430fbca..0000000
--- a/package-builders/Dockerfile.ubuntu23.10.v1
+++ /dev/null
@@ -1,89 +0,0 @@
-FROM ubuntu:23.10
-
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
-LABEL org.opencontainers.image.source="https://github.com/netdata/helper-images"
-LABEL org.opencontainers.image.title="Netdata Package Builder for Ubuntu 23.10"
-LABEL org.opencontainers.image.description="Package builder image for Netdata official DEB packages for Ubuntu 23.10"
-LABEL org.opencontainers.image.vendor="Netdata Inc."
-
-ENV EMAIL=bot@netdata.cloud
-ENV FULLNAME="Netdata Builder"
-ENV VERSION=0.1
-
-# This is needed to keep package installs from prompting about configuration.
-ENV DEBIAN_FRONTEND=noninteractive
-# Dummy Sentry DSN
-ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends autoconf \
-                       autoconf-archive \
-                       autogen \
-                       automake \
-                       bison \
-                       build-essential \
-                       ca-certificates \
-                       cmake \
-                       curl \
-                       debhelper \
-                       dh-autoreconf \
-                       dh-make \
-                       dpkg-dev \
-                       flex \
-                       g++ \
-                       gcc \
-                       git-buildpackage \
-                       git-core \
-                       libatomic1 \
-                       libcups2-dev \
-                       libcurl4-openssl-dev \
-                       libdistro-info-perl \
-                       libelf-dev \
-                       libipmimonitoring-dev \
-                       libjson-c-dev \
-                       libyaml-dev \
-                       libjudy-dev \
-                       liblz4-dev \
-                       libmnl-dev \
-                       libmongoc-dev \
-                       libnetfilter-acct-dev \
-                       libpcre2-dev \
-                       libprotobuf-dev \
-                       libprotoc-dev \
-                       libsnappy-dev \
-                       libsystemd-dev \
-                       libssl-dev \
-                       libtool \
-                       libuv1-dev \
-                       libxen-dev \
-                       libzstd-dev \
-                       make \
-                       ninja-build \
-                       patch \
-                       pkg-config \
-                       protobuf-compiler \
-                       systemd \
-                       uuid-dev \
-                       wget \
-                       zlib1g-dev && \
-    apt-get clean && \
-    c_rehash && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN curl --fail -sSL --connect-timeout 10 --retry 3 https://sentry.io/get-cli/ > /tmp/get-sentry.sh && \
-    sh /tmp/get-sentry.sh && \
-    rm -f /tmp/get-sentry.sh
-
-COPY package-builders/entrypoint.sh /entrypoint.sh
-COPY package-builders/debian-build.sh /build.sh
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-ADD https://raw.githubusercontent.com/netdata/netdata/master/packaging/check-for-go-toolchain.sh /tmp/check-for-go-toolchain.sh
-RUN . /tmp/check-for-go-toolchain.sh && \
-    if ! ensure_go_toolchain; then \
-        echo "ERROR: ${GOLANG_FAILURE_REASON}" && exit 1 ; \
-    fi
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/build.sh"]
diff --git a/package-builders/Dockerfile.ubuntu23.10.v2 b/package-builders/Dockerfile.ubuntu23.10.v2
deleted file mode 100644
index 5b3ea16..0000000
--- a/package-builders/Dockerfile.ubuntu23.10.v2
+++ /dev/null
@@ -1,81 +0,0 @@
-FROM ubuntu:23.10
-
-LABEL org.opencontainers.image.authors="Netdatabot <bot@netdata.cloud>"
-LABEL org.opencontainers.image.source="https://github.com/netdata/helper-images"
-LABEL org.opencontainers.image.title="Netdata Package Builder for Ubuntu 23.10"
-LABEL org.opencontainers.image.description="Package builder image for Netdata official DEB packages for Ubuntu 23.10"
-LABEL org.opencontainers.image.vendor="Netdata Inc."
-
-ENV EMAIL=bot@netdata.cloud
-ENV FULLNAME="Netdata Builder"
-ENV VERSION=0.1
-
-# This is needed to keep package installs from prompting about configuration.
-ENV DEBIAN_FRONTEND=noninteractive
-# Dummy Sentry DSN
-ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends \
-                       bison \
-                       build-essential \
-                       ca-certificates \
-                       cmake \
-                       curl \
-                       file \
-                       flex \
-                       g++ \
-                       gcc \
-                       git-core \
-                       libatomic1 \
-                       libcups2-dev \
-                       libcurl4-openssl-dev \
-                       libdistro-info-perl \
-                       libelf-dev \
-                       libipmimonitoring-dev \
-                       libjson-c-dev \
-                       libyaml-dev \
-                       libjudy-dev \
-                       liblz4-dev \
-                       libmnl-dev \
-                       libmongoc-dev \
-                       libnetfilter-acct-dev \
-                       libpcre2-dev \
-                       libprotobuf-dev \
-                       libprotoc-dev \
-                       libsnappy-dev \
-                       libsystemd-dev \
-                       libssl-dev \
-                       libuv1-dev \
-                       libxen-dev \
-                       libzstd-dev \
-                       make \
-                       ninja-build \
-                       patch \
-                       pkg-config \
-                       protobuf-compiler \
-                       systemd \
-                       uuid-dev \
-                       wget \
-                       zlib1g-dev && \
-    apt-get clean && \
-    c_rehash && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN curl --fail -sSL --connect-timeout 10 --retry 3 https://sentry.io/get-cli/ > /tmp/get-sentry.sh && \
-    sh /tmp/get-sentry.sh && \
-    rm -f /tmp/get-sentry.sh
-
-COPY package-builders/entrypoint.sh /entrypoint.sh
-COPY package-builders/cpack-deb.sh /build.sh
-
-ENV PATH="/usr/local/go/bin:${PATH}"
-ADD https://raw.githubusercontent.com/netdata/netdata/master/packaging/check-for-go-toolchain.sh /tmp/check-for-go-toolchain.sh
-RUN . /tmp/check-for-go-toolchain.sh && \
-    if ! ensure_go_toolchain; then \
-        echo "ERROR: ${GOLANG_FAILURE_REASON}" && exit 1 ; \
-    fi
-
-ENTRYPOINT ["/entrypoint.sh"]
-CMD ["/build.sh"]