diff --git a/.github/workflows/build-publish.yaml b/.github/workflows/build-publish.yaml
index 1cc4f7a..36aac02 100644
--- a/.github/workflows/build-publish.yaml
+++ b/.github/workflows/build-publish.yaml
@@ -25,6 +25,12 @@ jobs:
       with:
         fetch-depth: 0
 
+    - name: Setup - GitVersion
+      uses: gittools/actions/gitversion/setup@v0
+      with:
+        versionSpec: '5.x'
+        preferLatestVersion: true
+
     - name: Setup - dotnet framework 4.8
       run: |
         choco install netfx-4.8-devpack -y
@@ -36,14 +42,18 @@ jobs:
       env:
         NUGET_AUTH_TOKEN: ${{ github.token }}
 
+    - name: GitVersion
+      id: git-version
+      uses: gittools/actions/gitversion/execute@v0
+      with:
+        useConfigFile: true
+
     - name: Install dotnet tool
       run: dotnet tool install -g dotnetCampus.TagToVersion
 
-    - name: Set tag to version client 
-      run: dotnet TagToVersion -t ${{ github.ref }} -f src/FxEvents.Client/build/Version.props
 
-    - name: Set tag to version server
-      run: dotnet TagToVersion -t ${{ github.ref }} -f src/FxEvents.Server/build/Version.props
+    - name: Set tag to version
+      run: dotnet TagToVersion -t ${{ github.ref }}
 
     - name: Dotnet - Restore
       run: dotnet restore
diff --git a/Directory.Build.props b/Directory.Build.props
index 9922941..1ca53eb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,3 @@
 <Project>
-	<Import Project="src\FxEvents.Client\build\Version.props" />
-	<Import Project="src\FxEvents.Server\build\Version.props" />
+	<Import Project="build\Version.props" />
 </Project>
\ No newline at end of file
diff --git a/src/FxEvents.Client/build/Version.props b/build/Version.props
similarity index 100%
rename from src/FxEvents.Client/build/Version.props
rename to build/Version.props
diff --git a/src/FxEvents.Server/build/Version.props b/src/FxEvents.Server/build/Version.props
deleted file mode 100644
index fdf3a20..0000000
--- a/src/FxEvents.Server/build/Version.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <Version>2.8.2</Version>
-  </PropertyGroup>
-</Project>
\ No newline at end of file