diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc
diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx
index 64977c8..9dcb957 100644
--- a/Dockerfile.build.macosx
+++ b/Dockerfile.build.macosx
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,44 +9,24 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
-# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools
 RUN apt-get install -y clang clang-tidy clang-format clang-tools
 
 # Install Build Tools
 ADD osxcross.tar.bz2 ./
 
 # Install Build Tool Dependancy
-RUN apt-get install -y libxml2-dev
+RUN apt-get install -y libxml2-dev libtinfo5
 
 RUN apt-get install -y wget
-# RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install ./libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
 RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
 RUN apt-get install ./libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install -y libssl1.0.0
-# uuid-dev libssl-dev
-# bash patch tar xz-utils bzip2 gzip sed cpio libbz2-dev zlib1g-dev
-
-RUN apt-get install libtinfo5
 
 # Configure Environment Variables
-ENV LD_LIBRARY_PATH="/osxcross/lib:${LD_LIBRARY_PATH}"
+ENV LD_LIBRARY_PATH="/osxcross/lib:/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
 ENV PATH="/osxcross/bin:${PATH}"
 
-# Create links for clang for version 10
-# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20
-# RUN update-alternatives --install /usr/bin/clang   clang   /usr/bin/clang-14   20
-# RUN update-alternatives --install /usr/bin/lld     lld     /usr/bin/lld-14     20
-# RUN update-alternatives --set clang++ /usr/bin/clang++-14
-# RUN update-alternatives --set clang   /usr/bin/clang-14
-# RUN update-alternatives --set lld     /usr/bin/lld-14
-
-# RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"
-

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc
diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx
index 64977c8..9dcb957 100644
--- a/Dockerfile.build.macosx
+++ b/Dockerfile.build.macosx
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,44 +9,24 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
-# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools
 RUN apt-get install -y clang clang-tidy clang-format clang-tools
 
 # Install Build Tools
 ADD osxcross.tar.bz2 ./
 
 # Install Build Tool Dependancy
-RUN apt-get install -y libxml2-dev
+RUN apt-get install -y libxml2-dev libtinfo5
 
 RUN apt-get install -y wget
-# RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install ./libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
 RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
 RUN apt-get install ./libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install -y libssl1.0.0
-# uuid-dev libssl-dev
-# bash patch tar xz-utils bzip2 gzip sed cpio libbz2-dev zlib1g-dev
-
-RUN apt-get install libtinfo5
 
 # Configure Environment Variables
-ENV LD_LIBRARY_PATH="/osxcross/lib:${LD_LIBRARY_PATH}"
+ENV LD_LIBRARY_PATH="/osxcross/lib:/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
 ENV PATH="/osxcross/bin:${PATH}"
 
-# Create links for clang for version 10
-# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20
-# RUN update-alternatives --install /usr/bin/clang   clang   /usr/bin/clang-14   20
-# RUN update-alternatives --install /usr/bin/lld     lld     /usr/bin/lld-14     20
-# RUN update-alternatives --set clang++ /usr/bin/clang++-14
-# RUN update-alternatives --set clang   /usr/bin/clang-14
-# RUN update-alternatives --set lld     /usr/bin/lld-14
-
-# RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"
-
diff --git a/Dockerfile.build.windows b/Dockerfile.build.windows
index 4ec4a3c..f35969b 100644
--- a/Dockerfile.build.windows
+++ b/Dockerfile.build.windows
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc
diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx
index 64977c8..9dcb957 100644
--- a/Dockerfile.build.macosx
+++ b/Dockerfile.build.macosx
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,44 +9,24 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
-# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools
 RUN apt-get install -y clang clang-tidy clang-format clang-tools
 
 # Install Build Tools
 ADD osxcross.tar.bz2 ./
 
 # Install Build Tool Dependancy
-RUN apt-get install -y libxml2-dev
+RUN apt-get install -y libxml2-dev libtinfo5
 
 RUN apt-get install -y wget
-# RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install ./libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
 RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
 RUN apt-get install ./libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install -y libssl1.0.0
-# uuid-dev libssl-dev
-# bash patch tar xz-utils bzip2 gzip sed cpio libbz2-dev zlib1g-dev
-
-RUN apt-get install libtinfo5
 
 # Configure Environment Variables
-ENV LD_LIBRARY_PATH="/osxcross/lib:${LD_LIBRARY_PATH}"
+ENV LD_LIBRARY_PATH="/osxcross/lib:/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
 ENV PATH="/osxcross/bin:${PATH}"
 
-# Create links for clang for version 10
-# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20
-# RUN update-alternatives --install /usr/bin/clang   clang   /usr/bin/clang-14   20
-# RUN update-alternatives --install /usr/bin/lld     lld     /usr/bin/lld-14     20
-# RUN update-alternatives --set clang++ /usr/bin/clang++-14
-# RUN update-alternatives --set clang   /usr/bin/clang-14
-# RUN update-alternatives --set lld     /usr/bin/lld-14
-
-# RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"
-
diff --git a/Dockerfile.build.windows b/Dockerfile.build.windows
index 4ec4a3c..f35969b 100644
--- a/Dockerfile.build.windows
+++ b/Dockerfile.build.windows
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.documentation b/Dockerfile.documentation
new file mode 100644
index 0000000..6ed15b2
--- /dev/null
+++ b/Dockerfile.documentation
@@ -0,0 +1,18 @@
+# - Base --------------------------------------
+
+# Setup base operating system
+FROM ubuntu:22.04
+RUN apt-get update
+
+# Set noninteractive installation
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Australia/Brisbane
+
+# Install Base Build Tools
+RUN apt-get install -y make git python3 cmake
+
+# -------------------------------------------
+
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc
diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx
index 64977c8..9dcb957 100644
--- a/Dockerfile.build.macosx
+++ b/Dockerfile.build.macosx
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,44 +9,24 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
-# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools
 RUN apt-get install -y clang clang-tidy clang-format clang-tools
 
 # Install Build Tools
 ADD osxcross.tar.bz2 ./
 
 # Install Build Tool Dependancy
-RUN apt-get install -y libxml2-dev
+RUN apt-get install -y libxml2-dev libtinfo5
 
 RUN apt-get install -y wget
-# RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install ./libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
 RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
 RUN apt-get install ./libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install -y libssl1.0.0
-# uuid-dev libssl-dev
-# bash patch tar xz-utils bzip2 gzip sed cpio libbz2-dev zlib1g-dev
-
-RUN apt-get install libtinfo5
 
 # Configure Environment Variables
-ENV LD_LIBRARY_PATH="/osxcross/lib:${LD_LIBRARY_PATH}"
+ENV LD_LIBRARY_PATH="/osxcross/lib:/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
 ENV PATH="/osxcross/bin:${PATH}"
 
-# Create links for clang for version 10
-# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20
-# RUN update-alternatives --install /usr/bin/clang   clang   /usr/bin/clang-14   20
-# RUN update-alternatives --install /usr/bin/lld     lld     /usr/bin/lld-14     20
-# RUN update-alternatives --set clang++ /usr/bin/clang++-14
-# RUN update-alternatives --set clang   /usr/bin/clang-14
-# RUN update-alternatives --set lld     /usr/bin/lld-14
-
-# RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"
-
diff --git a/Dockerfile.build.windows b/Dockerfile.build.windows
index 4ec4a3c..f35969b 100644
--- a/Dockerfile.build.windows
+++ b/Dockerfile.build.windows
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.documentation b/Dockerfile.documentation
new file mode 100644
index 0000000..6ed15b2
--- /dev/null
+++ b/Dockerfile.documentation
@@ -0,0 +1,18 @@
+# - Base --------------------------------------
+
+# Setup base operating system
+FROM ubuntu:22.04
+RUN apt-get update
+
+# Set noninteractive installation
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Australia/Brisbane
+
+# Install Base Build Tools
+RUN apt-get install -y make git python3 cmake
+
+# -------------------------------------------
+
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
diff --git a/Dockerfile.lint b/Dockerfile.lint
index 5aa5b9e..1bd8eb7 100644
--- a/Dockerfile.lint
+++ b/Dockerfile.lint
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,10 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format

diff --git a/Dockerfile.base b/Dockerfile.base
index a520883..9a2d597 100644
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,8 +1,5 @@
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,5 +7,5 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
diff --git a/Dockerfile.build b/Dockerfile.build
index 317cc43..946721a 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,20 +9,19 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
-
-# Install Compilers
-RUN apt-get install -y g++ gcc
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
 
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
+# Install Compilers
+RUN apt-get install -y g++ gcc
+
 # Install Build Tools
 RUN apt-get install -y gdb flex bison
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.build.linux b/Dockerfile.build.linux
index b854c13..44fe9d1 100644
--- a/Dockerfile.build.linux
+++ b/Dockerfile.build.linux
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y g++ gcc
diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx
index 64977c8..9dcb957 100644
--- a/Dockerfile.build.macosx
+++ b/Dockerfile.build.macosx
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,44 +9,24 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
-# RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools
 RUN apt-get install -y clang clang-tidy clang-format clang-tools
 
 # Install Build Tools
 ADD osxcross.tar.bz2 ./
 
 # Install Build Tool Dependancy
-RUN apt-get install -y libxml2-dev
+RUN apt-get install -y libxml2-dev libtinfo5
 
 RUN apt-get install -y wget
-# RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install ./libssl1.0-dev_1.0.2n-1ubuntu5.13_amd64.deb
 RUN wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
 RUN apt-get install ./libssl1.0.0_1.0.2n-1ubuntu5.13_amd64.deb
-# RUN apt-get install -y libssl1.0.0
-# uuid-dev libssl-dev
-# bash patch tar xz-utils bzip2 gzip sed cpio libbz2-dev zlib1g-dev
-
-RUN apt-get install libtinfo5
 
 # Configure Environment Variables
-ENV LD_LIBRARY_PATH="/osxcross/lib:${LD_LIBRARY_PATH}"
+ENV LD_LIBRARY_PATH="/osxcross/lib:/usr/lib/llvm-14/lib:${LD_LIBRARY_PATH}"
 ENV PATH="/osxcross/bin:${PATH}"
 
-# Create links for clang for version 10
-# RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20
-# RUN update-alternatives --install /usr/bin/clang   clang   /usr/bin/clang-14   20
-# RUN update-alternatives --install /usr/bin/lld     lld     /usr/bin/lld-14     20
-# RUN update-alternatives --set clang++ /usr/bin/clang++-14
-# RUN update-alternatives --set clang   /usr/bin/clang-14
-# RUN update-alternatives --set lld     /usr/bin/lld-14
-
-# RUN ln -s /usr/lib/llvm-14/lib/libLTO.so.14 /usr/lib/llvm-14/lib/libLTO.dylib
-ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/lib/llvm-14/lib"
-
diff --git a/Dockerfile.build.windows b/Dockerfile.build.windows
index 4ec4a3c..f35969b 100644
--- a/Dockerfile.build.windows
+++ b/Dockerfile.build.windows
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,13 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Build Tools
-RUN apt-get install -y cmake
-
-# Install Documentation Tools
-RUN apt-get install -y doxygen graphviz # plantuml
+# -------------------------------------------
 
 # Install Compilers
 RUN apt-get install -y mingw-w64-common mingw-w64-tools mingw-w64 mingw-w64-i686-dev mingw-w64-x86-64-dev
diff --git a/Dockerfile.documentation b/Dockerfile.documentation
new file mode 100644
index 0000000..6ed15b2
--- /dev/null
+++ b/Dockerfile.documentation
@@ -0,0 +1,18 @@
+# - Base --------------------------------------
+
+# Setup base operating system
+FROM ubuntu:22.04
+RUN apt-get update
+
+# Set noninteractive installation
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Australia/Brisbane
+
+# Install Base Build Tools
+RUN apt-get install -y make git python3 cmake
+
+# -------------------------------------------
+
+# Install Documentation Tools
+RUN apt-get install -y doxygen graphviz plantuml
+
diff --git a/Dockerfile.lint b/Dockerfile.lint
index 5aa5b9e..1bd8eb7 100644
--- a/Dockerfile.lint
+++ b/Dockerfile.lint
@@ -1,8 +1,7 @@
+# - Base --------------------------------------
+
+# Setup base operating system
 FROM ubuntu:22.04
-
-# Work around for 16.04 host which has old docker version
-# RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean
-
 RUN apt-get update
 
 # Set noninteractive installation
@@ -10,10 +9,9 @@
 ENV TZ=Australia/Brisbane
 
 # Install Base Build Tools
-RUN apt-get install -y make git python3
+RUN apt-get install -y make git python3 cmake
 
-# Install Tools
-RUN apt-get install -y cmake doxygen graphviz
+# -------------------------------------------
 
 # Install Linting Tools
 RUN apt-get install -y clang clang-tidy clang-format
diff --git a/Jenkinsfile b/Jenkinsfile
index 42a309b..3be0d68 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,6 +7,7 @@
               echo 'Building..'
               sh 'docker build --tag base                ./ -f Dockerfile.base'
               sh 'docker build --tag lint-agent          ./ -f Dockerfile.lint'
+              sh 'docker build --tag documentation-agent ./ -f Dockerfile.documentation'
               sh 'docker build --tag linux-build-agent   ./ -f Dockerfile.build.linux'
               sh 'docker build --tag windows-build-agent ./ -f Dockerfile.build.windows'
               sh 'docker build --tag macosx-build-agent  ./ -f Dockerfile.build.macosx'