diff --git a/.github/workflows/build-ubuntu-2004.yml b/.github/workflows/build-ubuntu-2204.yml
similarity index 82%
rename from .github/workflows/build-ubuntu-2004.yml
rename to .github/workflows/build-ubuntu-2204.yml
index 1c5ef2a25..e8f456bbc 100644
--- a/.github/workflows/build-ubuntu-2004.yml
+++ b/.github/workflows/build-ubuntu-2204.yml
@@ -1,4 +1,4 @@
-name: C/C++ CI on Ubuntu 18:04
+name: C/C++ CI on Ubuntu 22.04
 
 on:
   push:
@@ -28,11 +28,11 @@ jobs:
     strategy:
       matrix:
         config: [release, debug]
-        os: [ubuntu-20.04]
+        os: [ubuntu-22.04]
     
     steps:
     - name: Checkout
       uses: actions/checkout@v1
       continue-on-error: true
     - name: Test ${{ matrix.os }} ${{ matrix.config }}
-      run: ./build-tests.sh ${{ matrix.config }}
+      run: ./build-tests.sh ${{ matrix.config }}
\ No newline at end of file
diff --git a/README.md b/README.md
index 892eb5d62..5672cd100 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,7 @@ Other resources to learn how to setup the build system:
   | Mac OS X 10.12.6              | Clang Xcode 9.0, 9.1             |
   | Mac OS X 10.13.3              | Clang Xcode 9.2, 9.3, 10.0, 10.1 |
   | Raspbian GNU/Linux 8 (jessie) | GCC 4.9.2 (armv7l)               |
-  | Ubuntu 14.04.x LTS            | GCC 5.x.x                        |
-  | Ubuntu 16.04 LTS              | GCC 5.x.x, GCC 5.x.x (armv7l)    |
-  | Ubuntu 18.04 LTS              | GCC 7.5.x                        |  
+  | Ubuntu 22.04 LTS              | GCC 11.x.x                       |
   | Windows 10                    | Android Studio/Gradle            |
   | Windows Server 2016           | Visual Studio 2017 (vc141)       |
   | Windows Server 2022           | Visual Studio 2022 (vc143)       |
@@ -86,10 +84,8 @@ Other resources to learn how to setup the build system:
   | Linux (x86, x64, arm, aarch64) | :white_check_mark: |                    |
   | Mac OS X 10.11+                | :white_check_mark: |                    |
   | Mac OS X (latest)              | :white_check_mark: | :white_check_mark: |
-  | Ubuntu 14.04.x LTS             | :white_check_mark: |                    |
-  | Ubuntu 16.04.x LTS             | :white_check_mark: |                    |
-  | Ubuntu 18.04.x LTS             | :white_check_mark: |                    |
   | Ubuntu 20.04.x LTS             | :white_check_mark: | :white_check_mark: |
+  | Ubuntu 22.04.x LTS             | :white_check_mark: | :white_check_mark: |
   | Ubuntu (latest)                | :white_check_mark: | :white_check_mark: |
   | Windows 7.1                    | :white_check_mark: |                    |
   | Windows 8.1                    | :white_check_mark: |                    |
diff --git a/docker/ubuntu22.04/Dockerfile b/docker/ubuntu22.04/Dockerfile
new file mode 100644
index 000000000..63aac8f2e
--- /dev/null
+++ b/docker/ubuntu22.04/Dockerfile
@@ -0,0 +1,22 @@
+FROM ubuntu:22.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# Package installation
+RUN apt-get update
+
+## Common packages for linux build environment
+RUN apt install -y clang python3 pkg-config git curl nghttp2 bzip2 unzip make wget cmake sudo
+
+RUN adduser --disabled-password --gecos '' docker
+RUN adduser docker sudo
+RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
+## RUN useradd -m docker && echo "docker:docker" | chpasswd && adduser docker sudo
+## USER docker
+
+# this is where I was running into problems with the other approaches
+RUN sudo apt-get update
+
+CMD /bin/bash
+
+# ENTRYPOINT bash