diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yaml
similarity index 95%
rename from .github/workflows/cd.yml
rename to .github/workflows/cd.yaml
index 54f594a7..54be2d26 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yaml
@@ -1,6 +1,6 @@
 name: infinispan-cpp-client-release-9.3
 env:
-  ISPN_VER: "14.0.4.Final"
+  ISPN_VER: "14.0.6.Final"
   CLIENT_VERSION: ${{ github.event.release.tag_name }}
 on:
   push:
@@ -16,7 +16,7 @@ jobs:
       - run: echo $GITHUB_REF_NAME
       - run: mkdir build && chmod a+rwx . documentation build
       - run: podman build -t quay.io/rigazilla/ci-build-centos-8:latest -f ci-build/centos-stream8.Dockerfile .
-      - run: podman run -v `pwd`:/home/jboss/cpp-client quay.io/rigazilla/ci-build-centos-8:latest /bin/bash -c "cd cpp-client && INFINISPAN_VERSION=14.0.4.Final CLIENT_VERSION=$GITHUB_REF_NAME PLATFORM_TAG=el8 ./build.sh"
+      - run: podman run -v `pwd`:/home/jboss/cpp-client quay.io/rigazilla/ci-build-centos-8:latest /bin/bash -c "cd cpp-client && INFINISPAN_VERSION=14.0.6.Final CLIENT_VERSION=$GITHUB_REF_NAME PLATFORM_TAG=el8 ./build.sh"
       - uses: ncipollo/release-action@v1
         with:
           artifacts: "build/*.rpm,builddeb/*.deb"
@@ -31,7 +31,7 @@ jobs:
       - run: echo $GITHUB_REF_NAME
       - run: mkdir build && chmod a+rwx . documentation build
       - run: podman build -t quay.io/rigazilla/ci-build-centos-9:latest -f ci-build/centos-stream9.Dockerfile .
-      - run: podman run -v `pwd`:/home/jboss/cpp-client quay.io/rigazilla/ci-build-centos-9:latest /bin/bash -c "cd cpp-client && INFINISPAN_VERSION=14.0.4.Final CLIENT_VERSION=$GITHUB_REF_NAME PLATFORM_TAG=el9 ./build.sh"
+      - run: podman run -v `pwd`:/home/jboss/cpp-client quay.io/rigazilla/ci-build-centos-9:latest /bin/bash -c "cd cpp-client && INFINISPAN_VERSION=14.0.6.Final CLIENT_VERSION=$GITHUB_REF_NAME PLATFORM_TAG=el9 ./build.sh"
       - uses: ncipollo/release-action@v1
         with:
           artifacts: "build/*.rpm,builddeb/*.deb"
@@ -83,7 +83,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.4.Final
+          set INFINISPAN_VERSION=14.0.6.Final
           set CLIENT_VERSION=%GITHUB_REF_NAME%
           build.bat
       - uses: ncipollo/release-action@v1
diff --git a/build.bat b/build.bat
index a645985a..4a8f3956 100644
--- a/build.bat
+++ b/build.bat
@@ -36,7 +36,7 @@ cd %build_dir%
 
 if [%CLIENT_VERSION%] neq [] set V1=%CLIENT_VERSION:*/=%
 
-for /f "tokens=1,2,3,4 delims=." %%a in ("%V1%") do (
+for /f "tokens=1,2,3,4 delims=.-" %%a in ("%V1%") do (
    set version_1major=%%a
    set version_2minor=%%b
    set version_3micro=%%c
@@ -52,7 +52,7 @@ if 1%version_1major% neq +1%version_1major% set version_1major=0
 if 1%version_2minor% neq +1%version_2minor% set version_2minor=1
 if 1%version_3micro% neq +1%version_3micro% set version_3micro=0
 
-set version_patch=%version_3micro%.%version_4qualifier%
+set version_patch=%version_3micro%-%version_4qualifier%
 
 cmake -G "%~1" -DCPACK_PACKAGE_VERSION_MAJOR="%version_1major%" -DCPACK_PACKAGE_VERSION_MINOR="%version_2minor%" -DCPACK_PACKAGE_VERSION_PATCH="%version_patch%" -DSWIG_EXECUTABLE=%SWIG_EXECUTABLE% -DMVN_PROGRAM=%MVN_PROGRAM% -DPROTOBUF_LIBRARY="%PROTOBUF_LIBRARY%" -DPROTOBUF_PROTOC_LIBRARY="%PROTOBUF_PROTOC_LIBRARY%" -DProtobuf_INCLUDE_DIR="%PROTOBUF_INCLUDE_DIR%" -DPROTOBUF_INCLUDE_DIR="%PROTOBUF_INCLUDE_DIR%" -DPROTOBUF_PROTOC_EXECUTABLE="%PROTOBUF_PROTOC_EXECUTABLE%" -DOPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" ..
 if %errorlevel% neq 0 goto fai