diff --git a/3.0/windows/2019-full/Dockerfile b/3.0/windows/2019-full/Dockerfile
new file mode 100644
index 00000000..c647da5a
--- /dev/null
+++ b/3.0/windows/2019-full/Dockerfile
@@ -0,0 +1,38 @@
+FROM mcr.microsoft.com/windows:ltsc2019
+
+ENV BUNDLE_SILENCE_ROOT_WARNING=true \
+    GIT_DISCOVERY_ACROSS_FILESYSTEM=true
+
+# When launched by user, default to PowerShell if no other command specified.
+CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+RUN Set-ExecutionPolicy Bypass
+
+ENV chocolateyVersion="1.4.0"
+# Install Chocolatey (and essentials)
+RUN Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+RUN Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+RUN choco feature enable -n=allowGlobalConfirmation
+RUN choco config set cacheLocation C:\chococache
+RUN choco upgrade chocolatey
+RUN choco install git
+RUN Remove-Item -Recurse -Force c:\chococache
+
+ARG RUBY_URL=https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.0.6-1/rubyinstaller-3.0.6-1-x64.exe
+ARG RUBY_FILE=rubyinstaller-3.0.6-1-x64.exe
+ARG RUBY_DIR=c:/ruby30
+
+# Install Ruby + Devkit
+RUN Write-Output 'Downloading Ruby + DevKit'; \
+  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+  (New-Object System.Net.WebClient).DownloadFile(\"$env:RUBY_URL\", \"c:/$env:RUBY_FILE\")
+RUN Write-Output 'Installing Ruby + DevKit'
+RUN Start-Process c:/$env:RUBY_FILE -ArgumentList \"/allusers /verysilent /dir=$env:RUBY_DIR\" -Wait
+
+RUN Write-Output 'Cleaning up installation'
+RUN Remove-Item c:/$env:RUBY_FILE -Force
+RUN Write-Output 'Closing out the layer (this can take awhile)'
+
+
diff --git a/3.0/windows/2019/Dockerfile b/3.0/windows/2019/Dockerfile
index 17a2b60f..07025f04 100644
--- a/3.0/windows/2019/Dockerfile
+++ b/3.0/windows/2019/Dockerfile
@@ -6,8 +6,10 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=true \
 # When launched by user, default to PowerShell if no other command specified.
 CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
 
+ENV chocolateyVersion="1.4.0"
+
 # Install Chocolatey (and essentials)
-RUN powershell -Command "Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
+RUN powershell -Command "Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))" && \
   C:\ProgramData\Chocolatey\bin\refreshenv && \
   choco feature enable -n=allowGlobalConfirmation && \
   choco config set cacheLocation C:\chococache && \
diff --git a/3.1/windows/2019-full/Dockerfile b/3.1/windows/2019-full/Dockerfile
new file mode 100644
index 00000000..7b2f0516
--- /dev/null
+++ b/3.1/windows/2019-full/Dockerfile
@@ -0,0 +1,36 @@
+FROM mcr.microsoft.com/windows:ltsc2019
+
+ENV BUNDLE_SILENCE_ROOT_WARNING=true \
+    GIT_DISCOVERY_ACROSS_FILESYSTEM=true
+
+# When launched by user, default to PowerShell if no other command specified.
+CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+
+RUN Set-ExecutionPolicy Bypass
+
+ENV chocolateyVersion="1.4.0"
+# Install Chocolatey (and essentials)
+RUN Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+RUN Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+RUN choco feature enable -n=allowGlobalConfirmation
+RUN choco config set cacheLocation C:\chococache
+RUN choco install git
+RUN Remove-Item -Recurse -Force c:\chococache
+
+ARG RUBY_URL=https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.4-1/rubyinstaller-3.1.4-1-x64.exe
+ARG RUBY_FILE=rubyinstaller-3.1.4-1-x64.exe
+ARG RUBY_DIR=c:/ruby30
+
+# Install Ruby + Devkit
+RUN Write-Output 'Downloading Ruby + DevKit'; \
+  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
+  (New-Object System.Net.WebClient).DownloadFile(\"$env:RUBY_URL\", \"c:/$env:RUBY_FILE\")
+RUN Write-Output 'Installing Ruby + DevKit'
+RUN Start-Process c:/$env:RUBY_FILE -ArgumentList \"/allusers /verysilent /dir=$env:RUBY_DIR\" -Wait
+RUN Write-Output 'Cleaning up installation'
+RUN Remove-Item c:/$env:RUBY_FILE -Force
+RUN Write-Output 'Closing out the layer (this can take awhile)'
+
diff --git a/3.1/windows/2019/Dockerfile b/3.1/windows/2019/Dockerfile
index 0d56f938..d3403b9e 100644
--- a/3.1/windows/2019/Dockerfile
+++ b/3.1/windows/2019/Dockerfile
@@ -5,25 +5,30 @@ ENV BUNDLE_SILENCE_ROOT_WARNING=true \
 
 # When launched by user, default to PowerShell if no other command specified.
 CMD ["powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
+SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
+
+ENV chocolateyVersion="1.4.0"
 
 # Install Chocolatey (and essentials)
-RUN powershell -Command "Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && \
-  C:\ProgramData\Chocolatey\bin\refreshenv && \
-  choco feature enable -n=allowGlobalConfirmation && \
-  choco config set cacheLocation C:\chococache && \
-  choco upgrade chocolatey && \
-  choco install git && \
-  rmdir /q /s C:\chococache && \
-  echo Chocolatey install complete -- closing out layer (this can take awhile)
+RUN Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+
+RUN Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
+RUN choco feature enable -n=allowGlobalConfirmation
+RUN choco config set cacheLocation C:\chococache
+RUN choco install git
+RUN Remove-Item -Recurse -Force c:\chococache
+
+ARG RUBY_URL=https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.4-1/rubyinstaller-3.1.4-1-x64.exe
+ARG RUBY_FILE=rubyinstaller-3.1.4-1-x64.exe
+ARG RUBY_DIR=c:/ruby30
 
 # Install Ruby + Devkit
-RUN powershell -Command \
-  $ErrorActionPreference = 'Stop'; \
-  Write-Output 'Downloading Ruby + DevKit'; \
+RUN Write-Output 'Downloading Ruby + DevKit'; \
   [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
-  (New-Object System.Net.WebClient).DownloadFile('https://github.com/oneclick/rubyinstaller2/releases/download/RubyInstaller-3.1.1-1/rubyinstaller-devkit-3.1.1-1-x64.exe', 'c:\\rubyinstaller-devkit-3.1.1-1-x64.exe'); \
-  Write-Output 'Installing Ruby + DevKit'; \
-  Start-Process c:\rubyinstaller-devkit-3.1.1-1-x64.exe -ArgumentList '/verysilent /dir=C:\\ruby31' -Wait ; \
-  Write-Output 'Cleaning up installation'; \
-  Remove-Item c:\rubyinstaller-devkit-3.1.1-1-x64.exe -Force; \
-  Write-Output 'Closing out the layer (this can take awhile)';
+  (New-Object System.Net.WebClient).DownloadFile(\"$env:RUBY_URL\", \"c:/$env:RUBY_FILE\")
+RUN Write-Output 'Installing Ruby + DevKit'
+RUN Start-Process c:/$env:RUBY_FILE -ArgumentList \"/allusers /verysilent /dir=$env:RUBY_DIR\" -Wait
+RUN Write-Output 'Cleaning up installation'
+RUN Remove-Item c:/$env:RUBY_FILE -Force
+RUN Write-Output 'Closing out the layer (this can take awhile)'
+
diff --git a/dobi.yaml b/dobi.yaml
index 31a92aa3..6e952051 100644
--- a/dobi.yaml
+++ b/dobi.yaml
@@ -1,11 +1,5 @@
 ---
 # Alma
-image=2_6-almalinux-8:
-  image: '{env.IMAGE_REGISTRY}/almalinux-8'
-  context: 2.6/almalinux/8
-  tags:
-    - '2.6'
-
 image=2_7-almalinux-8:
   image: '{env.IMAGE_REGISTRY}/almalinux-8'
   context: 2.7/almalinux/8
@@ -26,18 +20,6 @@ image=3_1-almalinux-8:
     - '3.1'
 
 # Centos
-image=2_6-centos-7:
-  image: '{env.IMAGE_REGISTRY}/centos-7'
-  context: 2.6/centos/7
-  tags:
-    - '2.6'
-
-image=2_6-centos-8:
-  image: '{env.IMAGE_REGISTRY}/centos-8'
-  context: 2.6/centos/8
-  tags:
-    - '2.6'
-
 image=2_7-centos-7:
   image: '{env.IMAGE_REGISTRY}/centos-7'
   context: 2.7/centos/7
@@ -77,30 +59,12 @@ image=3_1-centos-8:
     - '3.1'
 
 # Fedora
-image=2_6-fedora-22:
-  image: '{env.IMAGE_REGISTRY}/fedora-22'
-  context: 2.6/fedora/22
-  tags:
-    - '2.6'
-
-image=2_6-fedora-latest:
-  image: '{env.IMAGE_REGISTRY}/fedora-latest'
-  context: 2.6/fedora/latest
-  tags:
-    - '2.6'
-
 image=2_7-fedora-22:
   image: '{env.IMAGE_REGISTRY}/fedora-22'
   context: 2.7/fedora/22
   tags:
     - '2.7'
 
-image=2_7-fedora-latest:
-  image: '{env.IMAGE_REGISTRY}/fedora-latest'
-  context: 2.7/fedora/latest
-  tags:
-    - '2.7'
-
 image=3_0-fedora-22:
   image: '{env.IMAGE_REGISTRY}/fedora-22'
   context: 3.0/fedora/22
@@ -129,12 +93,6 @@ image=3_1-fedora-latest:
 
 
 # Opensuse
-image=2_6-opensuse-15:
-  image: '{env.IMAGE_REGISTRY}/opensuse-15'
-  context: 2.6/opensuse/15
-  tags:
-    - '2.6'
-
 image=2_7-opensuse-15:
   image: '{env.IMAGE_REGISTRY}/opensuse-15'
   context: 2.7/opensuse/15
@@ -155,24 +113,6 @@ image=3_1-opensuse-15:
     - '3.1'
 
 # Ubuntu
-image=2_6-ubuntu-18_04:
-  image: '{env.IMAGE_REGISTRY}/ubuntu-18.04'
-  context: 2.6/ubuntu/18.04
-  tags:
-    - '2.6'
-
-image=2_6-ubuntu-20_04:
-  image: '{env.IMAGE_REGISTRY}/ubuntu-20.04'
-  context: 2.6/ubuntu/20.04
-  tags:
-    - '2.6'
-
-image=2_6-ubuntu-22_04:
-  image: '{env.IMAGE_REGISTRY}/ubuntu-22.04'
-  context: 2.6/ubuntu/22.04
-  tags:
-    - '2.6'
-
 image=2_7-ubuntu-18_04:
   image: '{env.IMAGE_REGISTRY}/ubuntu-18.04'
   context: 2.7/ubuntu/18.04
@@ -185,12 +125,6 @@ image=2_7-ubuntu-20_04:
   tags:
     - '2.7'
 
-image=2_7-ubuntu-22_04:
-  image: '{env.IMAGE_REGISTRY}/ubuntu-22.04'
-  context: 2.7/ubuntu/22.04
-  tags:
-    - '2.7'
-
 image=3_0-ubuntu-18_04:
   image: '{env.IMAGE_REGISTRY}/ubuntu-18.04'
   context: 3.0/ubuntu/18.04
@@ -231,15 +165,6 @@ image=3_1-ubuntu-22_04:
     - '3.1'
 
 # Windows
-image=2_6-windows-2019:
-  image: '{env.IMAGE_REGISTRY}/windows-2019'
-  context: 2.6/windows/2019
-  tags:
-    - '2.6'
-  annotations:
-    tags:
-      - expeditor:host-os=windows
-
 image=2_7-windows-2019:
   image: '{env.IMAGE_REGISTRY}/windows-2019'
   context: 2.7/windows/2019
@@ -258,6 +183,16 @@ image=3_0-windows-2019:
     tags:
       - expeditor:host-os=windows
 
+image=3_0-windows-2019-full:
+  image: '{env.IMAGE_REGISTRY}/windows-2019-full'
+  context: 3.0/windows/2019-full
+  tags:
+    - '3.0'
+    - latest
+  annotations:
+    tags:
+      - expeditor:host-os=windows
+
 image=3_1-windows-2019:
   image: '{env.IMAGE_REGISTRY}/windows-2019'
   context: 3.1/windows/2019
@@ -266,4 +201,16 @@ image=3_1-windows-2019:
     - latest
   annotations:
     tags:
-      - expeditor:host-os=windows
\ No newline at end of file
+      - expeditor:host-os=windows
+
+image=3_1-windows-2019-full:
+  image: '{env.IMAGE_REGISTRY}/windows-2019-full'
+  context: 3.1/windows/2019-full
+  tags:
+    - '3.1'
+    - latest
+  annotations:
+    tags:
+      - expeditor:host-os=windows
+
+