diff --git a/eng/templates/build.yml b/eng/templates/build.yml
index ac2f8c56a..ef2e02820 100644
--- a/eng/templates/build.yml
+++ b/eng/templates/build.yml
@@ -62,6 +62,7 @@ jobs:
           vsVersion: '16.0'
           logFileVerbosity: minimal
           configuration: Release
+          platform: x64
           msbuildArgs: /p:FileVersionRevision=$(Build.BuildId) /p:ContinuousIntegrationBuild=true
 
       - task: VSBuild@1
diff --git a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
index fe725b1e4..6321d410e 100644
--- a/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
+++ b/src/DurableTask.ApplicationInsights/DurableTask.ApplicationInsights.csproj
@@ -16,7 +16,8 @@
         <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
         <FileVersion>$(VersionPrefix).0</FileVersion>
         <!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
-        <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+		<!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
+		<FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
         <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
         <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
         <!-- This version is used as the nuget package version -->
diff --git a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
index 33df68421..b65a306fd 100644
--- a/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
+++ b/src/DurableTask.AzureStorage/DurableTask.AzureStorage.csproj
@@ -26,7 +26,8 @@
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
   </PropertyGroup>
diff --git a/src/DurableTask.Core/DurableTask.Core.csproj b/src/DurableTask.Core/DurableTask.Core.csproj
index a7e2d56ec..802fe8097 100644
--- a/src/DurableTask.Core/DurableTask.Core.csproj
+++ b/src/DurableTask.Core/DurableTask.Core.csproj
@@ -22,7 +22,8 @@
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535) -->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <PackageReadmeFile>.\README.md</PackageReadmeFile>
diff --git a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
index 411b201b2..36038afaa 100644
--- a/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
+++ b/src/DurableTask.ServiceBus/DurableTask.ServiceBus.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
     <PackageId>Microsoft.Azure.DurableTask.ServiceBus</PackageId>
+    <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
     <!-- Version Info -->
@@ -15,7 +16,8 @@
     <VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
     <FileVersion>$(VersionPrefix).0</FileVersion>
     <!-- FileVersionRevision is expected to be set by the CI. This is useful for distinguishing between multiple builds of the same version. -->
-    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$(FileVersionRevision)</FileVersion>
+    <!-- Ensure FileVersionRevision fits within valid range (0-65535)-->
+    <FileVersion Condition="'$(FileVersionRevision)' != ''">$(VersionPrefix).$([MSBuild]::Modulo($(FileVersionRevision), 65536))</FileVersion>
     <!-- The assembly version is only the major/minor pair, making it easier to do in-place upgrades -->
     <AssemblyVersion>$(MajorVersion).$(MinorVersion).0.0</AssemblyVersion>
     <!-- This version is used as the nuget package version -->