diff --git a/.github/workflows/nightly-test.yaml b/.github/workflows/nightly-test.yaml
index e8dab660c..321a37482 100644
--- a/.github/workflows/nightly-test.yaml
+++ b/.github/workflows/nightly-test.yaml
@@ -3,6 +3,7 @@ name: Nightly Latest/Edge Tests
 on:
   schedule:
     - cron: "0 0 * * *" # Runs every midnight
+  pull_request: # todo remove before merge
 
 permissions:
   contents: read
@@ -10,11 +11,14 @@ permissions:
 jobs:
   test-integration:
     name: Integration Test ${{ matrix.os }} ${{ matrix.arch }} ${{ matrix.release }}
+    env:
+      # todo(mac) e2e works with Cilium to 1.17 remove if after upgrade
+      TEST_CNCF_E2E: ${{ matrix.release == 'latest/edge/moonray' }}
     strategy:
       matrix:
         os: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"]
         arch: ["amd64", "arm64"]
-        release: ["latest/edge"]
+        release: ["latest/edge/moonray", "latest/edge/classic"]
       fail-fast: false # TODO: remove once arm64 works
 
     runs-on: ${{ matrix.arch == 'arm64' && 'Ubuntu_ARM64_4C_16G_01' || 'ubuntu-20.04' }}
@@ -41,6 +45,7 @@ jobs:
           TEST_SNAP: ${{ github.workspace }}/build/k8s.snap
           TEST_SUBSTRATE: lxd
           TEST_LXD_IMAGE: ${{ matrix.os }}
+          TEST_SNAP_RELEASE: ${{ matrix.release }}
           TEST_INSPECTION_REPORTS_DIR: ${{ github.workspace }}/inspection-reports
           # Test the latest (up to) 6 releases for the flavour
           # TODO(ben): upgrade nightly to run all flavours
@@ -51,6 +56,11 @@ jobs:
         run: |
           export PATH="/home/runner/.local/bin:$PATH"
           cd tests/integration && sg lxd -c 'tox -vve integration'
+      - name: Create env variables for artifacts
+        if: failure()
+        run: |
+          echo "os_dash=${{ matrix.os }}" | sed 's/:/-/g' >> $GITHUB_ENV
+          echo "release_dash=${{  matrix.release }}" | sed 's#/#-#g'>> $GITHUB_ENV
       - name: Prepare inspection reports
         if: failure()
         run: |
@@ -61,8 +71,19 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}
-          path: ${{ github.workspace }}/inspection-reports.tar.gz
+          path: ${{ github.workspace }}/inspection-reports_${{ env.os_dash }}_${{ env.release_dash }}_${{ matrix.arch }}.tar.gz
       - name: Tmate debugging session
         if: ${{ failure() && github.event_name == 'pull_request' }}
         uses: mxschmitt/action-tmate@v3
         timeout-minutes: 10
+      - name: Extract CNCF conformance report
+        if: ${{ failure() && ( env.TEST_CNCF_E2E == 'true' ) }}
+        working-directory: tests/integration
+        run: |
+         tar -xf sonobuoy_e2e.tar.gz --one-top-level
+      - name: Upload CNCF conformance report artifact
+        uses: actions/upload-artifact@v4
+        if: ${{ failure() && ( env.TEST_CNCF_E2E == 'true' ) }}
+        with:
+         name: report_sonobuoy_e2e_${{ env.os_dash }}_${{ env.release_dash }}_${{ matrix.arch }}
+         path: tests/integration/sonobuoy_e2e
diff --git a/tests/integration/tests/test_clustering.py b/tests/integration/tests/test_clustering.py
index 8235e56cf..2dabeb215 100644
--- a/tests/integration/tests/test_clustering.py
+++ b/tests/integration/tests/test_clustering.py
@@ -39,6 +39,10 @@ def test_control_plane_nodes(instances: List[harness.Instance]):
     ), f"only {cluster_node.id} should be left in cluster"
 
 
+@pytest.mark.skipif(
+    os.getenv("TEST_SNAP_RELEASE") in ["latest/edge/classic", "latest/edge/strict"],
+    reason="Test is breaks on classic and strict",
+)
 @pytest.mark.node_count(2)
 @pytest.mark.snap_versions([util.previous_track(config.SNAP), config.SNAP])
 def test_mixed_version_join(instances: List[harness.Instance]):
diff --git a/tests/integration/tests/test_cncf_conformace.py b/tests/integration/tests/test_cncf_conformace.py
new file mode 100644
index 000000000..5232ba20d
--- /dev/null
+++ b/tests/integration/tests/test_cncf_conformace.py
@@ -0,0 +1,74 @@
+#
+# Copyright 2024 Canonical, Ltd.
+#
+import logging
+import os
+import re
+from typing import List
+
+import pytest
+from test_util import config, harness, util
+
+LOG = logging.getLogger(__name__)
+
+
+@pytest.mark.skipif(
+    os.getenv("TEST_CNCF_E2E") in ["false", None],
+    reason="Test is long and should be run nightly",
+)
+@pytest.mark.node_count(2)
+def test_cncf_conformance(instances: List[harness.Instance]):
+    cluster_node = cluster_setup(instances)
+    install_sonobuoy(cluster_node)
+
+    cluster_node.exec(
+        ["./sonobuoy"],
+    )
+    cluster_node.exec(
+        ["./sonobuoy", "run", "--plugin", "e2e", "--wait"],
+    )
+    cluster_node.exec(
+        ["./sonobuoy", "retrieve", "-f", "sonobuoy_e2e.tar.gz"],
+    )
+    cluster_node.exec(
+        ["tar", "-xf", "sonobuoy_e2e.tar.gz", "--one-top-level"],
+    )
+    resp = cluster_node.exec(
+        ["./sonobuoy", "results", "sonobuoy_e2e.tar.gz"],
+        capture_output=True,
+    )
+
+    cluster_node.pull_file("/root/sonobuoy_e2e.tar.gz", "sonobuoy_e2e.tar.gz")
+
+    output = resp.stdout.decode()
+    LOG.info(output)
+    failed_tests = int(re.search("Failed: (\\d+)", output).group(1))
+    assert failed_tests == 0, f"{failed_tests} tests failed"
+
+
+def cluster_setup(instances: List[harness.Instance]) -> harness.Instance:
+    cluster_node = instances[0]
+    joining_node = instances[1]
+
+    join_token = util.get_join_token(cluster_node, joining_node)
+    util.join_cluster(joining_node, join_token)
+
+    util.wait_until_k8s_ready(cluster_node, instances)
+
+    nodes = util.ready_nodes(cluster_node)
+    assert len(nodes) == 2, "node should have joined cluster"
+    assert "control-plane" in util.get_local_node_status(cluster_node)
+    assert "control-plane" in util.get_local_node_status(joining_node)
+
+    config = cluster_node.exec(["k8s", "config"], capture_output=True)
+    cluster_node.exec(["dd", "of=/root/.kube/config"], input=config.stdout)
+
+    return cluster_node
+
+
+def install_sonobuoy(instance: harness.Instance):
+    instance.exec(
+        ["curl", "-L", config.sonobuoy_tar_gz(instance.arch), "-o", "sonobuoy.tar.gz"]
+    )
+    instance.exec(["tar", "xvzf", "sonobuoy.tar.gz"])
+    instance.exec(["./sonobuoy", "version"])
diff --git a/tests/integration/tests/test_util/config.py b/tests/integration/tests/test_util/config.py
index f85021573..e3dd73ff0 100644
--- a/tests/integration/tests/test_util/config.py
+++ b/tests/integration/tests/test_util/config.py
@@ -129,3 +129,12 @@
 STRICT_INTERFACE_CHANNELS = (
     os.environ.get("TEST_STRICT_INTERFACE_CHANNELS", "").strip().split()
 )
+
+# SONOBUOY_VERSION is version of sonobuoy to use
+SONOBUOY_VERSION = os.getenv("TEST_SONOBUOY_VERSION") or "v0.57.2"
+
+
+# sonobuoy_tar_gz is a full path of sonobuoy to download
+def sonobuoy_tar_gz(architecture: str) -> str:
+    os.getenv("TEST_SONOBUOY_VERSION") or "v0.57.2"
+    return f"https://github.com/vmware-tanzu/sonobuoy/releases/download/{SONOBUOY_VERSION}/sonobuoy_{SONOBUOY_VERSION[1: ]}_linux_{architecture}.tar.gz"  # noqa