diff --git a/.github/actions/docker-manifests/action.yml b/.github/actions/docker-manifests/action.yml
index 9c9a78ef9b..7bf0945382 100644
--- a/.github/actions/docker-manifests/action.yml
+++ b/.github/actions/docker-manifests/action.yml
@@ -1,10 +1,10 @@
 name: 'Docker Manifests'
 description: 'Docker Publish Manifests'
 inputs:
-  distro:
+  dockerDistro:
     description: 'Linux Distro'
     required: true
-  targetFramework:
+  dotnetVersion:
     description: '.net version'
     required: true
   docker_registry_username:
@@ -32,7 +32,7 @@ runs:
   -
     name: '[Docker Publish Manifests] DockerHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub
+    run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub
   -
     name: Login to GitHub
     uses: docker/login-action@v3
@@ -43,4 +43,4 @@ runs:
   -
     name: '[Docker Publish Manifests] GitHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github
+    run: dotnet run/docker.dll --target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github
diff --git a/.github/actions/docker-publish/action.yml b/.github/actions/docker-publish/action.yml
index feff913274..d65fbe5aee 100644
--- a/.github/actions/docker-publish/action.yml
+++ b/.github/actions/docker-publish/action.yml
@@ -4,10 +4,10 @@ inputs:
   arch:
     description: 'Docker architecture'
     required: true
-  distro:
+  dockerDistro:
     description: 'Linux Distro'
     required: true
-  targetFramework:
+  dotnetVersion:
     description: '.net version'
     required: true
   docker_registry_username:
@@ -35,7 +35,7 @@ runs:
   -
     name: '[Docker Publish] DockerHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub --verbosity=diagnostic
+    run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
   -
     name: Login to GitHub
     uses: docker/login-action@v3
@@ -46,4 +46,4 @@ runs:
   -
     name: '[Docker Publish] GitHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github --verbosity=diagnostic
+    run: dotnet run/docker.dll --target=DockerPublish --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic
diff --git a/.github/actions/docker-test/action.yml b/.github/actions/docker-test/action.yml
index 943bc4c75b..7e450d2d8e 100644
--- a/.github/actions/docker-test/action.yml
+++ b/.github/actions/docker-test/action.yml
@@ -4,10 +4,10 @@ inputs:
   arch:
     description: 'Docker architecture'
     default: 'amd64'
-  distro:
+  dockerDistro:
     description: 'Linux Distro'
     default: 'debian.12'
-  targetFramework:
+  dotnetVersion:
     description: '.net version'
     default: '8.0'
 
@@ -17,8 +17,8 @@ runs:
   -
     name: '[Docker Build & Test] DockerHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry dockerhub --verbosity=diagnostic
+    run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry dockerhub --verbosity=diagnostic
   -
     name: '[Docker Build & Test] GitHub'
     shell: pwsh
-    run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ inputs.targetFramework }} --docker_distro=${{ inputs.distro }} --docker_registry github --verbosity=diagnostic
+    run: dotnet run/docker.dll --target=DockerTest --arch=${{ inputs.arch }} --dotnet_version=${{ inputs.dotnetVersion }} --docker_distro=${{ inputs.dockerDistro }} --docker_registry github --verbosity=diagnostic
diff --git a/.github/workflows/_artifacts_linux.yml b/.github/workflows/_artifacts_linux.yml
index 5d6bcd5454..262adf454d 100644
--- a/.github/workflows/_artifacts_linux.yml
+++ b/.github/workflows/_artifacts_linux.yml
@@ -14,12 +14,12 @@ env:
   
 jobs:
   artifacts:
-    name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
+    name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
     runs-on: ${{ inputs.runner }}
     strategy:
       fail-fast: false
       matrix:
-        distro:
+        dockerDistro:
           - alpine.3.20
           - centos.stream.9
           - debian.12
@@ -27,7 +27,7 @@ jobs:
           - ubuntu.20.04
           - ubuntu.22.04
           - ubuntu.24.04
-        targetFramework: [ '8.0', '6.0' ]
+        dotnetVersion: [ '8.0', '6.0' ]
 
     steps:
     -
@@ -53,4 +53,4 @@ jobs:
     -
       name: '[Test Artifacts]'
       shell: pwsh
-      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --docker_dotnetversion=${{ matrix.targetFramework }} --docker_distro=${{ matrix.distro }}
\ No newline at end of file
+      run: dotnet run/artifacts.dll --target=ArtifactsTest --arch=${{ inputs.arch }} --dotnet_version=${{ matrix.dotnetVersion }} --docker_distro=${{ matrix.dockerDistro }}
\ No newline at end of file
diff --git a/.github/workflows/_docker.yml b/.github/workflows/_docker.yml
index c502782848..b226199e38 100644
--- a/.github/workflows/_docker.yml
+++ b/.github/workflows/_docker.yml
@@ -14,12 +14,12 @@ env:
 
 jobs:
   docker:
-    name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
+    name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
     runs-on: ${{ inputs.runner }}
     strategy:
       fail-fast: false
       matrix:
-        distro:
+        dockerDistro:
           - alpine.3.20
           - centos.stream.9
           - debian.12
@@ -27,7 +27,7 @@ jobs:
           - ubuntu.20.04
           - ubuntu.22.04
           - ubuntu.24.04
-        targetFramework: [ '8.0', '6.0' ]
+        dotnetVersion: [ '8.0', '6.0' ]
 
     steps:
     -
@@ -65,16 +65,16 @@ jobs:
       uses: ./.github/actions/docker-test
       with:
         arch: ${{ inputs.arch }}
-        distro: ${{ matrix.distro }}
-        targetFramework: ${{ matrix.targetFramework }}
+        dockerDistro: ${{ matrix.dockerDistro }}
+        dotnetVersion: ${{ matrix.dotnetVersion }}
     -
       name: Docker Publish
       if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
       uses: ./.github/actions/docker-publish
       with:
         arch: ${{ inputs.arch }}
-        distro: ${{ matrix.distro }}
-        targetFramework: ${{ matrix.targetFramework }}
+        dockerDistro: ${{ matrix.dockerDistro }}
+        dotnetVersion: ${{ matrix.dotnetVersion }}
         docker_registry_username: ${{ secrets.DOCKER_USERNAME }}
         docker_registry_password: ${{ secrets.DOCKER_PASSWORD }}
         github_registry_username: ${{ github.repository_owner }}
diff --git a/.github/workflows/_docker_manifests.yml b/.github/workflows/_docker_manifests.yml
index be38bf1bf5..33e65458cf 100644
--- a/.github/workflows/_docker_manifests.yml
+++ b/.github/workflows/_docker_manifests.yml
@@ -7,12 +7,12 @@ env:
 
 jobs:
   manifest:
-    name: ${{ matrix.distro }} - net${{ matrix.targetFramework }}
+    name: ${{ matrix.dockerDistro }} - net${{ matrix.dotnetVersion }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        distro:
+        dockerDistro:
           - alpine.3.20
           - centos.stream.9
           - debian.12
@@ -20,7 +20,7 @@ jobs:
           - ubuntu.20.04
           - ubuntu.22.04
           - ubuntu.24.04
-        targetFramework: [ '8.0', '6.0' ]
+        dotnetVersion: [ '8.0', '6.0' ]
 
     steps:
     -
@@ -51,8 +51,8 @@ jobs:
       if: success() && github.event_name != 'pull_request' && github.repository_owner == 'GitTools' && github.ref_name == 'main'
       uses: ./.github/actions/docker-manifests
       with:
-        distro: ${{ matrix.distro }}
-        targetFramework: ${{ matrix.targetFramework }}
+        dockerDistro: ${{ matrix.dockerDistro }}
+        dotnetVersion: ${{ matrix.dotnetVersion }}
         docker_registry_username: ${{ secrets.DOCKER_USERNAME }}
         docker_registry_password: ${{ secrets.DOCKER_PASSWORD }}
         github_registry_username: ${{ github.repository_owner }}
diff --git a/.github/workflows/_unit_tests.yml b/.github/workflows/_unit_tests.yml
index b59c395694..96d954d9e5 100644
--- a/.github/workflows/_unit_tests.yml
+++ b/.github/workflows/_unit_tests.yml
@@ -7,14 +7,14 @@ env:
   
 jobs:
   unit_test:
-    name: ${{ matrix.os }} - net${{ matrix.targetFramework }}
+    name: ${{ matrix.os }} - net${{ matrix.dotnetVersion }}
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
     strategy:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest, macos-15]
-        targetFramework: [ '8.0', '6.0' ]
+        dotnetVersion: [ '8.0', '6.0' ]
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -29,11 +29,11 @@ jobs:
     -
       name: '[Unit Test]'
       shell: pwsh
-      run: dotnet run/build.dll --target=Test --dotnet_target=${{ matrix.targetFramework }}
+      run: dotnet run/build.dll --target=Test --dotnet_version=${{ matrix.dotnetVersion }}
 
     -
       name: Test Summary
       uses: test-summary/action@v2.4
-      if: matrix.targetFramework == '8.0'
+      if: matrix.dotnetVersion == '8.0'
       with:
         paths: artifacts/test-results/*.results.xml
diff --git a/build/.run/Artifacts DotnetTool Test.run.xml b/build/.run/Artifacts DotnetTool Test.run.xml
index 5d80a2eedf..5a4546c2b5 100644
--- a/build/.run/Artifacts DotnetTool Test.run.xml	
+++ b/build/.run/Artifacts DotnetTool Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts DotnetTool Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsDotnetToolTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Artifacts MsBuildCore Test.run.xml b/build/.run/Artifacts MsBuildCore Test.run.xml
index 0ed4b10de9..dd416c0d12 100644
--- a/build/.run/Artifacts MsBuildCore Test.run.xml	
+++ b/build/.run/Artifacts MsBuildCore Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts MsBuildCore Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsMsBuildCoreTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Artifacts Native Test.run.xml b/build/.run/Artifacts Native Test.run.xml
index 384944d251..05c10b671e 100644
--- a/build/.run/Artifacts Native Test.run.xml	
+++ b/build/.run/Artifacts Native Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Native Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsNativeTest --arch=amd64 --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Artifacts Prepare.run.xml b/build/.run/Artifacts Prepare.run.xml
index 14d344d8e7..e4e16dc7fa 100644
--- a/build/.run/Artifacts Prepare.run.xml	
+++ b/build/.run/Artifacts Prepare.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Prepare" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsPrepare --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Artifacts Test.run.xml b/build/.run/Artifacts Test.run.xml
index 776e2c13e2..39b16f0c74 100644
--- a/build/.run/Artifacts Test.run.xml	
+++ b/build/.run/Artifacts Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Artifacts Test" type="DotNetProject" factoryName=".NET Project" folderName="Artifacts">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/artifacts.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --docker_dotnetversion=8.0 --docker_distro=alpine.3.20" />
+    <option name="PROGRAM_PARAMETERS" value="--target=ArtifactsTest --dotnet_version=8.0 --docker_distro=alpine.3.20" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Clean.run.xml b/build/.run/Clean.run.xml
index ae7016c4ef..1fa96943fd 100644
--- a/build/.run/Clean.run.xml
+++ b/build/.run/Clean.run.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Clean" type="DotNetProject" factoryName=".NET Project">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
     <option name="PROGRAM_PARAMETERS" value="--target=Clean" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
diff --git a/build/.run/Default Chores.run.xml b/build/.run/Default Config.run.xml
similarity index 75%
rename from build/.run/Default Chores.run.xml
rename to build/.run/Default Config.run.xml
index a4642c17d7..09aff33315 100644
--- a/build/.run/Default Chores.run.xml	
+++ b/build/.run/Default Config.run.xml	
@@ -1,6 +1,6 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Default Chores" type="DotNetProject" factoryName=".NET Project" folderName="Default">
-    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/chores.exe" />
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Default Config" type="DotNetProject" factoryName=".NET Project" folderName="Default">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/config" />
     <option name="PROGRAM_PARAMETERS" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
@@ -10,7 +10,7 @@
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
     <option name="RUNTIME_ARGUMENTS" value="" />
-    <option name="PROJECT_PATH" value="$PROJECT_DIR$/chores/chores.csproj" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/config/config.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
     <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
diff --git a/build/.run/Docker Build.run.xml b/build/.run/Docker Build.run.xml
index 58c96fbe78..ccd4f3d5c7 100644
--- a/build/.run/Docker Build.run.xml	
+++ b/build/.run/Docker Build.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Build" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerBuild --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Docker Manifest.run.xml b/build/.run/Docker Manifest.run.xml
index 4d2ac8d97e..75fee1395a 100644
--- a/build/.run/Docker Manifest.run.xml	
+++ b/build/.run/Docker Manifest.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Manifest" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerManifest --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Docker Publish.run.xml b/build/.run/Docker Publish.run.xml
index 5e4dfecf4d..b6f904544c 100644
--- a/build/.run/Docker Publish.run.xml	
+++ b/build/.run/Docker Publish.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Publish" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --docker_dotnetversion=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerPublish --arch=amd64 --arch=arm64 --dotnet_version=8.0 --docker_distro=debian.12 --verbosity=diagnostic" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/Docker Test.run.xml b/build/.run/Docker Test.run.xml
index e91e5f87ce..35cd850bab 100644
--- a/build/.run/Docker Test.run.xml	
+++ b/build/.run/Docker Test.run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker Test" type="DotNetProject" factoryName=".NET Project" folderName="Docker">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/docker.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --docker_dotnetversion=8.0 --docker_distro=debian.12" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerTest --arch=amd64 --dotnet_version=8.0 --docker_distro=debian.12" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/DockerMatrix.run.xml b/build/.run/DockerMatrix.run.xml
new file mode 100644
index 0000000000..c2e3f49a3a
--- /dev/null
+++ b/build/.run/DockerMatrix.run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="DockerMatrix" type="DotNetProject" factoryName=".NET Project" folderName="Config">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/config" />
+    <option name="PROGRAM_PARAMETERS" value="--target=DockerMatrix" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/config/config.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build/.run/PublishCoverage.run.xml b/build/.run/PublishCoverage.run.xml
index 7a91587fb3..a1a841e350 100644
--- a/build/.run/PublishCoverage.run.xml
+++ b/build/.run/PublishCoverage.run.xml
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="PublishCoverage" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build.exe" />
-    <option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_target=8.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=PublishCoverage --dotnet_version=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/TestMatrix.run.xml b/build/.run/TestMatrix.run.xml
new file mode 100644
index 0000000000..55e3b28fc8
--- /dev/null
+++ b/build/.run/TestMatrix.run.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="TestMatrix" type="DotNetProject" factoryName=".NET Project" folderName="Config">
+    <option name="EXE_PATH" value="$PROJECT_DIR$/../run/config" />
+    <option name="PROGRAM_PARAMETERS" value="--target=TestMatrix" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
+    <option name="PASS_PARENT_ENVS" value="1" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="PROJECT_PATH" value="$PROJECT_DIR$/config/config.csproj" />
+    <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
+    <option name="PROJECT_KIND" value="DotNetCore" />
+    <option name="PROJECT_TFM" value="net8.0" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/build/.run/UnitTest (6.0).run.xml b/build/.run/UnitTest (6.0).run.xml
index 160f4737c6..4f2f55e0a6 100644
--- a/build/.run/UnitTest (6.0).run.xml	
+++ b/build/.run/UnitTest (6.0).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="UnitTest (6.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=6.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=6.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <envs>
diff --git a/build/.run/UnitTest (8.0).run.xml b/build/.run/UnitTest (8.0).run.xml
index 542a0d60c9..996040b8d5 100644
--- a/build/.run/UnitTest (8.0).run.xml	
+++ b/build/.run/UnitTest (8.0).run.xml	
@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="UnitTest (8.0)" type="DotNetProject" factoryName=".NET Project" folderName="Unit Test">
     <option name="EXE_PATH" value="$PROJECT_DIR$/../run/build" />
-    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_target=8.0" />
+    <option name="PROGRAM_PARAMETERS" value="--target=UnitTest --dotnet_version=8.0" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/.." />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
diff --git a/build/artifacts/BuildLifetime.cs b/build/artifacts/BuildLifetime.cs
index 8db724ade1..99b5ffe177 100644
--- a/build/artifacts/BuildLifetime.cs
+++ b/build/artifacts/BuildLifetime.cs
@@ -12,11 +12,11 @@ public override void Setup(BuildContext context, ISetupContext info)
         context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", string.Empty) == "linux";
 
         var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
-        var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
+        var dotnetVersion = context.Argument(Arguments.DotnetVersion, string.Empty).ToLower();
         var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
-        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.Frameworks : [dotnetVersion];
-        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : [dockerDistro];
+        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.DotnetVersions : [dotnetVersion];
+        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistros : [dockerDistro];
 
         var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
         var platformArch = context.IsRunningOnAmd64() ? Architecture.Amd64 : Architecture.Arm64;
diff --git a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
index 8829430d07..f4d34e623e 100644
--- a/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
+++ b/build/artifacts/Tasks/ArtifactsMsBuildFullTest.cs
@@ -23,7 +23,7 @@ public override void Run(BuildContext context)
         var nugetSource = context.MakeAbsolute(Paths.Nuget).FullPath;
 
         context.Information("\nTesting msbuild task with dotnet build\n");
-        foreach (var netVersion in Constants.Frameworks)
+        foreach (var netVersion in Constants.DotnetVersions)
         {
             var framework = $"net{netVersion}";
             var dotnetMsBuildSettings = new DotNetMSBuildSettings();
diff --git a/build/build/Tasks/Test/UnitTest.cs b/build/build/Tasks/Test/UnitTest.cs
index 6178f34b4d..727d3e940f 100644
--- a/build/build/Tasks/Test/UnitTest.cs
+++ b/build/build/Tasks/Test/UnitTest.cs
@@ -16,15 +16,15 @@ public class UnitTest : FrostingTask<BuildContext>
 
     public override void Run(BuildContext context)
     {
-        var dotnetTarget = context.Argument(Arguments.DotnetTarget, string.Empty);
-        var frameworks = Constants.Frameworks;
-        if (!string.IsNullOrWhiteSpace(dotnetTarget))
+        var dotnetVersion = context.Argument(Arguments.DotnetVersion, string.Empty);
+        var frameworks = Constants.DotnetVersions;
+        if (!string.IsNullOrWhiteSpace(dotnetVersion))
         {
-            if (!frameworks.Contains(dotnetTarget, StringComparer.OrdinalIgnoreCase))
+            if (!frameworks.Contains(dotnetVersion, StringComparer.OrdinalIgnoreCase))
             {
-                throw new Exception($"Dotnet Target {dotnetTarget} is not supported at the moment");
+                throw new Exception($"Dotnet Target {dotnetVersion} is not supported at the moment");
             }
-            frameworks = [dotnetTarget];
+            frameworks = [dotnetVersion];
         }
 
         foreach (var framework in frameworks)
diff --git a/build/common/Utilities/Arguments.cs b/build/common/Utilities/Arguments.cs
index 57231705f9..92fd222839 100644
--- a/build/common/Utilities/Arguments.cs
+++ b/build/common/Utilities/Arguments.cs
@@ -5,8 +5,7 @@ public class Arguments
     public const string Target = "target";
     public const string Configuration = "configuration";
     public const string Architecture = "arch";
-    public const string DotnetTarget = "dotnet_target";
+    public const string DotnetVersion = "dotnet_version";
     public const string DockerRegistry = "docker_registry";
-    public const string DockerDotnetVersion = "docker_dotnetversion";
     public const string DockerDistro = "docker_distro";
 }
diff --git a/build/common/Utilities/Constants.cs b/build/common/Utilities/Constants.cs
index 1dbb54c1fa..0af521392e 100644
--- a/build/common/Utilities/Constants.cs
+++ b/build/common/Utilities/Constants.cs
@@ -8,7 +8,7 @@ public static class Constants
 
     public const string VersionCurrent = "6.0";
     public const string VersionLatest = "8.0";
-    public static readonly string[] Frameworks = [VersionCurrent, VersionLatest];
+    public static readonly string[] DotnetVersions = [VersionCurrent, VersionLatest];
 
     public const string DefaultBranch = "main";
     public const string DefaultConfiguration = "Release";
@@ -35,7 +35,7 @@ public static class Constants
 
     public const string DockerDistroLatest = DebianLatest;
 
-    public static readonly string[] DockerDistrosToBuild =
+    public static readonly string[] DockerDistros =
     [
         AlpineLatest,
         CentosStreamLatest,
diff --git a/build/common/Utilities/TaskArgumentsAttribute.cs b/build/common/Utilities/TaskArgumentsAttribute.cs
index bd856ce6f3..658f84a3d1 100644
--- a/build/common/Utilities/TaskArgumentsAttribute.cs
+++ b/build/common/Utilities/TaskArgumentsAttribute.cs
@@ -13,15 +13,15 @@ public class TaskArgumentAttribute(string name, params string[] possibleValues)
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
 public class DotnetArgumentAttribute()
-    : TaskArgumentAttribute(Arguments.DotnetTarget, Constants.Frameworks);
+    : TaskArgumentAttribute(Arguments.DotnetVersion, Constants.DotnetVersions);
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
 public class DockerDotnetArgumentAttribute()
-    : TaskArgumentAttribute(Arguments.DockerDotnetVersion, Constants.Frameworks);
+    : TaskArgumentAttribute(Arguments.DotnetVersion, Constants.DotnetVersions);
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
 public class DockerDistroArgumentAttribute()
-    : TaskArgumentAttribute(Arguments.DockerDistro, Constants.DockerDistrosToBuild);
+    : TaskArgumentAttribute(Arguments.DockerDistro, Constants.DockerDistros);
 
 [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
 public class DockerRegistryArgumentAttribute()
diff --git a/build/docker/BuildLifetime.cs b/build/docker/BuildLifetime.cs
index b0bec9d053..a518c7b6b2 100644
--- a/build/docker/BuildLifetime.cs
+++ b/build/docker/BuildLifetime.cs
@@ -15,11 +15,11 @@ public override void Setup(BuildContext context, ISetupContext info)
         context.IsDockerOnLinux = context.DockerCustomCommand("info --format '{{.OSType}}'").First().Replace("'", "") == "linux";
 
         var dockerRegistry = context.Argument(Arguments.DockerRegistry, DockerRegistry.DockerHub);
-        var dotnetVersion = context.Argument(Arguments.DockerDotnetVersion, string.Empty).ToLower();
+        var dotnetVersion = context.Argument(Arguments.DotnetVersion, string.Empty).ToLower();
         var dockerDistro = context.Argument(Arguments.DockerDistro, string.Empty).ToLower();
 
-        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.Frameworks : [dotnetVersion];
-        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistrosToBuild : [dockerDistro];
+        var versions = string.IsNullOrWhiteSpace(dotnetVersion) ? Constants.DotnetVersions : [dotnetVersion];
+        var distros = string.IsNullOrWhiteSpace(dockerDistro) ? Constants.DockerDistros : [dockerDistro];
 
         var architectures = context.HasArgument(Arguments.Architecture) ? context.Arguments<Architecture>(Arguments.Architecture) : Constants.ArchToBuild;
         var platformArch = context.IsRunningOnAmd64() ? Architecture.Amd64 : Architecture.Arm64;