diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
index 706653a..d2d3ff3 100644
--- a/.github/workflows/Anchore-Container-Scan.yml
+++ b/.github/workflows/Anchore-Container-Scan.yml
@@ -1,6 +1,6 @@
 name: Anchore-Container-Scan
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   push:
@@ -43,7 +43,7 @@ jobs:
         with:
           fetch-depth: 2
           submodules: false
-        
+
       # - name: Run CI
       #   env:
       #     FROM:       ${{ matrix.FROM }}
diff --git a/.github/workflows/fortify-on-demand-scan.yml b/.github/workflows/fortify-on-demand-scan.yml
index 3c6e603..57bdccf 100644
--- a/.github/workflows/fortify-on-demand-scan.yml
+++ b/.github/workflows/fortify-on-demand-scan.yml
@@ -1,11 +1,9 @@
 name: Fortify on Demand Scan
 
-# Controls when the action will run. 
+# Controls when the action will run.
 on:
-  push:
-    # branches: ['master', '[0-9]?.[0-9]?.x']
-  pull_request:
-    # branches: ['master', '[0-9]?.[0-9]?.x']
+#   push:
+#   pull_request:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
diff --git a/script/bootstrap b/script/bootstrap
index a50ed78..1f1783b 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -25,7 +25,7 @@
 set -e
 
 echo "------------------------------"
-echo "--- bootstrap | 2021-08-29 ---"
+echo "--- bootstrap | 2021-09-16 ---"
 echo "------------------------------"
 
 if [ -f /etc/os-release ]
@@ -65,6 +65,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libpostproc-dev \
@@ -94,6 +95,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libpostproc-dev \
@@ -110,7 +112,6 @@ then
     apt-get -qy upgrade
     apt-get -qy install \
                     git \
-                    cmake \
                     build-essential \
                     automake \
                     autoconf \
@@ -132,7 +133,9 @@ then
                     libboost-regex-dev \
                     libxmu-dev \
                     clang \
-                    lsb-release
+                    lsb-release \
+                    python3-pip
+    pip3 install --upgrade-strategy eager cmake
 elif [ $LINUX_ID == "ubuntu" ] && [ $LINUX_CODENAME == "hirsute" ]
 then
     apt-get update
@@ -153,6 +156,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libopengl0 \
@@ -184,6 +188,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libopengl0 \
@@ -214,6 +219,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libopengl0 \
@@ -232,7 +238,8 @@ then
     apt-get -qy install \
                     git \
                     build-essential \
-                    libgl1-mesa-glx \
+                    libglvnd-dev \
+                    libgl1-mesa-dev \
                     freeglut3-dev \
                     libopenal-dev \
                     libsdl-gfx1.2-dev \
@@ -254,9 +261,8 @@ then
     apt-get -qy upgrade
     apt-get -qy install \
                     git \
-                    cmake \
                     build-essential \
-                    libgl1-mesa-glx \
+                    libgl1-mesa-dev \
                     freeglut3-dev \
                     libopenal-dev \
                     libsdl-gfx1.2-dev \
@@ -270,7 +276,9 @@ then
                     libxmu-dev \
                     clang \
                     lsb-release \
-                    python3-dev
+                    python3-dev \
+                    python3-pip
+    pip3 install cmake
 elif [ $LINUX_ID == "linuxmint" ] && [ $LINUX_CODENAME == "ulyana" ]
 then
     apt-get update
@@ -290,6 +298,7 @@ then
                     libopenal-dev \
                     libogg-dev \
                     libvorbis-dev \
+                    libglvnd-dev \
                     libgl1-mesa-dev \
                     libsdl1.2-dev \
                     libopengl0 \