diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84faa5eb7..3941791cf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,20 +84,22 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.git)
   endif()
 endif()
 
-set(DESKFLOW_VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}")
-
-set(DESKFLOW_VERSION_MS_CSV "${DESKFLOW_VERSION_MAJOR},${DESKFLOW_VERSION_MINOR},${DESKFLOW_VERSION_PATCH},${DESKFLOW_VERSION_TWEAK}")
-
 #Define our project
 project(
   deskflow
-  VERSION ${DESKFLOW_VERSION}
+  VERSION "${DESKFLOW_VERSION_MAJOR}.${DESKFLOW_VERSION_MINOR}.${DESKFLOW_VERSION_PATCH}.${DESKFLOW_VERSION_TWEAK}"
   DESCRIPTION "Mouse and keyboard sharing utility"
   LANGUAGES C CXX)
 
 #Used for embedded copyright on binaries, limited space.
 set(CMAKE_PROJECT_COPYRIGHT "(C) 2024-2025 Deskflow Devs")
 
+#Unset the vars used in the project call
+unset(DESKFLOW_VERSION_MAJOR)
+unset(DESKFLOW_VERSION_MINOR)
+unset(DESKFLOW_VERSION_PATCH)
+unset(DESKFLOW_VERSION_TWEAK)
+
 message(STATUS "Building ${CMAKE_PROJECT_NAME}-${CMAKE_PROJECT_VERSION}")
 
 # Set lib versions
diff --git a/deploy/linux/arch/PKGBUILD.in b/deploy/linux/arch/PKGBUILD.in
index 0446eff79..5939af788 100644
--- a/deploy/linux/arch/PKGBUILD.in
+++ b/deploy/linux/arch/PKGBUILD.in
@@ -1,7 +1,7 @@
 # Maintainer: Deskflow Developers
 
 pkgname=deskflow
-pkgver=@DESKFLOW_VERSION@
+pkgver=@CMAKE_PROJECT_VERSION@
 pkgrel=1
 pkgdesc="Mouse and keyboard sharing utility"
 url='https://deskflow.org'
diff --git a/src/apps/res/version.rc.in b/src/apps/res/version.rc.in
index 73f466576..37076f10c 100644
--- a/src/apps/res/version.rc.in
+++ b/src/apps/res/version.rc.in
@@ -6,11 +6,8 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
 #include <windows.h>
 #include <verrsrc.h>
 
-#define VER_FILEVERSION             @DESKFLOW_VERSION_MS_CSV@
-#define VER_FILEVERSION_STR         "@DESKFLOW_VERSION_MS@\0"
-
-#define VER_PRODUCTVERSION          @DESKFLOW_VERSION_MS_CSV@
-#define VER_PRODUCTVERSION_STR      "@DESKFLOW_VERSION@\0"
+#define VER_VERSION             @CMAKE_PROJECT_VERSION_MAJOR@,@CMAKE_PROJECT_VERSION_MINOR@,@CMAKE_PROJECT_VERSION_PATCH@,@CMAKE_PROJECT_VERSION_TWEAK@
+#define VER_VERSION_STR         "@CMAKE_PROJECT_VERSION@\0"
 
 #define VER_COMPANYNAME_STR         "Deskflow\0"
 #define VER_FILEDESCRIPTION_STR     "Deskflow\0"
@@ -22,8 +19,8 @@ https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource?redi
 #define VER_PRODUCTNAME_STR         "Deskflow\0"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     VER_FILEVERSION
- PRODUCTVERSION  VER_PRODUCTVERSION
+ FILEVERSION     VER_VERSION
+ PRODUCTVERSION  VER_VERSION
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
  FILEFLAGS       0 // No flags
  FILEOS          VOS__WINDOWS32
@@ -36,14 +33,14 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      VER_COMPANYNAME_STR
             VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
-            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "FileVersion",      VER_VERSION_STR
             VALUE "InternalName",     VER_INTERNALNAME_STR
             VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
             VALUE "LegalTrademarks1", VER_LEGALTRADEMARKS1_STR
             VALUE "LegalTrademarks2", VER_LEGALTRADEMARKS2_STR
             VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
             VALUE "ProductName",      VER_PRODUCTNAME_STR
-            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+            VALUE "ProductVersion",   VER_VERSION_STR
         END
     END
 
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index de799cf28..fc76635ad 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -76,10 +76,6 @@ macro(set_sources)
     list(APPEND sources ${headers})
   endif()
 
-  if(WIN32)
-    list(APPEND sources ${PROJECT_BINARY_DIR}/src/version.rc)
-  endif()
-
   list(APPEND sources ${PROJECT_SOURCE_DIR}/src/apps/res/deskflow.qrc)
 
   replace_platform_sources()