diff --git a/.github/workflows/cortex-build.yml b/.github/workflows/cortex-build.yml
index 18db33eef..ac48825db 100644
--- a/.github/workflows/cortex-build.yml
+++ b/.github/workflows/cortex-build.yml
@@ -43,28 +43,28 @@ jobs:
           - os: "linux"
             name: "amd64"
             runs-on: "ubuntu-20-04"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}}"
             build-deps-cmake-flags: ""
             arch: "x64"
             platform: "linux"
           - os: "mac"
             name: "amd64"
             runs-on: "macos-13"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}}"
             build-deps-cmake-flags: ""
             arch: "x64"
             platform: "darwin"
           - os: "mac"
             name: "arm64"
             runs-on: "macos-latest"
-            cmake-flags: "-DMAC_ARM64=ON"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}} -DMAC_ARM64=ON"
             build-deps-cmake-flags: ""
             arch: "arm64"
             platform: "darwin"
           - os: "windows"
             name: "amd64"
             runs-on: "windows-cuda-12-0"
-            cmake-flags: "-DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             build-deps-cmake-flags: "-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             arch: "x64"
             platform: "win32"
diff --git a/.github/workflows/cortex-cpp-quality-gate.yml b/.github/workflows/cortex-cpp-quality-gate.yml
index 33a13d376..b30fb30de 100644
--- a/.github/workflows/cortex-cpp-quality-gate.yml
+++ b/.github/workflows/cortex-cpp-quality-gate.yml
@@ -24,25 +24,25 @@ jobs:
           - os: "linux"
             name: "amd64"
             runs-on: "ubuntu-20-04"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}}"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "amd64"
             runs-on: "macos-13"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}}"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "arm64"
             runs-on: "mac-silicon"
-            cmake-flags: "-DMAC_ARM64=ON"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DMAC_ARM64=ON"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "windows"
             name: "amd64"
             runs-on: "windows-cuda-12-0"
-            cmake-flags: "-DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{github.event.pull_request.head.sha}} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             build-deps-cmake-flags: "-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'          
     steps:
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index f36ffc91b..759181bc7 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -51,25 +51,25 @@ jobs:
           - os: "linux"
             name: "amd64"
             runs-on: "ubuntu-20-04"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}}"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "amd64"
             runs-on: "macos-13"
-            cmake-flags: ""
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}}"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "mac"
             name: "arm64"
             runs-on: "mac-silicon"
-            cmake-flags: "-DMAC_ARM64=ON"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}} -DMAC_ARM64=ON"
             build-deps-cmake-flags: ""
             ccache-dir: ''
           - os: "windows"
             name: "amd64"
             runs-on: "windows-cuda-12-0"
-            cmake-flags: "-DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
+            cmake-flags: "-DCORTEX_CPP_VERSION=${{needs.create-draft-release.outputs.version}} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             build-deps-cmake-flags: "-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CUDA_COMPILER_LAUNCHER=ccache -GNinja"
             ccache-dir: 'C:\Users\ContainerAdministrator\AppData\Local\ccache'
 
diff --git a/cortex-cpp/addon.cc b/cortex-cpp/addon.cc
index 42db5f153..0184baeff 100644
--- a/cortex-cpp/addon.cc
+++ b/cortex-cpp/addon.cc
@@ -36,9 +36,6 @@ void start() {
 #else
   LOG_INFO << "cortex-cpp version: undefined";
 #endif
-#ifdef CORTEX_LLAMACPP_VERSION
-  LOG_INFO << "cortex.llamacpp version: " << CORTEX_LLAMACPP_VERSION;
-#endif
 
   LOG_INFO << "Server started, listening at: " << host << ":" << port;
   LOG_INFO << "Please load your model";
diff --git a/cortex-cpp/main.cc b/cortex-cpp/main.cc
index 04190d92d..5e61dd9a8 100644
--- a/cortex-cpp/main.cc
+++ b/cortex-cpp/main.cc
@@ -74,9 +74,6 @@ int main(int argc, char* argv[]) {
 #else
   LOG_INFO << "cortex-cpp version: undefined";
 #endif
-#ifdef CORTEX_LLAMACPP_VERSION
-  LOG_INFO << "cortex.llamacpp version: " << CORTEX_LLAMACPP_VERSION;
-#endif
 
   LOG_INFO << "Server started, listening at: " << host << ":" << port;
   LOG_INFO << "Please load your model";