diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 884233ce..7b926e27 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,8 +21,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-4.4"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -33,8 +32,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-4.6"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -45,8 +43,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-4.7"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -57,8 +54,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-4.8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -69,8 +65,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-4.9"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -81,8 +76,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-5"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -93,8 +87,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-6"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -105,8 +98,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-7"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -117,8 +109,7 @@ jobs:
             buildtype: "boost"
             packages: "g++-8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -129,8 +120,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-3.5"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -141,8 +131,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-3.6"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -153,8 +142,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-3.7"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -165,8 +153,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-3.8"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -177,8 +164,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-3.9"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -189,8 +175,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-4.0"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: ""
@@ -201,8 +186,7 @@ jobs:
             buildtype: "boost"
             packages: "clang-5.0"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: "xenial"
@@ -213,25 +197,23 @@ jobs:
             buildtype: "boost"
             packages: "clang-6.0"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: "xenial"
             llvm_ver: "6.0"
             toolset: "clang-6.0"
             cxxstd: "03,11,14,17,2a"
-          - name: "TOOLSET=clang-7 CXXSTD=03,11,14,17,2a Job 17"
+          - name: "TOOLSET=clang-7.0 CXXSTD=03,11,14,17,2a Job 17"
             buildtype: "boost"
             packages: "clang-7"
             packages_to_remove: ""
-            os: "ubuntu-20.04"
-            container: "ubuntu:16.04"
+            os: "ubuntu-16.04"
             cxx: "g++"
             sources: ""
             llvm_os: "xenial"
             llvm_ver: "7"
-            toolset: "clang-7"
+            toolset: "clang-7.0"
             cxxstd: "03,11,14,17,2a"
 
     runs-on: ${{ matrix.os }}
@@ -241,16 +223,6 @@ jobs:
       - name: Check if running in container
         if: matrix.container != ''
         run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
-      - name: If running in container, upgrade packages
-        if: matrix.container != ''
-        run: |
-            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev
-            sudo apt-add-repository ppa:git-core/ppa
-            sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
-            python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
-            sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
-            sudo python3 get-pip.py
-            sudo /usr/local/bin/pip install cmake
 
       - uses: actions/checkout@v2
 
@@ -464,4 +436,4 @@ jobs:
 
           ./b2 -j`(nproc || sysctl -n hw.ncpu) 2> /dev/null` libs/fusion/test toolset=$TOOLSET cxxstd=$CXXSTD
 
-          fi
\ No newline at end of file
+          fi