diff --git a/.github/workflows/on_linux.yml b/.github/workflows/on_linux.yml
index 216eedf..8965adb 100644
--- a/.github/workflows/on_linux.yml
+++ b/.github/workflows/on_linux.yml
@@ -14,12 +14,12 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - name: "Ubuntu Latest with GCC 12"
+          - name: "Ubuntu Latest with GCC 14"
             compiler: gcc
-            compiler_ver: 12
-          - name: "Ubuntu Latests with Clang 15"
+            compiler_ver: 14
+          - name: "Ubuntu Latests with Clang 18"
             compiler: clang
-            compiler_ver: 15
+            compiler_ver: 18
     steps:
       - name: Prepare specific Clang version
         if: ${{ matrix.config.compiler == 'clang' }}
@@ -35,7 +35,6 @@ jobs:
           sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-${{ matrix.config.compiler_ver}} 100
       - name: Installing GTest
         run: |
-          sudo add-apt-repository ppa:team-xbmc/ppa
           sudo apt-get update
           sudo apt-get install libgmock-dev
       - uses: actions/checkout@v3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfee9fb..d78df22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# [5.2.4](https://github.com/fraillt/bitsery/compare/v5.2.3...v5.2.4) (2024-07-30)
+
+### Improvements
+* implement brief syntax for std::optional and std::bitset. #116 (thanks to [Destroyerrrocket](https://github.com/Destroyerrrocket))
+* improve performance for buffer adapters. #118 (thanks to [Destroyerrrocket](https://github.com/Destroyerrrocket))
+* check if should swap by taking into account actual type (in addition to configuration). #105 (thanks to [SoftdriveFelix](https://github.com/SoftdriveFelix))
+* fix compile errors for latest compilers. #106 (thanks to [NBurley93](https://github.com/NBurley93))
+
+### Other notes
+* change cmake_minimum_required to 3.25.
+* change compilers for ubuntu (gcc 14 and clang 18).
+
 # [5.2.3](https://github.com/fraillt/bitsery/compare/v5.2.2...v5.2.3) (2022-12-01)
 
 ### Improvements
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82e917d..bb58961 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.25)
 project(bitsery
         LANGUAGES CXX
         VERSION 5.2.2)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ba15050..732421a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -20,7 +20,7 @@
 #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 #SOFTWARE.
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 3.25)
 project(bitsery_tests
         LANGUAGES CXX)
 
diff --git a/tests/brief_syntax.cpp b/tests/brief_syntax.cpp
index a0b61e0..85299a6 100644
--- a/tests/brief_syntax.cpp
+++ b/tests/brief_syntax.cpp
@@ -23,14 +23,13 @@
 #include <bitsery/brief_syntax.h>
 #include <bitsery/brief_syntax/array.h>
 #include <bitsery/brief_syntax/atomic.h>
-#include <bitsery/brief_syntax/bitset.h>
 #include <bitsery/brief_syntax/chrono.h>
 #include <bitsery/brief_syntax/deque.h>
 #include <bitsery/brief_syntax/forward_list.h>
 #include <bitsery/brief_syntax/list.h>
 #include <bitsery/brief_syntax/map.h>
 #include <bitsery/brief_syntax/memory.h>
-#include <bitsery/brief_syntax/optional.h>
+
 #include <bitsery/brief_syntax/queue.h>
 #include <bitsery/brief_syntax/set.h>
 #include <bitsery/brief_syntax/stack.h>
@@ -41,6 +40,10 @@
 #if __cplusplus > 201402L
 #include <bitsery/brief_syntax/tuple.h>
 #include <bitsery/brief_syntax/variant.h>
+#if __cplusplus > 202002L
+#include <bitsery/brief_syntax/optional.h>
+#include <bitsery/brief_syntax/bitset.h>
+#endif
 #elif defined(_MSC_VER)
 #pragma message(                                                               \
   "C++17 and /Zc:__cplusplus option is required to enable std::tuple and std::variant brief syntax tests")
@@ -475,12 +478,6 @@ TEST(BriefSyntax, StdAtomic)
               0x1337);
 }
 
-TEST(BriefSyntax, StdBitset)
-{
-  std::bitset<17> bits{ 0b10101010101010101 };
-  EXPECT_TRUE(procBriefSyntax(bits) == bits);
-}
-
 #if __cplusplus > 201402L
 
 TEST(BriefSyntax, StdTuple)
@@ -504,6 +501,16 @@ TEST(BriefSyntax, StdOptional)
   EXPECT_TRUE(procBriefSyntax(opt) == opt);
 }
 
+#if __cplusplus > 202002L
+
+TEST(BriefSyntax, StdBitset)
+{
+  std::bitset<17> bits{ 0b10101010101010101 };
+  EXPECT_TRUE(procBriefSyntax(bits) == bits);
+}
+
+#endif
+
 #endif
 
 TEST(BriefSyntax, NestedTypes)