diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml
index 95b11a5c..3b51826a 100644
--- a/.github/workflows/commit.yml
+++ b/.github/workflows/commit.yml
@@ -2,46 +2,23 @@ name: Commit
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test_cli:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        name: [linux-gcc-9]
+        name: [linux-gcc-13]
         include:
-          - name: linux-gcc-9
+          - name: linux-gcc-13
             os: ubuntu-22.04
-            compiler: "gcc"
-            version: "9"
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Install (Linux)
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-          # Install compiler
-
-          cc="${{ matrix.compiler }}-${{ matrix.version }}"
-          cc="${cc%-}"
-          cxx="${cc/clang/clang++}"
-          cxx="${cxx/gcc/g++}"
-
-          sudo apt-get update
-          sudo apt-get install -y libtool m4 autoconf
-          if [ "${{ matrix.compiler }}" = "gcc" ]; then
-              sudo apt-get install -y "${cxx}"
-          else
-              sudo apt-get install -y "${cc}"
-          fi
-          echo "CC=${cc}" >> $GITHUB_ENV
-          echo "CXX=${cxx}" >> $GITHUB_ENV
-
     - name: Install bats
       if: runner.os == 'Linux'
       shell: bash
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 3e852c87..7ce32176 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,7 +1,7 @@
 name: Publish Docker
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   docker:
@@ -16,5 +16,5 @@ jobs:
             -H "Travis-API-Version:3" \
             -H "Accept:application/json" \
             -H "Authorization:token ${{secrets.TRAVIS_API_TOKEN}}" \
-            -d '{"request":{"branch":"master"}}' \
+            -d '{"request":{"branch":"main"}}' \
             'https://api.travis-ci.com/repo/pisa-engine%2Fdocker/requests'
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index c0e955a2..c4d973ff 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -2,7 +2,7 @@ name: Pull Request
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -10,10 +10,6 @@ jobs:
     strategy:
       matrix:
         compiler: [gcc13, clang16]
-        standard: [17]
-        include:
-          - compiler: gcc13 # Extra test for C++20
-            standard: 20
 
     steps:
     - uses: actions/checkout@v2
@@ -23,7 +19,7 @@ jobs:
     - name: Bulid docker image
       shell: bash
       run: |
-        docker build --build-arg CXX_STANDARD=${{matrix.standard}} \
+        docker build \
           -t pisa -f- . < "${{runner.workspace}}/pisa/test/docker/${{matrix.compiler}}/Dockerfile"
 
     - name: Test
diff --git a/.github/workflows/trunk.yml b/.github/workflows/trunk.yml
index 080fb2e5..0e49fd60 100644
--- a/.github/workflows/trunk.yml
+++ b/.github/workflows/trunk.yml
@@ -2,7 +2,7 @@ name: Trunk
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -11,16 +11,12 @@ jobs:
       matrix:
         compiler: [gcc10, gcc11, gcc12, gcc13, clang15, clang16]
         build_type: [Debug]
-        standard: [17]
         sanitizers: [OFF]
         include:
-          - compiler: gcc13   # Extra test for C++20
-            standard: 20
           - compiler: gcc13   # Extra test for Release
             build_type: Release
-          - compiler: clang16 # Extra test for C++20
-            standard: 20
-            sanitizers: ON    # Also run with sanitizers
+          - compiler: clang16 # Extra test with sanitizers
+            sanitizers: ON
 
     steps:
     - uses: actions/checkout@v2
@@ -31,7 +27,6 @@ jobs:
       shell: bash
       run: |
         docker build \
-          --build-arg CXX_STANDARD=${{matrix.standard}} \
           --build-arg USE_SANITIZERS=${{matrix.sanitizers}} \
           -t pisa -f- . < "${{runner.workspace}}/pisa/test/docker/${{matrix.compiler}}/Dockerfile"
 
diff --git a/test/docker/benchmark/Dockerfile b/test/docker/benchmark/Dockerfile
index bc095221..b908b996 100644
--- a/test/docker/benchmark/Dockerfile
+++ b/test/docker/benchmark/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:13
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -19,7 +18,6 @@ RUN cmake \
     "-DPISA_ENABLE_TESTING=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DUSE_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/clang11/Dockerfile b/test/docker/clang11/Dockerfile
index c8b64d2d..2d0846f8 100644
--- a/test/docker/clang11/Dockerfile
+++ b/test/docker/clang11/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:bullseye
 
-ARG CXX_STANDARD=17
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY . /pisa
diff --git a/test/docker/clang12/Dockerfile b/test/docker/clang12/Dockerfile
index a0785a38..203242c2 100644
--- a/test/docker/clang12/Dockerfile
+++ b/test/docker/clang12/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:bullseye
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -17,7 +16,6 @@ RUN cmake \
     -DPISA_ENABLE_BENCHMARKING='OFF' \
     -DCMAKE_TOOLCHAIN_FILE='clang.cmake' \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/clang15/Dockerfile b/test/docker/clang15/Dockerfile
index 48b549e4..2a035c98 100644
--- a/test/docker/clang15/Dockerfile
+++ b/test/docker/clang15/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:bullseye
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG DEBIAN_FRONTEND=noninteractive
 ARG BUILD_TYPE=Debug
@@ -23,7 +22,6 @@ RUN cmake \
     -DPISA_SYSTEM_BOOST='ON' \
     -DCMAKE_TOOLCHAIN_FILE='clang.cmake' \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/clang16/Dockerfile b/test/docker/clang16/Dockerfile
index cce80395..4eab5c7d 100644
--- a/test/docker/clang16/Dockerfile
+++ b/test/docker/clang16/Dockerfile
@@ -1,6 +1,5 @@
 FROM debian:bullseye
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG DEBIAN_FRONTEND=noninteractive
 ARG BUILD_TYPE=Debug
@@ -23,7 +22,6 @@ RUN cmake \
     -DPISA_SYSTEM_BOOST='ON' \
     -DCMAKE_TOOLCHAIN_FILE='clang.cmake' \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/gcc10/Dockerfile b/test/docker/gcc10/Dockerfile
index 67b26fa4..344be242 100644
--- a/test/docker/gcc10/Dockerfile
+++ b/test/docker/gcc10/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:10
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG BUILD_TYPE=Debug
 
@@ -17,7 +16,6 @@ RUN cmake \
     "-DPISA_BUILD_TOOLS=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/gcc11/Dockerfile b/test/docker/gcc11/Dockerfile
index 9a2c1899..9a6fa8fd 100644
--- a/test/docker/gcc11/Dockerfile
+++ b/test/docker/gcc11/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:11
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG BUILD_TYPE=Debug
 
@@ -17,7 +16,6 @@ RUN cmake \
     "-DPISA_BUILD_TOOLS=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/gcc12/Dockerfile b/test/docker/gcc12/Dockerfile
index d96c47f1..93d4faf4 100644
--- a/test/docker/gcc12/Dockerfile
+++ b/test/docker/gcc12/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:12
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG BUILD_TYPE=Debug
 
@@ -17,7 +16,6 @@ RUN cmake \
     "-DPISA_BUILD_TOOLS=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/gcc13/Dockerfile b/test/docker/gcc13/Dockerfile
index ba73f778..848a7a11 100644
--- a/test/docker/gcc13/Dockerfile
+++ b/test/docker/gcc13/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:13
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 ARG BUILD_TYPE=Debug
 
@@ -17,7 +16,6 @@ RUN cmake \
     "-DPISA_BUILD_TOOLS=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/gcc9/Dockerfile b/test/docker/gcc9/Dockerfile
index a3ceb15d..daa0fe34 100644
--- a/test/docker/gcc9/Dockerfile
+++ b/test/docker/gcc9/Dockerfile
@@ -1,6 +1,5 @@
 FROM gcc:9
 
-ARG CXX_STANDARD=17
 ARG USE_SANITIZERS=OFF
 
 ENV DEBIAN_FRONTEND=noninteractive
@@ -16,7 +15,6 @@ RUN cmake \
     "-DPISA_BUILD_TOOLS=OFF" \
     "-DPISA_ENABLE_BENCHMARKING=OFF" \
     "-DPISA_SANITIZERS=$USE_SANITIZERS" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4
 
diff --git a/test/docker/system-deps/Dockerfile b/test/docker/system-deps/Dockerfile
index 8894b5c5..96b05a8e 100644
--- a/test/docker/system-deps/Dockerfile
+++ b/test/docker/system-deps/Dockerfile
@@ -1,7 +1,5 @@
 FROM gcc:13
 
-ARG CXX_STANDARD=17
-
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/New_York
 
@@ -32,7 +30,6 @@ RUN cmake \
     "-DPISA_SYSTEM_ONETBB=ON" \
     "-DPISA_SYSTEM_BOOST=ON" \
     "-DPISA_SYSTEM_CLI11=ON" \
-    "-DCMAKE_CXX_STANDARD=$CXX_STANDARD" \
     .. \
     && cmake --build . --config Debug -- -j 4