diff --git a/.github/workflows/cd-nupkg.yml b/.github/workflows/cd-nupkg.yml
index 9dd560a..5967b84 100644
--- a/.github/workflows/cd-nupkg.yml
+++ b/.github/workflows/cd-nupkg.yml
@@ -1,6 +1,6 @@
 name: infinispan-nupkg
 env:
-  ISPN_VER: "14.0.6.Final"
+  ISPN_VER: "15.0.0.Dev04"
 on:
   push:
     tags:
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index ed6bc32..eaa82b3 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -1,6 +1,6 @@
 name: infinispan-netcore-tests
 env:
-  ISPN_VER: "14.0.6.Final"
+  ISPN_VER: "15.0.0.Dev04"
   CLIENT_VERSION: ${{ github.event.release.tag_name }}
 on:
   push:
@@ -50,7 +50,7 @@ jobs:
           set PROTOBUF_PROTOC_EXECUTABLE=${{ github.workspace }}\libs\bin\protoc.exe
           set PROTOBUF_PROTOC_LIBRARY=${{ github.workspace }}\libs\lib\libprotoc.lib
           set PROTOBUF_INCLUDE_DIR=${{ github.workspace }}\libs\include
-          set INFINISPAN_VERSION=14.0.6.Final
+          set INFINISPAN_VERSION=15.0.0.Dev04
           set cppTag=%GITHUB_REF_NAME%
           set CLIENT_VERSION=%GITHUB_REF_NAME%
           git clone -b %cppTag% https://github.com/infinispan/cpp-client.git
@@ -77,8 +77,8 @@ jobs:
           dir
           set generator="Visual Studio 17 2022"
           set checkoutDir=${{ github.workspace }}
-          set INFINISPAN_VERSION=14.0.6.Final
-          set JBOSS_HOME=${{ github.workspace }}\cpp-client\infinispan-server-14.0.6.Final
+          set INFINISPAN_VERSION=15.0.0.Dev04
+          set JBOSS_HOME=${{ github.workspace }}\cpp-client\infinispan-server-15.0.0.Dev04
           set PROTOBUF_LIBRARY=${{ github.workspace }}\libs\lib\libprotobuf.lib
           set PROTOBUF_PROTOC_EXECUTABLE=${{ github.workspace }}\libs\bin\protoc.exe
           set PROTOBUF_PROTOC_LIBRARY=${{ github.workspace }}\libs\lib\libprotoc.lib
diff --git a/.github/workflows/ci-nupkg.yml b/.github/workflows/ci-nupkg.yml
index cc4ffdf..441cfa0 100644
--- a/.github/workflows/ci-nupkg.yml
+++ b/.github/workflows/ci-nupkg.yml
@@ -1,6 +1,6 @@
 name: infinispan-nupkg
 env:
-  ISPN_VER: "14.0.6.Final"
+  ISPN_VER: "15.0.0.Dev04"
 on:
   push:
     branches:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d94771..24fcb38 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 name: infinispan-netcore-tests
 env:
-  ISPN_VER: "14.0.6.Final"
+  ISPN_VER: "15.0.0.Dev04"
   cppTag: "main"
   CLIENT_VERSION: ${{ github.event.release.tag_name }}
 on:
@@ -56,7 +56,7 @@ jobs:
           set PROTOBUF_PROTOC_EXECUTABLE=${{ github.workspace }}\libs\bin\protoc.exe
           set PROTOBUF_PROTOC_LIBRARY=${{ github.workspace }}\libs\lib\libprotoc.lib
           set PROTOBUF_INCLUDE_DIR=${{ github.workspace }}\libs\include
-          set INFINISPAN_VERSION=14.0.6.Final
+          set INFINISPAN_VERSION=15.0.0.Dev04
           set cppTag=%GITHUB_REF_NAME%
           set CLIENT_VERSION=%GITHUB_REF_NAME%
           git clone -b %cppTag% https://github.com/infinispan/cpp-client.git
@@ -83,8 +83,8 @@ jobs:
           dir
           set generator="Visual Studio 17 2022"
           set checkoutDir=${{ github.workspace }}
-          set INFINISPAN_VERSION=14.0.6.Final
-          set JBOSS_HOME=${{ github.workspace }}\cpp-client\infinispan-server-14.0.6.Final
+          set INFINISPAN_VERSION=15.0.0.Dev04
+          set JBOSS_HOME=${{ github.workspace }}\cpp-client\infinispan-server-15.0.0.Dev04
           set PROTOBUF_LIBRARY=${{ github.workspace }}\libs\lib\libprotobuf.lib
           set PROTOBUF_PROTOC_EXECUTABLE=${{ github.workspace }}\libs\bin\protoc.exe
           set PROTOBUF_PROTOC_LIBRARY=${{ github.workspace }}\libs\lib\libprotoc.lib
diff --git a/buildtools/build.fsx b/buildtools/build.fsx
index b6ea1e7..02880ca 100644
--- a/buildtools/build.fsx
+++ b/buildtools/build.fsx
@@ -16,7 +16,7 @@ let cppClientPackageVersion = environVar "buildTag" // nuget does not support st
 let swigVersion = "3.0.12"
 let protobufVersion = "3.8.0" // if changing this, be sure to also update Google.Protobuf in src/Infinispan.HotRod/Infinispan.HotRod.csproj
 let nunitToolsVersion = "2.6.1"
-let infinispanServerVersion = "14.0.6.Final"
+let infinispanServerVersion = "15.0.0.Dev04"
 
 let generateDir = "../../../src/Infinispan.HotRod/generated"
 let generateSwigDir = "../src/Infinispan.HotRod/generated"