diff --git a/.github/workflows/cli-release.yml b/.github/workflows/cli-release.yml
index d730c3590..81f267ac2 100644
--- a/.github/workflows/cli-release.yml
+++ b/.github/workflows/cli-release.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Build version'     
+        description: 'Build version (x.xx)'     
         required: true
 
 jobs:
@@ -15,13 +15,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Package CLI 6
-      run: dotnet pack src\Core\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.1.${{ github.event.inputs.version }} -p:InformationalVersion=6.1.${{ github.event.inputs.version }}
+      run: dotnet pack src\Core\efcpt.6\efcpt.6.csproj -p:PackageVersion=6.${{ github.event.inputs.version }} -p:InformationalVersion=6.${{ github.event.inputs.version }}
 
     - name: Package CLI 7
-      run: dotnet pack src\Core\efcpt.7\efcpt.7.csproj -p:PackageVersion=7.1.${{ github.event.inputs.version }} -p:InformationalVersion=7.1.${{ github.event.inputs.version }}
+      run: dotnet pack src\Core\efcpt.7\efcpt.7.csproj -p:PackageVersion=7.${{ github.event.inputs.version }} -p:InformationalVersion=7.${{ github.event.inputs.version }}
   
     - name: Package CLI 8
-      run: dotnet pack src\Core\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.1.${{ github.event.inputs.version }} -p:InformationalVersion=8.1.${{ github.event.inputs.version }}
+      run: dotnet pack src\Core\efcpt.8\efcpt.8.csproj -p:PackageVersion=8.${{ github.event.inputs.version }} -p:InformationalVersion=8.${{ github.event.inputs.version }}
 
     - name: Publish NuGet
       if: startsWith(github.ref, 'refs/heads/master')
diff --git a/src/Core/efcpt.7/Services/PackageService.cs b/src/Core/efcpt.7/Services/PackageService.cs
index a48e34d0c..12ee26f77 100644
--- a/src/Core/efcpt.7/Services/PackageService.cs
+++ b/src/Core/efcpt.7/Services/PackageService.cs
@@ -43,7 +43,7 @@ public static async Task CheckForPackageUpdateAsync()
             {
                 DisplayService.MarkupLine("Your are not using the latest version of the tool, please update to get the latest bug fixes, features and support", Color.Yellow);
                 DisplayService.MarkupLine($"Latest version is '{latestVersion}'", Color.Yellow);
-                DisplayService.MarkupLine($"Run 'dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version {Constants.Version}.0.*' to get the latest version.", Color.Yellow);
+                DisplayService.MarkupLine($"Run 'dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version {Constants.Version}.*' to get the latest version.", Color.Yellow);
             }
         }
 #pragma warning disable CA1031
diff --git a/src/Core/efcpt.7/readme.md b/src/Core/efcpt.7/readme.md
index 0ea50527f..9fc39fafc 100644
--- a/src/Core/efcpt.7/readme.md
+++ b/src/Core/efcpt.7/readme.md
@@ -13,19 +13,19 @@ For a quick intro you can watch [this 2 minute demo video](https://www.youtube.c
 EF Core 8:
 
 ```bash
-dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 8.0.*
+dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 8.*
 ```
 
 EF Core 7:
 
 ```bash
-dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 7.0.*
+dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 7.*
 ```
 
 EF Core 6:
 
 ```bash
-dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 6.0.*
+dotnet tool install ErikEJ.EFCorePowerTools.Cli -g --version 6.*
 ```
 
 ### Running the tool 
@@ -112,7 +112,7 @@ The tool can generate a [Mermaid ER diagram](https://mermaid.js.org/syntax/entit
 ### Updating the tool
 
 ```bash
-dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version 8.0.*
+dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version 8.*
 ```
 
 [Release notes](https://github.com/ErikEJ/EFCorePowerTools/wiki/Release-notes) - notice the `+CLI` label.
@@ -120,5 +120,5 @@ dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version 8.0.*
 ### Getting the latest daily build
 
 ```bash
-dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version 8.0.*-*
+dotnet tool update ErikEJ.EFCorePowerTools.Cli -g --version 8.*-*
 ```
diff --git a/src/EFCorePowerTools.sln b/src/EFCorePowerTools.sln
index c18f8f883..dba77cd99 100644
--- a/src/EFCorePowerTools.sln
+++ b/src/EFCorePowerTools.sln
@@ -36,6 +36,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{ACD63354-5031-4116-AEE9-B38E9F687E2E}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		..\.github\workflows\cli-release.yml = ..\.github\workflows\cli-release.yml
+		..\.github\workflows\cli-tool.yml = ..\.github\workflows\cli-tool.yml
 		Directory.Build.Props = Directory.Build.Props
 		NuGet.Config = NuGet.Config
 		..\.github\workflows\vsix.yml = ..\.github\workflows\vsix.yml