diff --git a/.github/data/matrices.yaml b/.github/data/matrices.yaml
index ecd1685..da341cc 100644
--- a/.github/data/matrices.yaml
+++ b/.github/data/matrices.yaml
@@ -82,6 +82,8 @@ package-builders:
       platforms:
         - linux/amd64
         - linux/arm64/v8
+    - <<: *opensuse
+      os: opensuse15.6
     - <<: *opensuse
       os: opensuse15.5
     - &oracle
diff --git a/package-builders/Dockerfile.opensuse15.6.v1 b/package-builders/Dockerfile.opensuse15.6.v1
new file mode 100644
index 0000000..221da54
--- /dev/null
+++ b/package-builders/Dockerfile.opensuse15.6.v1
@@ -0,0 +1,78 @@
+FROM opensuse/leap:15.6
+
+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 openSUSE Leap 15.6"
+LABEL org.opencontainers.image.description="Package builder image for Netdata official RPM packages for openSUSE Leap 15.6"
+LABEL org.opencontainers.image.vendor="Netdata Inc."
+
+ENV VERSION=0.1
+# Dummy Sentry DSN
+ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
+
+RUN zypper update -y && \
+    zypper install -y --allow-downgrade \
+                      autoconf \
+                      autoconf-archive \
+                      autogen \
+                      automake \
+                      bison \
+                      cmake \
+                      cups \
+                      cups-devel \
+                      curl \
+                      diffutils \
+                      flex \
+                      freeipmi-devel \
+                      gcc \
+                      gcc-c++ \
+                      git-core \
+                      json-glib-devel \
+                      judy-devel \
+                      libatomic1 \
+                      libcurl-devel \
+                      libelf-devel \
+                      liblz4-devel \
+                      libjson-c-devel \
+                      libyaml-devel \
+                      libmnl0 \
+                      libmnl-devel \
+                      libnetfilter_acct1 \
+                      libnetfilter_acct-devel \
+                      libpcre2-8-0 \
+                      libopenssl-devel \
+                      libprotobuf-c-devel \
+                      libtool \
+                      libuv-devel \
+                      libuuid-devel \
+                      libzstd-devel \
+                      make \
+                      ninja \
+                      patch \
+                      pkg-config \
+                      protobuf-devel \
+                      rpm-build \
+                      rpm-devel \
+                      rpmdevtools \
+                      snappy-devel \
+                      systemd-devel \
+                      tar \
+                      wget \
+                      xen-devel && \
+    zypper clean && \
+    rm -rf /var/cache/zypp/*/* && \
+    c_rehash && \
+    mkdir -p /usr/src/packages/BUILD /usr/src/packages/RPMS /usr/src/packages/SOURCES /usr/src/packages/SPECS /usr/src/packages/SRPMS
+
+COPY package-builders/entrypoint.sh /entrypoint.sh
+COPY package-builders/suse-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.opensuse15.6.v2 b/package-builders/Dockerfile.opensuse15.6.v2
new file mode 100644
index 0000000..ee09ac5
--- /dev/null
+++ b/package-builders/Dockerfile.opensuse15.6.v2
@@ -0,0 +1,72 @@
+FROM opensuse/leap:15.6
+
+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 openSUSE Leap 15.6"
+LABEL org.opencontainers.image.description="Package builder image for Netdata official RPM packages for openSUSE Leap 15.6"
+LABEL org.opencontainers.image.vendor="Netdata Inc."
+
+ENV VERSION=0.1
+# Dummy Sentry DSN
+ENV SENTRY_DSN="https://1ea0662a@o01e.ingest.sentry.io/dummy"
+
+RUN zypper update -y && \
+    zypper install -y --allow-downgrade \
+                      bison \
+                      cmake \
+                      cups \
+                      cups-devel \
+                      curl \
+                      diffutils \
+                      flex \
+                      freeipmi-devel \
+                      gcc \
+                      gcc-c++ \
+                      git-core \
+                      gzip \
+                      json-glib-devel \
+                      judy-devel \
+                      libatomic1 \
+                      libcurl-devel \
+                      libelf-devel \
+                      liblz4-devel \
+                      libjson-c-devel \
+                      libyaml-devel \
+                      libmnl0 \
+                      libmnl-devel \
+                      libnetfilter_acct1 \
+                      libnetfilter_acct-devel \
+                      libpcre2-8-0 \
+                      libopenssl-devel \
+                      libprotobuf-c-devel \
+                      libuv-devel \
+                      libuuid-devel \
+                      libzstd-devel \
+                      make \
+                      ninja \
+                      patch \
+                      pkg-config \
+                      protobuf-devel \
+                      rpmdevtools \
+                      snappy-devel \
+                      systemd-devel \
+                      systemd-rpm-macros \
+                      tar \
+                      wget \
+                      xen-devel && \
+    zypper clean && \
+    rm -rf /var/cache/zypp/*/* && \
+    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"]