diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 517b302..0ea2fde 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,6 @@ on:
       - feature/**
 
 env:
-  LIBRARY: mp11
   UBSAN_OPTIONS: print_stacktrace=1
 
 jobs:
@@ -19,94 +18,94 @@ jobs:
       matrix:
         include:
           - toolset: gcc-4.7
-            cxxstd: "11"
+            cxxstd: "03,11"
             os: ubuntu-16.04
             install: g++-4.7
           - toolset: gcc-4.8
-            cxxstd: "11"
+            cxxstd: "03,11"
             os: ubuntu-16.04
             install: g++-4.8
           - toolset: gcc-4.9
-            cxxstd: "11"
+            cxxstd: "03,11"
             os: ubuntu-16.04
             install: g++-4.9
           - toolset: gcc-5
-            cxxstd: "11,14,1z"
+            cxxstd: "03,11,14,1z"
             os: ubuntu-16.04
           - toolset: gcc-6
-            cxxstd: "11,14,1z"
+            cxxstd: "03,11,14,1z"
             os: ubuntu-16.04
             install: g++-6
           - toolset: gcc-7
-            cxxstd: "11,14,17"
+            cxxstd: "03,11,14,17"
             os: ubuntu-18.04
           - toolset: gcc-8
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
           - toolset: gcc-9
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
           - toolset: gcc-10
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-18.04
           - toolset: clang
             compiler: clang++-3.5
-            cxxstd: "11,14"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-3.5
           - toolset: clang
             compiler: clang++-3.6
-            cxxstd: "11,14"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-3.6
           - toolset: clang
             compiler: clang++-3.7
-            cxxstd: "11,14"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-3.7
           - toolset: clang
             compiler: clang++-3.8
-            cxxstd: "11,14"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-3.8
           - toolset: clang
             compiler: clang++-3.9
-            cxxstd: "11,14"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-3.9
           - toolset: clang
             compiler: clang++-4.0
-            cxxstd: "11,14,1z"
+            cxxstd: "03,11,14"
             os: ubuntu-16.04
             install: clang-4.0
           - toolset: clang
             compiler: clang++-5.0
-            cxxstd: "11,14,1z"
+            cxxstd: "03,11,14,1z"
             os: ubuntu-16.04
             install: clang-5.0
           - toolset: clang
             compiler: clang++-6.0
-            cxxstd: "11,14,17"
+            cxxstd: "03,11,14,17"
             os: ubuntu-18.04
           - toolset: clang
             compiler: clang++-7
-            cxxstd: "11,14,17"
+            cxxstd: "03,11,14,17"
             os: ubuntu-18.04
             install: clang-7
           - toolset: clang
             compiler: clang++-8
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
           - toolset: clang
             compiler: clang++-9
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
           - toolset: clang
             compiler: clang++-10
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: ubuntu-20.04
           - toolset: clang
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             os: macos-10.15
 
     runs-on: ${{matrix.os}}
@@ -120,8 +119,17 @@ jobs:
 
       - name: Setup Boost
         run: |
+          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
+          LIBRARY=${GITHUB_REPOSITORY#*/}
+          echo LIBRARY: $LIBRARY
+          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
+          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
+          echo GITHUB_REF: $GITHUB_REF
           REF=${GITHUB_BASE_REF:-$GITHUB_REF}
+          REF=${REF#refs/heads/}
+          echo REF: $REF
           BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
+          echo BOOST_BRANCH: $BOOST_BRANCH
           cd ..
           git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
@@ -155,7 +163,7 @@ jobs:
             addrmd: 32,64
             os: windows-2019
           - toolset: gcc
-            cxxstd: "11,14,17,2a"
+            cxxstd: "03,11,14,17,2a"
             addrmd: 64
             os: windows-2019
 
@@ -167,9 +175,16 @@ jobs:
       - name: Setup Boost
         shell: cmd
         run: |
+          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
+          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
+          echo LIBRARY: %LIBRARY%
+          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
+          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
+          echo GITHUB_REF: %GITHUB_REF%
           if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
           set BOOST_BRANCH=develop
-          if "%GITHUB_BASE_REF%" == "master" set BOOST_BRANCH=master
+          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
+          echo BOOST_BRANCH: %BOOST_BRANCH%
           cd ..
           git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root