diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 2fe00cbb..ce27cf45 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -11,7 +11,7 @@ on:
     branches: [ master ]
 
 env:
-  ISHGITHUB_RUN_ATTEMPT: ${{ github.run_attempt }}
+  ISHGITHUB_RUN_NUMBER: ${{ github.run_number }}
 
 jobs:
   build:
@@ -33,7 +33,7 @@ jobs:
           echo "GITHUB_WORKFLOW[$env:GITHUB_WORKFLOW]"
           echo "GITHUB_RUN_NUMBER[$env:GITHUB_RUN_NUMBER]"
           echo "GITHUB_RUN_ATTEMPT[$env:GITHUB_RUN_ATTEMPT]"
-          echo "ISHGITHUB_RUN_ATTEMPT[$env:ISHGITHUB_RUN_ATTEMPT]"
+          echo "ISHGITHUB_RUN_NUMBER[$env:ISHGITHUB_RUN_NUMBER]"
 
     - uses: actions/checkout@v3
     
diff --git a/Source/ISHRemote/Directory.Build.props b/Source/ISHRemote/Directory.Build.props
index d846227f..2cb5720b 100644
--- a/Source/ISHRemote/Directory.Build.props
+++ b/Source/ISHRemote/Directory.Build.props
@@ -14,12 +14,12 @@
     <VersionMinor>0</VersionMinor>
     <VersionPatch>0</VersionPatch>
     <VersionBuild>$([MSBuild]::Add($([MSBuild]::Multiply(1200, $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2015)))), $([MSBuild]::Add($([MSBuild]::Multiply(100, $([System.DateTime]::UtcNow.Month))),$([System.DateTime]::UtcNow.Day)))))</VersionBuild>
-    <VersionSuffix Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">localpreview-$(VersionMajor).0</VersionSuffix>
-    <VersionSuffix Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">cipreview-$(VersionMajor).$(ISHGITHUB_RUN_ATTEMPT)</VersionSuffix>
+    <VersionSuffix Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">localpreview-$(VersionMajor).0</VersionSuffix>
+    <VersionSuffix Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">cipreview-$(VersionMajor).$(ISHGITHUB_RUN_NUMBER)</VersionSuffix>
 
     <AssemblyVersion>$(VersionMajor).0.0.0</AssemblyVersion>
-    <FileVersion Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).0</FileVersion>
-  	<FileVersion Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).$(ISHGITHUB_RUN_ATTEMPT)</FileVersion>
+    <FileVersion Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).0</FileVersion>
+  	<FileVersion Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">$(VersionMajor).$(VersionMinor).$(VersionBuild).$(ISHGITHUB_RUN_NUMBER)</FileVersion>
     <InformationalVersion>$(FileVersion)-$(VersionSuffix)</InformationalVersion>
 
     <PackageVersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</PackageVersionPrefix>
@@ -39,8 +39,8 @@
     <Build>$([MSBuild]::Add($([MSBuild]::Multiply(1200, $([MSBuild]::Subtract($([System.DateTime]::UtcNow.Year), 2015)))), $([MSBuild]::Add($([MSBuild]::Multiply(100, $([System.DateTime]::UtcNow.Month))),$([System.DateTime]::UtcNow.Day)))))</Build>
 	  <ModuleVersion>$(Major).$(Minor).$(Patch)</ModuleVersion>
     <ModuleBuildVersion>$(Major).$(Minor).$(Build).$(Patch)</ModuleBuildVersion>
-    <Prerelease Condition="'$(ISHGITHUB_RUN_ATTEMPT)' == ''">preview002</Prerelease>
-    <Prerelease Condition="'$(ISHGITHUB_RUN_ATTEMPT)' != ''">preview$([System.String]::Format('{0:D3}', $([System.UInt16]::Parse($(ISHGITHUB_RUN_ATTEMPT)))))</Prerelease>
+    <Prerelease Condition="'$(ISHGITHUB_RUN_NUMBER)' == ''">preview002</Prerelease>
+    <Prerelease Condition="'$(ISHGITHUB_RUN_NUMBER)' != ''">preview$([System.String]::Format('{0:D3}', $([System.UInt16]::Parse($(ISHGITHUB_RUN_NUMBER)))))</Prerelease>
     <ModuleName>$(ProductName)</ModuleName>
     <ModuleTitle>Tridion Docs Content Manager $(ProductName)</ModuleTitle>
     <ModuleDescription>Business automation module on top of Tridion Docs Content Manager (Knowledge Center Content Manager, LiveContent Architect, Trisoft InfoShare)</ModuleDescription>