diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 8823bc047..f76208f12 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -76,7 +76,7 @@ jobs:
     env:
       VCPKG_VERSION: 10b7a178346f3f0abef60cecd5130e295afd8da4
       # 2024.05.24
-      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry boost
+      vcpkg_packages: zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry boost-system
     strategy:
       fail-fast: false
       matrix:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f181a6ba..97bfa7cc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(freeminer)
 set(PROJECT_NAME_CAPITALIZED "freeminer")
 set(VERSION_TWEAK 0) # freeminer
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
 set(GCC_MINIMUM_VERSION "7.5")
 set(CLANG_MINIMUM_VERSION "7.0.1")
@@ -17,9 +17,11 @@ set(VERSION_PATCH 0)
 set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
 
 # Change to false for releases
-set(DEVELOPMENT_BUILD FALSE)
+set(DEVELOPMENT_BUILD FALSE) # freeminer
 
+set(DEVELOPMENT_BUILD TRUE)
 set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_TWEAK}")
+
 if(VERSION_EXTRA)
 	set(VERSION_STRING "${VERSION_STRING}-${VERSION_EXTRA}")
 elseif(DEVELOPMENT_BUILD)
@@ -75,9 +77,14 @@ set(RUN_IN_PLACE ${DEFAULT_RUN_IN_PLACE} CACHE BOOL
 
 
 # == freeminer:
-
 set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
 
+find_program(CCACHE_FOUND ccache)
+if(CCACHE_FOUND)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif(CCACHE_FOUND)
+
 set(BUILD_CLIENT TRUE CACHE BOOL "Build client")
 if(WIN32 OR APPLE)
 	# win32 broken! http://forum.freeminer.org/threads/building-errors.182/#post-1852
@@ -89,7 +96,6 @@ else()
 	set(BUILD_SERVER TRUE CACHE BOOL "Build server")
 endif()
 
-
 if(${CMAKE_VERSION} VERSION_LESS 3.13)
 	function(add_link_options)
 		foreach(arg IN LISTS ARGN)
diff --git a/Dockerfile b/Dockerfile
index e08a3632e..de92fc081 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ FROM $DOCKER_IMAGE AS dev
 ENV LUAJIT_VERSION v2.1
 
 RUN apk add --no-cache git build-base cmake curl-dev zlib-dev zstd-dev \
-		sqlite-dev postgresql-dev hiredis-dev leveldb-dev boost-dev ccache \
+		sqlite-dev postgresql-dev hiredis-dev leveldb-dev boost-system ccache \
 		gmp-dev jsoncpp-dev ninja ca-certificates
 
 WORKDIR /usr/src/
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d7e20d755..2cc8fa0d7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,14 +9,9 @@ INCLUDE(CheckLibraryExists)
 
 INCLUDE(CheckCXXSourceRuns)
 
-find_program(CCACHE_FOUND ccache)
-if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-set(CMAKE_CXX_STANDARD 20)
+#set(CMAKE_CXX_STANDARD 20)
 
 set(HAVE_SHARED_MUTEX 1)
 set(HAVE_THREAD_LOCAL 1)