diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
index b82055f4..8f2e1ddf 100644
--- a/.github/actions/spelling/expect.txt
+++ b/.github/actions/spelling/expect.txt
@@ -380,4 +380,5 @@ xsi
 xxxx
 xxxxxxxx
 xxxxxxxxxxx
-zipsas
\ No newline at end of file
+zipsas
+zypper
\ No newline at end of file
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 22dfbf71..bc414e62 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -78,7 +78,7 @@ jobs:
                 rpm \
                 musl-tools \
 
-        sudo snap install dotnet-sdk --classic
+        sudo apt-get install -y dotnet-sdk-8.0
         sudo chown -R root:root /var/lib
 
     # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml
index f5fe69b1..b02fa3af 100644
--- a/.github/workflows/reusable-build.yml
+++ b/.github/workflows/reusable-build.yml
@@ -297,7 +297,7 @@ jobs:
                   libssl-dev \
                   pkg-config \
 
-          sudo snap install dotnet-sdk --classic
+          sudo apt-get install -y dotnet-sdk-8.0
           sudo chown -R root:root /var/lib
         
       - name: Run build-linux.sh Debug amd64
diff --git a/e2etest/GuestProxyAgentTest/LinuxScripts/GuestProxyAgentExtensionValidation.sh b/e2etest/GuestProxyAgentTest/LinuxScripts/GuestProxyAgentExtensionValidation.sh
index a8399819..9595255b 100644
--- a/e2etest/GuestProxyAgentTest/LinuxScripts/GuestProxyAgentExtensionValidation.sh
+++ b/e2etest/GuestProxyAgentTest/LinuxScripts/GuestProxyAgentExtensionValidation.sh
@@ -55,6 +55,28 @@ if [[ $os == *"Ubuntu"* ]]; then
             break
         fi
     done
+elif [[ $os == *"SUSE"* ]] || [[ $os == *"SLES"* ]]; then
+    for  i in {1..3}; do
+        echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ") - start installing jq via zypper $i"
+        sudo zypper refresh
+        sudo zypper --non-interactive install jq
+        if ! command -v jq &>/dev/null; then
+            echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ") - zypper install failed, downloading jq binary directly"
+            arch=$(uname -m)
+            if [[ "$arch" == "aarch64" ]]; then
+                jq_arch="arm64"
+            else
+                jq_arch="amd64"
+            fi
+            sudo curl -L -o /usr/local/bin/jq "https://github.com/jqlang/jq/releases/latest/download/jq-linux-${jq_arch}"
+            sudo chmod +x /usr/local/bin/jq
+        fi
+        sleep 10
+        if command -v jq &>/dev/null; then
+            echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ") - jq installed successfully"
+            break
+        fi
+    done
 else
     for  i in {1..3}; do
         echo "$(date -u +"%Y-%m-%dT%H:%M:%SZ") - start installing jq via dnf $i"
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Mariner2-Fips-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Mariner2-Fips-TestGroup.yml
deleted file mode 100644
index 064da755..00000000
--- a/e2etest/GuestProxyAgentTest/TestMap/Mariner2-Fips-TestGroup.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-groupName: Mariner2-Fips
-vmImagePublisher: microsoftcblmariner
-vmImageOffer: cbl-mariner
-vmImageSku: cbl-mariner-2-gen2-fips
-vmImageVersion: latest
-scenarios:
-  - className: GuestProxyAgentTest.TestScenarios.BVTScenario
-    name: BVTScenario
-  - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
-  - name: ProxyAgentExtension 
-    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Redhat90-Arm64-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Redhat90-Arm64-TestGroup.yml
index 1b4e76f5..1a7fec07 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Redhat90-Arm64-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Redhat90-Arm64-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Redhat90-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Redhat90-TestGroup.yml
index c77b78c3..c84f4ad3 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Redhat90-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Redhat90-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Rocky9-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Rocky9-TestGroup.yml
index 840b577b..2fb00c0c 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Rocky9-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Rocky9-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-Arm64-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-Arm64-TestGroup.yml
index e9a4f447..45dc69d9 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-Arm64-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-Arm64-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-TestGroup.yml
index 2f01767c..69510045 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Suse15SP4-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu20-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu20-TestGroup.yml
index fa781b31..3d20febf 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu20-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu20-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-Arm64-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-Arm64-TestGroup.yml
index 8bf9df8f..31a79623 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-Arm64-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-Arm64-TestGroup.yml
@@ -7,4 +7,8 @@ scenarios:
   - className: GuestProxyAgentTest.TestScenarios.BVTScenario
     name: BVTScenario
   - name: LinuxPackageScenario
-    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario 
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario
+  - name: ProxyAgentExtension
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file
diff --git a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-TestGroup.yml b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-TestGroup.yml
index d5d6f31b..e43092ca 100644
--- a/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-TestGroup.yml
+++ b/e2etest/GuestProxyAgentTest/TestMap/Ubuntu22-TestGroup.yml
@@ -9,4 +9,6 @@ scenarios:
   - name: LinuxPackageScenario
     className: GuestProxyAgentTest.TestScenarios.LinuxPackageScenario  
   - name: ProxyAgentExtension
-    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
\ No newline at end of file
+    className: GuestProxyAgentTest.TestScenarios.ProxyAgentExtension
+  - name: LinuxImplicitExtension
+    className: GuestProxyAgentTest.TestScenarios.LinuxImplicitExtension
\ No newline at end of file