diff --git a/.github/workflows/main-drivers.yml b/.github/workflows/main-drivers.yml
index 9253327607..31d1463c5a 100644
--- a/.github/workflows/main-drivers.yml
+++ b/.github/workflows/main-drivers.yml
@@ -65,3 +65,24 @@ jobs:
     - build-drivers
     - upload-drivers
     secrets: inherit
+
+  notify:
+    runs-on: ubuntu-latest
+    if: always() && contains(join(needs.*.result, ','), 'failure') && github.event_name == 'push'
+    needs:
+    - init
+    - build-drivers
+    - upload-drivers
+    - build-support-packages
+    steps:
+      - name: Slack notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_COLLECTOR_ONCALL_WEBHOOK }}
+          SLACK_CHANNEL: team-acs-collector-oncall
+          SLACK_COLOR: failure
+          SLACK_LINK_NAMES: true
+          SLACK_TITLE: Driver workflow failed
+          MSG_MINIMAL: actions url,commit
+          SLACK_MESSAGE: |
+            @acs-collector-oncall
diff --git a/kernel-modules/BLOCKLIST b/kernel-modules/BLOCKLIST
index 38c9aa6b1e..8c88748fe7 100644
--- a/kernel-modules/BLOCKLIST
+++ b/kernel-modules/BLOCKLIST
@@ -7,6 +7,7 @@
 # ROX-19721: RHEL8.9 breaks modules
 ~4.18.0-(?:50[89]|5[1-9][0-9]|[6-9][0-9]{2}).*\.el8\.x86_64 * mod
 ~3\.10\.0-1062(?:\.\d+)*\.el7.x86_64 * bpf
+~(?!3\.10\.0).+ 2.3.0 *
 *.el6.*
 # TODO(ROX-6615) - Kernel crawler deletes debian kernels
 4.19.0-10-cloud-amd64
@@ -93,3 +94,5 @@
 ~.*\.el8_9\..* * mod
 ~.*\.el9_4\..* ~2\.[3-9]\..* *
 ~.*\.el[89].* 2.3.0 mod
+# Block unsupported fedora kernels
+~.*\.fc3[4-8].* 2.9.1 *
diff --git a/kernel-modules/build/kernel-splitter.py b/kernel-modules/build/kernel-splitter.py
index 2a1d005062..d7e61c3171 100755
--- a/kernel-modules/build/kernel-splitter.py
+++ b/kernel-modules/build/kernel-splitter.py
@@ -110,7 +110,7 @@ def main(task_file):
     oracle_kernels = r"(?:.*el7uek.*)"
     fc39_kernels = r"(?:(?:6\.[1-9]\..*)|(?:6\.[1-9][0-9]\..*)|(:?[7-9]\.\d+\..*))"
     fc36_kernels = r"(?:(?:5\.[1-9]\d*\..*)|(?:6\.[0-5]\..*))"
-    rhel8_kernels = r"(?:(?:4|5)\.\d+\..*)"
+    rhel9_kernels = r"(?:(?:4|5)\.\d+\..*)"
     rhel7_kernels = r"(?:3\.\d+\..*)"
     rhel7_ebpf_kernels = r"(?:(?:3|4|5)\.\d+\..*)"
 
@@ -118,7 +118,7 @@ def main(task_file):
     fc39 = Builder("fc39", rf"^{fc39_kernels}", {})
     fc36 = Builder("fc36", rf"^{fc36_kernels}", {})
     rhel7_ebpf = EBPFBuilder("rhel7", rf"^{rhel7_ebpf_kernels}", {})
-    rhel8 = Builder("rhel8", rf"^{rhel8_kernels}", {})
+    rhel9 = Builder("rhel9", rf"^{rhel9_kernels}", {})
     rhel7 = Builder("rhel7", rf"^{rhel7_kernels}", {})
     unknown = Builder("unknown", r".*", {})
 
@@ -126,7 +126,7 @@ def main(task_file):
         oracle,
         fc39,
         fc36,
-        rhel8,
+        rhel9,
         rhel7_ebpf,
         rhel7
     ]
@@ -155,7 +155,7 @@ def main(task_file):
     driver_builders = int(os.environ.get('DRIVER_BUILDERS', 1))
 
     oracle_builders = oracle.split(driver_builders)
-    rhel8_builders = rhel8.split(driver_builders)
+    rhel9_builders = rhel9.split(driver_builders)
     rhel7_ebpf_builders = rhel7_ebpf.split(driver_builders)
     rhel7_builders = rhel7.split(driver_builders)
     fc36_builders = fc36.split(driver_builders)
@@ -165,7 +165,7 @@ def main(task_file):
         *oracle_builders,
         *fc39_builders,
         *fc36_builders,
-        *rhel8_builders,
+        *rhel9_builders,
         *rhel7_ebpf_builders,
         *rhel7_builders,
         unknown
diff --git a/kernel-modules/build/rhel8.Dockerfile b/kernel-modules/build/rhel8.Dockerfile
deleted file mode 100644
index 89c69b2614..0000000000
--- a/kernel-modules/build/rhel8.Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM quay.io/centos/centos:stream8 AS rhel-8-base
-
-ENV DISTRO=rhel8
-
-RUN dnf -y update && \
-    dnf -y install --nobest \
-        make \
-        cmake \
-        gcc-c++ \
-        llvm \
-        clang \
-        elfutils-libelf-devel \
-        kmod && \
-    # We trick Debian builds into thinking they have the required GCC binaries
-    ln -s /usr/bin/gcc /usr/bin/gcc-4.9 && \
-    ln -s /usr/bin/gcc /usr/bin/gcc-6 && \
-    ln -s /usr/bin/gcc /usr/bin/gcc-8 && \
-    ln -s /usr/bin/gcc /usr/bin/gcc-9 && \
-    ln -s /usr/bin/gcc /usr/bin/gcc-10
-
-COPY /build-kos /scripts/
-COPY /build-wrapper.sh /scripts/compile.sh
-
-ENTRYPOINT /scripts/compile.sh