diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fa1ca44..b391c05 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -17,37 +17,32 @@ concurrency:
 jobs:
   handle-syncwith:
     name: Call Reusable SyncWith Handler
-    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.0
+    uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1.2.1
     with:
-      ci-cd-ref: 'v1.2.0'
+      ci-cd-ref: 'v1.2.1'
     secrets: inherit
 
   test-linux:
     name: Linux Reusable Crypto3 Testing
     needs:
       - handle-syncwith
-    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@fc033b4fe60244ce95b240adf18a0623961cb9d5
+    uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-linux.yml@1bd56b12f410f3f1a4891076705a9261a6b1efaa
+
     secrets: inherit
     with:
       submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
       check-names: |
         block-clang
 
-  # Temporarily disable mac tests, they fail.
   # test-mac:
   #   name: Mac Reusable Crypto3 Testing
   #   needs:
   #     - handle-syncwith
-  #   uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-mac.yml@fc033b4fe60244ce95b240adf18a0623961cb9d5
+  #   uses: NilFoundation/crypto3/.github/workflows/reusable-submodule-testing-mac.yml@ede1d6b903078a0aa48a6864ba465b66af4fda8b
+
   #   secrets: inherit
   #   with:
   #     submodules-refs: ${{ needs.handle-syncwith.outputs.prs-refs }}
   #     check-names: |
   #       block-clang
 
-  publish-results:
-    name: Publish JUnit results
-    needs:
-      - test-linux
-      # - test-mac
-    uses: NilFoundation/crypto3/.github/workflows/reusable-publish-result.yml@fc033b4fe60244ce95b240adf18a0623961cb9d5
diff --git a/.github/workflows/set_version.yml b/.github/workflows/set_version.yml
new file mode 100644
index 0000000..0a969d6
--- /dev/null
+++ b/.github/workflows/set_version.yml
@@ -0,0 +1,30 @@
+name: Set version
+
+on:
+  # Triggers the workflow on push to master branch
+  push:
+    branches: [ master ]
+
+jobs:
+  set_version:
+    name: Set and tag version
+    runs-on: [ubuntu-latest]
+    env:
+      VERSION_FILE_NAME: VERSION
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Set version
+      id: set_version
+      run: |
+        version=$(cat ${{ env.VERSION_FILE_NAME }} | tr -d '\r').$GITHUB_RUN_NUMBER
+        echo "VERSION=$version" >> $GITHUB_ENV
+
+    - name: Tag new version
+      run: git tag v${{ env.VERSION }}
+
+    - name: Push tags
+      uses: ad-m/github-push-action@master
+      with:
+        tags: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb61d3e..8534b54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,16 +27,8 @@ endif()
 
 cm_project(block WORKSPACE_NAME ${CMAKE_WORKSPACE_NAME} LANGUAGES C CXX)
 
-macro(cm_find_package NAME)
-    if(NOT "${NAME}" MATCHES "^${CMAKE_WORKSPACE_NAME}_.*$" AND NOT "${NAME}" STREQUAL CM)
-        find_package(${ARGV})
-    else()
-        set(${ARGV0}_FOUND ON CACHE BOOL "")
-    endif()
-endmacro()
-
 if((NOT Boost_CONTAINER_FOUND OR NOT Boost_FOUND) AND NOT CMAKE_CROSSCOMPILING)
-    cm_find_package(Boost COMPONENTS REQUIRED container)
+    find_package(Boost COMPONENTS REQUIRED container)
 endif()
 
 include(TargetArchitecture)
@@ -46,8 +38,6 @@ include(PlatformConfiguration)
 include(CheckSSE)
 include(CheckAVX)
 
-option(BUILD_TESTS "Build unit tests" FALSE)
-
 option(${CMAKE_UPPER_WORKSPACE_NAME}_${CURRENT_UPPER_PROJECT_NAME}_AES
        "Build with AES block encryption support" TRUE)
 option(${CMAKE_UPPER_WORKSPACE_NAME}_${CURRENT_UPPER_PROJECT_NAME}_ARIA
diff --git a/cmake/modules b/cmake/modules
index 5e6b354..5763974 160000
--- a/cmake/modules
+++ b/cmake/modules
@@ -1 +1 @@
-Subproject commit 5e6b354eaa69f6a275992e08220e925c34ba0a19
+Subproject commit 57639741ecf018835deb97a04db2200241d7fbd3
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4718a14..5c9851c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,7 +7,7 @@
 #---------------------------------------------------------------------------#
 
 if(NOT Boost_UNIT_TEST_FRAMEWORK_FOUND)
-    cm_find_package(Boost REQUIRED COMPONENTS unit_test_framework)
+    find_package(Boost REQUIRED COMPONENTS unit_test_framework)
 endif()
 
 cm_test_link_libraries(${CMAKE_WORKSPACE_NAME}_${CURRENT_PROJECT_NAME}