diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1557da70f4..c5ad249b79 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -104,6 +104,8 @@ jobs:
     with:
       project-name: Component[OpenTelemetry.Exporter.Geneva]
       code-cov-name: Exporter.Geneva
+      os-list: '[ "ubuntu-24.04" ]' # Note: This may be switched to latest once ubuntu-latest has a kernel version >= 6.8.0-1014-azure
+      tfm-list: '[ "net8.0" ]' # Note: Should be able to remove this once the above is using ubuntu-latest
       test-case-filter: CategoryName=Geneva:user_events:metrics
       test-require-elevated: true
       pack: false
@@ -197,7 +199,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.AspNetCore
       code-cov-name: Instrumentation.AspNetCore
-      tfm-list: '[ "net8.0", "net9.0" ]'
+      tfm-list: '[ "net8.0" ]'
 
   build-test-instrumentation-aws:
     needs: detect-changes
@@ -279,7 +281,7 @@ jobs:
     with:
       project-name: OpenTelemetry.Instrumentation.EventCounters
       code-cov-name: Instrumentation.EventCounters
-      tfm-list: '[ "net8.0", "net9.0" ]'
+      tfm-list: '[ "net8.0" ]'
 
   build-test-instrumentation-grpccore:
     needs: detect-changes
diff --git a/build/Common.props b/build/Common.props
index 4305b94351..0a862054b1 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -10,7 +10,7 @@
     <NetMinimumSupportedVersion>net8.0</NetMinimumSupportedVersion>
     <NetStandardMinimumSupportedVersion>netstandard2.0</NetStandardMinimumSupportedVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AnalysisLevel>latest-all</AnalysisLevel>
+    <AnalysisLevel>8.0</AnalysisLevel>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <NuGetAudit>true</NuGetAudit>
diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
index c2b3eb1c80..ee887b3abc 100644
--- a/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
+++ b/test/OpenTelemetry.Exporter.Geneva.Tests/UnixUserEventsDataTransportTests.cs
@@ -7,6 +7,7 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
 using Microsoft.LinuxTracepoints.Provider;
+using OpenTelemetry.Tests;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -49,7 +50,7 @@ public UnixUserEventsDataTransportTests(ITestOutputHelper testOutputHelper)
         this.testOutputHelper = testOutputHelper;
     }
 
-    [Fact(Skip = "This would fail on Ubuntu. Skipping for now.")]
+    [SkipUnlessPlatformMatchesFact(TestPlatform.Linux, requireElevatedProcess: true)]
     public void UserEvents_Enabled_Success_Linux()
     {
         EnsureUserEventsEnabled();
@@ -113,7 +114,7 @@ public void UserEvents_Enabled_Success_Linux()
         }
     }
 
-    [Fact(Skip = "This would fail on Ubuntu. Skipping for now.")]
+    [SkipUnlessPlatformMatchesFact(TestPlatform.Linux, requireElevatedProcess: true)]
     public void UserEvents_Disabled_Success_Linux()
     {
         EnsureUserEventsEnabled();