diff --git a/.github/workflows/samples-dotnet.yaml b/.github/workflows/samples-dotnet.yaml
index 3030cf1596e..503fe89f56f 100644
--- a/.github/workflows/samples-dotnet.yaml
+++ b/.github/workflows/samples-dotnet.yaml
@@ -3,13 +3,13 @@ name: Samples C# .Net 8 Clients
 on:
   push:
     paths:
-      - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
+      - samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/**
       - samples/client/petstore/csharp/*net6.0*/**
       - samples/client/petstore/csharp/*net7.0*/**
       - samples/client/petstore/csharp/OpenAPIClient-*latest*/**
   pull_request:
     paths:
-      - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/**
+      - samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/**
       - samples/client/petstore/csharp/*net6.0*/**
       - samples/client/petstore/csharp/*net7.0*/**
       - samples/client/petstore/csharp/OpenAPIClient-*latest*/**
@@ -22,7 +22,7 @@ jobs:
       matrix:
         sample:
           # clients
-          - samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests
+          - samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests
           - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0
           - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt
           - samples/client/petstore/csharp/OpenAPIClient-generichost-net6.0-nrt-useSourceGeneration
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/.gitignore b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/.gitignore
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/.gitignore
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/.gitignore
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/ManualTests.Latest.UseSourceGeneration.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/UnitTest1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/ManualTests.Latest.UseSourceGeneration/Usings.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests.csproj
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/UnitTest1.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/OpenAPIClient-generichost-manual-tests/Usings.cs
diff --git a/samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln b/samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln
similarity index 100%
rename from samples/client/petstore/csharp/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln
rename to samples/client/petstore/csharp/generichost/net8/OpenAPIClient-generichost-manual-tests/Org.OpenAPITools.sln