diff --git a/.github/workflows/net-release.yml b/.github/workflows/net-release.yml
index 3f8d7372..2599d4a3 100644
--- a/.github/workflows/net-release.yml
+++ b/.github/workflows/net-release.yml
@@ -173,7 +173,8 @@ jobs:
           dotnet nuget add source ${{ github.workspace }}/nugets --name local
           dotnet build --configuration Release \
             -p:LibraryRoot=${{ github.workspace }}/native_client_gens \
-            -p:SailsPackagesVersionOverride=${{ needs.prepare.outputs.r_version }}
+            -p:SailsPackagesVersionOverride=${{ needs.prepare.outputs.r_version }} \
+            -p:SubstrateNetApiVersionOverride=""
           dotnet test --no-build --configuration Release --logger "trx;LogFileName=TestResults.trx"
 
       - name: Publish NuGet Packages to NuGet.org
diff --git a/net/Directory.Build.props b/net/Directory.Build.props
index 8ac9f4b6..9eeee05e 100644
--- a/net/Directory.Build.props
+++ b/net/Directory.Build.props
@@ -11,6 +11,14 @@
     <SailsPackagesVersion Condition="'$(SailsPackagesVersionOverride)' != ''">$(SailsPackagesVersionOverride)</SailsPackagesVersion>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <SubstrateNetApiVersion>[0.9.24-rc8]</SubstrateNetApiVersion>
+    <!-- Temp override -->
+    <SubstrateNetApiVersionOverride>[0.9.23]</SubstrateNetApiVersionOverride>
+    <!-- Set constant to use sails-rs 0.7.0 and node 1.7.0 -->
+    <DefineConstants Condition="'$(SubstrateNetApiVersionOverride)' == ''">SAILSRS07</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Roslynator.Analyzers">
       <PrivateAssets>all</PrivateAssets>
diff --git a/net/Directory.Packages.props b/net/Directory.Packages.props
index 55efae1b..e059776c 100644
--- a/net/Directory.Packages.props
+++ b/net/Directory.Packages.props
@@ -8,7 +8,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.11.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
     <PackageVersion Include="PolySharp" Version="1.15.0" />
-    <PackageVersion Include="Substrate.NET.API" Version="0.9.24-rc8" />
+    <PackageVersion Include="Substrate.NET.API" Version="$(SubstrateNetApiVersion)" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.1" />
     <PackageVersion Include="System.Threading.Channels" Version="9.0.0" />
     <!-- Tests -->
diff --git a/net/examples/Sails.DemoClient/Sails.DemoClient.csproj b/net/examples/Sails.DemoClient/Sails.DemoClient.csproj
index c7479e29..d2b38315 100644
--- a/net/examples/Sails.DemoClient/Sails.DemoClient.csproj
+++ b/net/examples/Sails.DemoClient/Sails.DemoClient.csproj
@@ -12,7 +12,7 @@
   <ItemGroup Condition="'$(UseSailsProjectRefences)' != 'true'">
     <PackageReference Include="Sails.ClientGenerator" />
     <PackageReference Include="Sails.Net" />
-    <PackageReference Include="Substrate.NET.API" VersionOverride="0.9.23" Condition="'$(SailsPackagesVersionOverride)' == ''" />
+    <PackageReference Include="Substrate.NET.API" VersionOverride="$(SubstrateNetApiVersionOverride)" Condition="'$(SubstrateNetApiVersionOverride)' != ''" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(UseSailsProjectRefences)' == 'true'">
diff --git a/net/tests/Sails.DemoClient.Tests/Sails.DemoClient.Tests.csproj b/net/tests/Sails.DemoClient.Tests/Sails.DemoClient.Tests.csproj
index 91e4b400..54a5fc10 100644
--- a/net/tests/Sails.DemoClient.Tests/Sails.DemoClient.Tests.csproj
+++ b/net/tests/Sails.DemoClient.Tests/Sails.DemoClient.Tests.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Substrate.NET.API" VersionOverride="0.9.23" Condition="'$(SailsPackagesVersionOverride)' == ''" />
+    <PackageReference Include="Substrate.NET.API" VersionOverride="$(SubstrateNetApiVersionOverride)" Condition="'$(SubstrateNetApiVersionOverride)' != ''" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/net/tests/Sails.DemoClient.Tests/_Infra/XUnit/Fixtures/SailsFixture.cs b/net/tests/Sails.DemoClient.Tests/_Infra/XUnit/Fixtures/SailsFixture.cs
index da03ecee..98ad92d1 100644
--- a/net/tests/Sails.DemoClient.Tests/_Infra/XUnit/Fixtures/SailsFixture.cs
+++ b/net/tests/Sails.DemoClient.Tests/_Infra/XUnit/Fixtures/SailsFixture.cs
@@ -3,7 +3,7 @@
 public sealed class SailsFixture : Testing.XUnit.Fixtures.SailsFixture
 {
     public SailsFixture()
-#if SailsPackagesVersionOverride
+#if SAILSRS07
         : base("demo-client-tests", "0.7.0")
 #else
         : base("demo-client-tests", "0.6.3")