diff --git a/.github/workflows/account-management.yml b/.github/workflows/account-management.yml
index ee7c5e7c1..b17a71358 100644
--- a/.github/workflows/account-management.yml
+++ b/.github/workflows/account-management.yml
@@ -78,11 +78,11 @@ jobs:
         run: |
           if [[ "${{ vars.SONAR_PROJECT_KEY }}" == "" ]]; then
             echo "SonarCloud is not enabled. Skipping SonarCloud analysis."
-            dotnet build AccountManagement.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }}
+            dotnet build account-management/AccountManagement.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }}
           else
             dotnet sonarscanner begin /k:"${{ vars.SONAR_PROJECT_KEY }}" /o:"${{ vars.SONAR_ORGANIZATION }}" /d:sonar.login="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.dotcover.reportsPaths="coverage/dotCover.html" &&
-            dotnet build AccountManagement.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} &&
-            dotnet dotcover test AccountManagement.slnf --no-build --dcOutput=coverage/dotCover.html --dcReportType=HTML --dcFilters="+:PlatformPlatform.*;-:*.Tests;-:type=*.AppHost.*" &&
+            dotnet build account-management/AccountManagement.slnf --no-restore /p:Version=${{ steps.generate_version.outputs.version }} &&
+            dotnet dotcover test account-management/AccountManagement.slnf --no-build --dcOutput=coverage/dotCover.html --dcReportType=HTML --dcFilters="+:PlatformPlatform.*;-:*.Tests;-:type=*.AppHost.*" &&
             dotnet sonarscanner end /d:sonar.login="${SONAR_TOKEN}"
           fi
 
@@ -146,12 +146,12 @@ jobs:
 
       - name: Build backend solution
         working-directory: application
-        run: dotnet build AccountManagement.slnf --no-restore
+        run: dotnet build account-management/AccountManagement.slnf --no-restore
 
       - name: Run code inspections
         working-directory: application
         run: |
-          dotnet jb inspectcode AccountManagement.slnf --no-build --output=result.json --severity=SUGGESTION
+          dotnet jb inspectcode account-management/AccountManagement.slnf --no-build --output=result.json --severity=SUGGESTION
 
           # Check if there are any issues. <Issues /> indicates no issues found.
           if ! grep -q '\"results\": \[\],' result.json; then
@@ -163,11 +163,11 @@ jobs:
       - name: Check for code formatting issues
         working-directory: application
         run: |
-          dotnet jb cleanupcode AccountManagement.slnf --no-build --profile=".NET only"
+          dotnet jb cleanupcode account-management/AccountManagement.slnf --no-build --profile=".NET only"
 
           # Check for any changes made by the code formatter
           git diff --exit-code || {
-            echo "Formatting issues detected. Please run 'dotnet jb cleanupcode AccountManagement.slnf --profile=\".NET only\"' locally and commit the formatted code."
+            echo "Formatting issues detected. Please run 'dotnet jb cleanupcode account-management/AccountManagement.slnf --profile=\".NET only\"' locally and commit the formatted code."
             exit 1
           }
 
diff --git a/application/AccountManagement.slnf b/application/account-management/AccountManagement.slnf
similarity index 61%
rename from application/AccountManagement.slnf
rename to application/account-management/AccountManagement.slnf
index 4747f12a6..b05fe93e9 100644
--- a/application/AccountManagement.slnf
+++ b/application/account-management/AccountManagement.slnf
@@ -1,9 +1,14 @@
 {
   "solution": {
-    "path": "PlatformPlatform.sln",
+    "path": "..\\PlatformPlatform.sln",
     "projects": [
       "AppHost\\AppHost.csproj",
       "AppGateway\\AppGateway.csproj",
+      "shared-kernel\\DomainCore\\SharedKernel.DomainCore.csproj",
+      "shared-kernel\\ApplicationCore\\SharedKernel.ApplicationCore.csproj",
+      "shared-kernel\\InfrastructureCore\\SharedKernel.InfrastructureCore.csproj",
+      "shared-kernel\\ApiCore\\SharedKernel.ApiCore.csproj",
+      "shared-kernel\\Tests\\SharedKernel.Tests.csproj",
       "account-management\\Domain\\AccountManagement.Domain.csproj",
       "account-management\\Application\\AccountManagement.Application.csproj",
       "account-management\\Infrastructure\\AccountManagement.Infrastructure.csproj",