diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 3698a72..24b0095 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,10 +1,15 @@
+## Description
+
+<!-- Please explain what is being changed or added as a short overview for this PR. Also, link existing relevant issues if they exist with resolves # -->
+
 ### All Submissions:
 
 * [ ] Have you ensured there aren't other open [Pull Requests](../pulls) for the same update or change?
 * [ ] Have you created a new branch for your changes and PR from that branch and not from your master branch?
-* [ ] Have you added an explanation of what your changes do and why you'd like us to include them?
+
+<!-- The new image submission below can be removed if you are not adding a new image -->
 
 ### New Image Submissions:
 
 1. [ ] Have you added your image to the [Github workflows](https://github.com/parkervcp/yolks/tree/master/.github/workflows)?
-2. [ ] Have you updated the README list to contain your new image?
\ No newline at end of file
+2. [ ] Have you updated the README list to contain your new image?
diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml
index 98f8534..2c3caf9 100644
--- a/.github/workflows/base.yml
+++ b/.github/workflows/base.yml
@@ -20,21 +20,22 @@ jobs:
           - debian
           - ubuntu
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./oses/${{ matrix.oses }}
           file: ./oses/${{ matrix.oses }}/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: |
             ghcr.io/parkervcp/yolks:${{ matrix.oses }}
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 6eae438..ba9b0fe 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -20,28 +20,28 @@ jobs:
           - red
           - sinusbot
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.7.0"
+          version: "v0.8.2"
           buildkitd-flags: --debug
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
           platforms: arm64,amd64
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./bot/${{ matrix.tag }}
           file: ./bot/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/box64.yml b/.github/workflows/box64.yml
new file mode 100644
index 0000000..5cf53fb
--- /dev/null
+++ b/.github/workflows/box64.yml
@@ -0,0 +1,39 @@
+name: build box64
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - box64/**
+jobs:
+  push:
+    name: "yolks:${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - box64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v3
+        with:
+          context: ./box64
+          file: ./${{ matrix.tag }}/Dockerfile
+          platforms: linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:${{ matrix.tag }}
diff --git a/.github/workflows/cassandra.yml b/.github/workflows/cassandra.yml
index 69ecb78..27659d4 100644
--- a/.github/workflows/cassandra.yml
+++ b/.github/workflows/cassandra.yml
@@ -19,17 +19,17 @@ jobs:
           - java8_python2
           - java11_python3
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./cassandra
           file: ./cassandra/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index d7859d2..ff621f1 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -21,17 +21,17 @@ jobs:
           - 5
           - 6
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./dotnet
           file: ./dotnet/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
index 6cd1412..3b9986c 100644
--- a/.github/workflows/erlang.yml
+++ b/.github/workflows/erlang.yml
@@ -20,17 +20,17 @@ jobs:
           - 23
           - 24
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./erlang
           file: ./erlang/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/games.yml b/.github/workflows/games.yml
index 9f03ff0..09cb0ce 100644
--- a/.github/workflows/games.yml
+++ b/.github/workflows/games.yml
@@ -25,21 +25,21 @@ jobs:
           - valheim
           
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./games/${{ matrix.game }}
           file: ./games/${{ matrix.game }}/Dockerfile
           platforms: linux/amd64
           push: true
           tags: |
-             ghcr.io/parkervcp/games:${{ matrix.game }}
+            ghcr.io/parkervcp/games:${{ matrix.game }}
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index 66e9744..bc31cfa 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -19,18 +19,21 @@ jobs:
           - 1.14
           - 1.15
           - 1.16
+          - 1.17
+          - 1.18
+          - 1.19
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./go
           file: ./go/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
index 81eff14..601fd4d 100644
--- a/.github/workflows/installers.yml
+++ b/.github/workflows/installers.yml
@@ -19,17 +19,17 @@ jobs:
           - alpine
           - debian
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./installers
           file: ./installers/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 80008b7..8ede371 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -23,19 +23,20 @@ jobs:
           - 16
 #          - 16j9
           - 17
+          - 19
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./java
           file: ./java/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
new file mode 100644
index 0000000..e6eaac5
--- /dev/null
+++ b/.github/workflows/mariadb.yml
@@ -0,0 +1,44 @@
+name: build mariadb
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - mariadb/**
+jobs:
+  push:
+    name: "yolks:mariadb_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - '10.3'
+          - '10.4'
+          - '10.5'
+          - '10.6'
+          - '10.7'
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v3
+        with:
+          context: ./mariadb
+          file: ./mariadb/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:mariadb_${{ matrix.tag }}
diff --git a/.github/workflows/mongodb.yml b/.github/workflows/mongodb.yml
new file mode 100644
index 0000000..4e9d850
--- /dev/null
+++ b/.github/workflows/mongodb.yml
@@ -0,0 +1,42 @@
+name: build mongodb
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - mongodb/**
+jobs:
+  push:
+    name: "yolks:mongodb_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - 4
+          - 5
+          - 6
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v3
+        with:
+          context: ./mongodb
+          file: ./mongodb/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:mongodb_${{ matrix.tag }}
diff --git a/.github/workflows/mono.yml b/.github/workflows/mono.yml
index 749e28c..4abac14 100644
--- a/.github/workflows/mono.yml
+++ b/.github/workflows/mono.yml
@@ -18,17 +18,17 @@ jobs:
         tag:
           - latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./mono
           file: ./mono/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
index 179c8b5..9c3b6c9 100644
--- a/.github/workflows/nodejs.yml
+++ b/.github/workflows/nodejs.yml
@@ -20,20 +20,21 @@ jobs:
           - 14
           - 16
           - 17
+          - 18
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Setup QEMU for ARM64 Build
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./nodejs
           file: ./nodejs/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/postgres.yml b/.github/workflows/postgres.yml
new file mode 100644
index 0000000..5850ab5
--- /dev/null
+++ b/.github/workflows/postgres.yml
@@ -0,0 +1,45 @@
+name: build postgres
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - postgres/**
+jobs:
+  push:
+    name: "yolks:postgres_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - 9
+          - 10
+          - 11
+          - 12
+          - 13
+          - 14
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v2
+        with:
+          context: ./postgres
+          file: ./postgres/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:postgres_${{ matrix.tag }}
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
index 96892de..380fcfa 100644
--- a/.github/workflows/python.yml
+++ b/.github/workflows/python.yml
@@ -22,19 +22,19 @@ jobs:
           - '3.9'
           - '3.10'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # Setup QEMU for ARM64 Build
-      - uses: docker/setup-qemu-action@v1          
-      - uses: docker/setup-buildx-action@v1
+      - uses: docker/setup-qemu-action@v2          
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./python
           file: ./python/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
new file mode 100644
index 0000000..144c1a0
--- /dev/null
+++ b/.github/workflows/redis.yml
@@ -0,0 +1,42 @@
+name: build redis
+on:
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - redis/**
+jobs:
+  push:
+    name: "yolks:redis_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - 5
+          - 6
+          - 7
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v2
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v2
+        with:
+          context: ./redis
+          file: ./redis/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:redis_${{ matrix.tag }}
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
new file mode 100644
index 0000000..6f2c721
--- /dev/null
+++ b/.github/workflows/rust.yml
@@ -0,0 +1,43 @@
+name: build rust
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * 1"
+  push:
+    branches:
+      - master
+    paths:
+      - rust/**
+jobs:
+  push:
+    name: "yolks:rust_${{ matrix.tag }}"
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - '1.31'
+          - '1.56'
+          - '1.60'
+          - 'latest'
+    steps:
+      - uses: actions/checkout@v3
+      # Setup QEMU for ARM64 Build
+      - uses: docker/setup-qemu-action@v2          
+      - uses: docker/setup-buildx-action@v2
+        with:
+          version: "v0.8.2"
+          buildkitd-flags: --debug
+      - uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+      - uses: docker/build-push-action@v3
+        with:
+          context: ./rust
+          file: ./rust/${{ matrix.tag }}/Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/parkervcp/yolks:rust_${{ matrix.tag }}
diff --git a/.github/workflows/voice.yml b/.github/workflows/voice.yml
index 6b3250e..6a6dece 100644
--- a/.github/workflows/voice.yml
+++ b/.github/workflows/voice.yml
@@ -18,17 +18,17 @@ jobs:
         tag:
           - teaspeak
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./voice/${{ matrix.tag }}
           file: ./voice/${{ matrix.tag }}/Dockerfile
diff --git a/.github/workflows/wine.yml b/.github/workflows/wine.yml
index de31ef9..ecaed8c 100644
--- a/.github/workflows/wine.yml
+++ b/.github/workflows/wine.yml
@@ -18,17 +18,17 @@ jobs:
         tag:
           - latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: docker/setup-buildx-action@v1
+      - uses: actions/checkout@v3
+      - uses: docker/setup-buildx-action@v2
         with:
-          version: "v0.5.1"
+          version: "v0.8.2"
           buildkitd-flags: --debug
-      - uses: docker/login-action@v1
+      - uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.REGISTRY_TOKEN }}
-      - uses: docker/build-push-action@v2
+      - uses: docker/build-push-action@v3
         with:
           context: ./wine
           file: ./wine/${{ matrix.tag }}/Dockerfile
diff --git a/README.md b/README.md
index bbac7a6..73641dc 100644
--- a/README.md
+++ b/README.md
@@ -46,6 +46,11 @@ is tagged correctly.
 * [`sinusbot`](/bot/sinusbot)
   * `ghcr.io/parkervcp/yolks:bot_sinusbot`
 
+### [Box64](/box64)
+
+* [`Box64`](/box64)
+  * `ghcr.io/parkervcp/yolks:box64`
+
 ### [Cassandra](/cassandra)
 
 * [`cassandra_java8_python27`](/cassandra/cassandra_java8_python2)
@@ -75,8 +80,16 @@ is tagged correctly.
 
 ### [Games](/games)
 
+* [`altv`](/games/altv)
+  * `ghcr.io/parkervcp/games:altv`
 * [`arma3`](/games/arma3)
   * `ghcr.io/parkervcp/games:arma3`
+* [`dayz`](/games/dayz)
+  * `ghcr.io/parkervcp/games:dayz`
+* [`mohaa`](games/mohaa)
+  * `ghcr.io/pterodactyl/games:mohaa`  
+* [`samp`](/games/samp)
+  * `ghcr.io/parkervcp/games:samp`  
 * [`source`](/games/source)
   * `ghcr.io/parkervcp/games:source`
 * [`valheim`](/games/valheim)
@@ -90,6 +103,12 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:go_1.15`
 * [`go1.16`](/go/1.16)
   * `ghcr.io/parkervcp/yolks:go_1.16`
+* [`go1.17`](/go/1.17)
+  * `ghcr.io/parkervcp/yolks:go_1.17`
+* [`go1.18`](/go/1.18)
+  * `ghcr.io/parkervcp/yolks:go_1.18`
+* [`go1.19`](/go/1.19)
+  * `ghcr.io/parkervcp/yolks:go_1.19`
 
 ### [Java](/java)
 
@@ -108,6 +127,28 @@ is tagged correctly.
 * [`java17`](/java/17)
   * `ghcr.io/parkervcp/yolks:java_17`
 
+### [MariaDB](/mariadb)
+
+  * [`MariaDB 10.3`](/mariadb/10.3)
+    * `ghcr.io/parkervcp/yolks:mariadb_10.3`
+  * [`MariaDB 10.4`](/mariadb/10.4)
+    * `ghcr.io/parkervcp/yolks:mariadb_10.4`
+  * [`MariaDB 10.5`](/mariadb/10.5)
+    * `ghcr.io/parkervcp/yolks:mariadb_10.5`
+  * [`MariaDB 10.6`](/mariadb/10.6)
+    * `ghcr.io/parkervcp/yolks:mariadb_10.6`
+  * [`MariaDB 10.7`](/mariadb/10.7)
+    * `ghcr.io/parkervcp/yolks:mariadb_10.7`
+
+### [MongoDB](/mongodb)
+
+  * [`MongoDB 4`](/mongodb/4)
+    * `ghcr.io/parkervcp/yolks:mongodb_4`
+  * [`MongoDB 5`](/mongodb/5)
+    * `ghcr.io/parkervcp/yolks:mongodb_5`
+ * [`MongoDB 6`](/mongodb/6)
+    * `ghcr.io/parkervcp/yolks:mongodb_6`    
+
 ### [Mono](/mono)
 
 * [`mono_latest`](/mono/latest)
@@ -123,6 +164,23 @@ is tagged correctly.
   * `ghcr.io/parkervcp/yolks:nodejs_16`
 * [`node17`](/nodejs/17)
   * `ghcr.io/parkervcp/yolks:nodejs_17`
+* [`node18`](/nodejs/18)
+  * `ghcr.io/parkervcp/yolks:nodejs_18`
+
+### [PostgreSQL](/postgres)
+
+  * [`Postgres 9`](/postgres/9)
+    * `ghcr.io/parkervcp/yolks:postgres_9`
+  * [`Postgres 10`](/postgres/10)
+    * `ghcr.io/parkervcp/yolks:postgres_10`
+  * [`Postgres 11`](/postgres/11)
+    * `ghcr.io/parkervcp/yolks:postgres_11`
+  * [`Postgres 12`](/postgres/12)
+    * `ghcr.io/parkervcp/yolks:postgres_12`
+  * [`Postgres 13`](/postgres/13)
+    * `ghcr.io/parkervcp/yolks:postgres_13`
+  * [`Postgres 14`](/postgres/14)
+    * `ghcr.io/parkervcp/yolks:postgres_14`  
 
 ### [Python](/python)
 
@@ -135,6 +193,26 @@ is tagged correctly.
 * [`python3.10`](/python/3.10)
   * `ghcr.io/parkervcp/yolks:python_3.10`
 
+### [Redis](/redis)
+
+  * [`Redis 5`](/redis/5)
+    * `ghcr.io/parkervcp/yolks:redis_5`
+  * [`Redis 6`](/redis/6)
+    * `ghcr.io/parkervcp/yolks:redis_6`
+  * [`Redis 7`](/redis/7)
+    * `ghcr.io/parkervcp/yolks:redis_7`
+
+### [Rust](/rust)
+
+* ['rust1.31'](/rust/1.31)
+  * `ghcr.io/parkervcp/yolks:rust_1.31`
+* ['rust1.56'](/rust/1.56)
+  * `ghcr.io/parkervcp/yolks:rust_1.56`
+* ['rust1.60'](/rust/1.60)
+  * `ghcr.io/parkervcp/yolks:rust_1.60`
+* ['rust latest'](/rust/latest)
+  * `ghcr.io/parkervcp/yolks:rust_latest`
+
 ### [Voice](/voice)
 
 * [`TeaSpeak`](/teaspeak)
diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile
index 18390f3..00d5508 100644
--- a/bot/bastion/Dockerfile
+++ b/bot/bastion/Dockerfile
@@ -1,7 +1,7 @@
-FROM        node:14-buster
+FROM        --platform=$TARGETOS/$TARGETARCH node:14-buster
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
-    ## install mongo
+## install mongo
 RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.2.asc | apt-key add - \
  && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.2 main" | tee /etc/apt/sources.list.d/mongodb-org-4.2.list \
  && apt update \
diff --git a/bot/bastion/entrypoint.sh b/bot/bastion/entrypoint.sh
index 06c0ce9..d5bdcc7 100644
--- a/bot/bastion/entrypoint.sh
+++ b/bot/bastion/entrypoint.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 cd /home/container
 
-# Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
diff --git a/bot/parkertron/Dockerfile b/bot/parkertron/Dockerfile
index d87f516..87fc60a 100644
--- a/bot/parkertron/Dockerfile
+++ b/bot/parkertron/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM --platform=$TARGETOS/$TARGETARCH alpine:3.9
 
 LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
 
diff --git a/bot/parkertron/entrypoint.sh b/bot/parkertron/entrypoint.sh
index c39e96c..1971986 100644
--- a/bot/parkertron/entrypoint.sh
+++ b/bot/parkertron/entrypoint.sh
@@ -1,8 +1,9 @@
 #!/bin/ash
 cd /home/container
 
-# Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile
index 29cf0a9..92f9d98 100644
--- a/bot/red/Dockerfile
+++ b/bot/red/Dockerfile
@@ -1,4 +1,4 @@
-FROM        python:3.8-slim
+FROM        --platform=$TARGETOS/$TARGETARCH python:3.8-slim
 
 LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
 
diff --git a/bot/red/entrypoint.sh b/bot/red/entrypoint.sh
index cdb1fd1..d5bdcc7 100644
--- a/bot/red/entrypoint.sh
+++ b/bot/red/entrypoint.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 cd /home/container
 
-# Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
 echo -e ":/home/container$ ${MODIFIED_STARTUP}"
 
 # Run the Server
-eval ${MODIFIED_STARTUP}
\ No newline at end of file
+eval ${MODIFIED_STARTUP}
diff --git a/bot/sinusbot/Dockerfile b/bot/sinusbot/Dockerfile
index bbc4a92..e61aea4 100644
--- a/bot/sinusbot/Dockerfile
+++ b/bot/sinusbot/Dockerfile
@@ -1,4 +1,4 @@
-FROM        ubuntu:18.04
+FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
 
 LABEL maintainer="ki2007 <ki2007@damw.eu>" version="1.0"
 
@@ -7,7 +7,8 @@ ENV         DEBIAN_FRONTEND noninteractive
 # Install Dependencies
 RUN         apt update \
             && apt upgrade -y \
-            && apt install -y ca-certificates less libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 locales pulseaudio python sudo x11vnc x11-xkb-utils xvfb iproute2 \
+            && apt install -y ca-certificates less locales pulseaudio python python3 sudo x11vnc x11-xkb-utils xvfb iproute2 \
+			libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 \
             && useradd -m -d /home/container container
 
 ENV LANG C.UTF-8
diff --git a/bot/sinusbot/entrypoint.sh b/bot/sinusbot/entrypoint.sh
index 33e5ddc..d0aea75 100644
--- a/bot/sinusbot/entrypoint.sh
+++ b/bot/sinusbot/entrypoint.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 cd /home/container
 
-# Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
diff --git a/box64/Dockerfile b/box64/Dockerfile
new file mode 100644
index 0000000..7d8f1a8
--- /dev/null
+++ b/box64/Dockerfile
@@ -0,0 +1,34 @@
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
+
+LABEL       author="QuintenQVD" maintainer="josdekurk@gmail.com"
+
+ENV     DEBIAN_FRONTEND noninteractive
+
+## Update base packages
+RUN          apt update \
+             && apt upgrade -y
+
+## Install dependencies
+RUN          apt install -y libc++-dev libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools libatomic1 libsdl1.2debian libsdl2-2.0-0 \
+             libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \
+             libz-dev rapidjson-dev tzdata libevent-dev libzip4 libsdl2-mixer-2.0-0 libsdl2-image-2.0-0 build-essential cmake libgdiplus
+			 
+## Configure locale
+RUN          update-locale lang=en_US.UTF-8 \
+             && dpkg-reconfigure --frontend noninteractive locales
+
+
+##Install box64
+RUN         wget https://ryanfortner.github.io/box64-debs/box64.list -O /etc/apt/sources.list.d/box64.list \
+            && wget -O- https://ryanfortner.github.io/box64-debs/KEY.gpg | gpg --dearmor | tee /usr/share/keyrings/box64-debs-archive-keyring.gpg \
+            && apt update && apt install box64 -y
+
+
+
+RUN		useradd -d /home/container -m container
+USER    container
+ENV     USER=container HOME=/home/container
+WORKDIR /home/container
+
+COPY    ./entrypoint.sh /entrypoint.sh
+CMD     ["/bin/bash", "/entrypoint.sh"]
diff --git a/box64/entrypoint.sh b/box64/entrypoint.sh
new file mode 100644
index 0000000..b5facda
--- /dev/null
+++ b/box64/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+export INTERNAL_IP=`ip route get 1 | awk '{print $(NF-2);exit}'`
+
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
\ No newline at end of file
diff --git a/cassandra/entrypoint.sh b/cassandra/entrypoint.sh
index 3df1092..2541719 100644
--- a/cassandra/entrypoint.sh
+++ b/cassandra/entrypoint.sh
@@ -5,7 +5,7 @@ TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/cassandra/java11_python3/Dockerfile b/cassandra/java11_python3/Dockerfile
index 785ad40..4f5ddb3 100644
--- a/cassandra/java11_python3/Dockerfile
+++ b/cassandra/java11_python3/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk11:alpine-jre
+FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk11:alpine-jre
 
 LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 
diff --git a/cassandra/java8_python2/Dockerfile b/cassandra/java8_python2/Dockerfile
index 1c8260c..32770f4 100644
--- a/cassandra/java8_python2/Dockerfile
+++ b/cassandra/java8_python2/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM adoptopenjdk/openjdk8:alpine-jre
+FROM        --platform=$TARGETOS/$TARGETARCH adoptopenjdk/openjdk8:alpine-jre
 
 LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 
diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile
index f5167b6..440f50b 100644
--- a/dotnet/2.1/Dockerfile
+++ b/dotnet/2.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian
 
 LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
@@ -7,7 +7,7 @@ ENV         DEBIAN_FRONTEND noninteractive
 RUN         apt update -y \
             && apt upgrade -y \
             && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
             && dpkg -i packages-microsoft-prod.deb \
             && rm packages-microsoft-prod.deb \
             && apt update -y \
diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile
index b63d1a1..f655e82 100644
--- a/dotnet/3.1/Dockerfile
+++ b/dotnet/3.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian
 
 LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
@@ -7,7 +7,7 @@ ENV         DEBIAN_FRONTEND noninteractive
 RUN         apt update -y \
             && apt upgrade -y \
             && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
             && dpkg -i packages-microsoft-prod.deb \
             && rm packages-microsoft-prod.deb \
             && apt update -y \
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index 7a3d14b..2fe9f19 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian
 
 LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
@@ -7,7 +7,7 @@ ENV         DEBIAN_FRONTEND noninteractive
 RUN         apt update -y \
             && apt upgrade -y \
             && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
             && dpkg -i packages-microsoft-prod.deb \
             && rm packages-microsoft-prod.deb \
             && apt update -y \
diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile
index 8731c4c..7880a3e 100644
--- a/dotnet/6/Dockerfile
+++ b/dotnet/6/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/parkervcp/yolks:debian
 
 LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
@@ -7,7 +7,7 @@ ENV         DEBIAN_FRONTEND noninteractive
 RUN         apt update -y \
             && apt upgrade -y \
             && apt install -y apt-transport-https wget iproute2 \
-            && wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+            && wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
             && dpkg -i packages-microsoft-prod.deb \
             && rm packages-microsoft-prod.deb \
             && apt update -y \
diff --git a/dotnet/entrypoint.sh b/dotnet/entrypoint.sh
index 13d9e20..11acd70 100644
--- a/dotnet/entrypoint.sh
+++ b/dotnet/entrypoint.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 cd /home/container
 
-# Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
diff --git a/erlang/22/Dockerfile b/erlang/22/Dockerfile
index ca64333..c391152 100644
--- a/erlang/22/Dockerfile
+++ b/erlang/22/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM erlang:22-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH erlang:22-alpine
 
 LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 
diff --git a/erlang/23/Dockerfile b/erlang/23/Dockerfile
index 2349293..10d4cd1 100644
--- a/erlang/23/Dockerfile
+++ b/erlang/23/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM erlang:23-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH erlang:23-alpine
 
 LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 
diff --git a/erlang/24/Dockerfile b/erlang/24/Dockerfile
index fff015f..ea47ef4 100644
--- a/erlang/24/Dockerfile
+++ b/erlang/24/Dockerfile
@@ -1,4 +1,4 @@
-FROM        --platform=$BUILDPLATFORM erlang:24-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH erlang:24-alpine
 
 LABEL       author="Pascal Zarrad" maintainer="p.zarrad@outlook.de"
 
diff --git a/erlang/entrypoint.sh b/erlang/entrypoint.sh
index 6875d24..7511c57 100644
--- a/erlang/entrypoint.sh
+++ b/erlang/entrypoint.sh
@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile
new file mode 100644
index 0000000..1126862
--- /dev/null
+++ b/games/altv/Dockerfile
@@ -0,0 +1,31 @@
+# ----------------------------------
+# Environment: debian
+# ----------------------------------
+FROM    --platform=$TARGETOS/$TARGETARCH node:16-bullseye
+
+LABEL   author="goover" maintainer="info@goover.de"
+
+ENV     DEBIAN_FRONTEND noninteractive
+
+RUN     useradd -m -d /home/container -s /bin/bash container
+
+RUN     apt update -y \
+        && apt upgrade -y \
+        && apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
+        libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
+		python3 dnsutils build-essential coreutils jq pcregrep
+
+RUN     wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
+        && dpkg -i packages-microsoft-prod.deb \
+        && apt update -y \
+        && apt install -y dotnet-sdk-5.0 dotnet-sdk-6.0 libgdiplus
+
+RUN     update-locale lang=en_US.UTF-8 \
+        && dpkg-reconfigure --frontend noninteractive locales
+
+USER    container
+ENV     USER=container HOME=/home/container
+WORKDIR /home/container
+
+COPY    ./entrypoint.sh /entrypoint.sh
+CMD     ["/bin/bash", "/entrypoint.sh"]
diff --git a/games/altv/entrypoint.sh b/games/altv/entrypoint.sh
new file mode 100644
index 0000000..11acd70
--- /dev/null
+++ b/games/altv/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/games/arma3/Dockerfile b/games/arma3/Dockerfile
index 922cdb6..82ba373 100644
--- a/games/arma3/Dockerfile
+++ b/games/arma3/Dockerfile
@@ -1,29 +1,51 @@
-FROM        ubuntu:20.04
+FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
 
 LABEL       author="David Wolfe (Red-Thirten)" maintainer="rehlmgaming@gmail.com"
-ENV         DEBIAN_FRONTEND noninteractive
-ENV         USER_NAME container
-ENV         NSS_WRAPPER_PASSWD /tmp/passwd 
-ENV         NSS_WRAPPER_GROUP /tmp/group
 
-# Install Dependencies
+LABEL       org.opencontainers.image.source="https://github.com/parkervcp/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+## Update base packages and install dependencies
+ENV         DEBIAN_FRONTEND=noninteractive
 RUN         dpkg --add-architecture i386 \
             && apt-get update \
             && apt-get upgrade -y \
-            && apt-get install -y libgcc-10-dev libstdc++-10-dev libtinfo5 lib64z1 libcurl3-gnutls \
-            && apt-get install -y libnss-wrapper gettext-base tar curl gcc g++ libc6 libtbb2 lib32z1 lib32gcc1 lib32stdc++6 libsdl2-2.0-0 libsdl2-2.0-0:i386 libtbb2:i386 lib32stdc++6 libtinfo5:i386 libncurses5:i386 libcurl3-gnutls:i386 \
-            && useradd -m -d /home/container -s /bin/bash container \
-            && touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
+            && apt-get install -y \
+                curl \
+                tzdata \
+                locales \
+                iproute2 \
+                gettext-base \
+                ca-certificates \
+                libssl-dev \
+                lib32gcc-s1 \
+                libsdl2-2.0-0 \
+                libsdl2-2.0-0:i386 \
+                libstdc++6 \
+                libstdc++6:i386 \
+                lib32stdc++6 \
+                libnss-wrapper \
+                libnss-wrapper:i386 \
+                libtbb2 \
+                libtbb2:i386
+
+## Configure locale
+RUN         update-locale lang=en_US.UTF-8 \
+            && dpkg-reconfigure --frontend noninteractive locales
+
+## Prepare NSS Wrapper for the entrypoint as a workaround for Arma 3 requiring a valid UID
+ENV         NSS_WRAPPER_PASSWD=/tmp/passwd NSS_WRAPPER_GROUP=/tmp/group
+RUN         touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
             && chgrp 0 ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
             && chmod g+rw ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP}
-
 ADD         passwd.template /passwd.template
 
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
 USER        container
-ENV         HOME /home/container
+ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
-COPY        ./libnss_wrapper.so /libnss_wrapper.so
-COPY        ./libnss_wrapper_x64.so /libnss_wrapper_x64.so
+## Copy over and execute entrypoint.sh
 COPY        ./entrypoint.sh /entrypoint.sh
-CMD         ["/bin/bash", "/entrypoint.sh"]
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/games/arma3/entrypoint.sh b/games/arma3/entrypoint.sh
index ecfb182..b9925d4 100644
--- a/games/arma3/entrypoint.sh
+++ b/games/arma3/entrypoint.sh
@@ -2,8 +2,8 @@
 
 ## File: Pterodactyl Arma 3 Image - entrypoint.sh
 ## Author: David Wolfe (Red-Thirten)
-## Contributors: Aussie Server Hosts (https://aussieserverhosts.com/)
-## Date: 2021/07/13
+## Contributors: Aussie Server Hosts (https://aussieserverhosts.com/), Stephen White (SilK)
+## Date: 2022/05/22
 ## License: MIT License
 
 ## === CONSTANTS ===
@@ -20,7 +20,7 @@ RED='\033[0;31m'
 NC='\033[0m' # No Color
 
 ## === ENVIRONMENT VARS ===
-# STARTUP, STARTUP_PARAMS, STEAM_USER, STEAM_PASS, SERVER_BINARY, MOD_FILE, MODIFICATIONS, SERVERMODS, UPDATE_SERVER, CLEAR_CACHE, VALIDATE_SERVER, MODS_LOWERCASE, STEAMCMD_EXTRA_FLAGS, CDLC, STEAMCMD_APPID, HC_NUM, SERVER_PASSWORD, HC_HIDE, STEAMCMD_ATTEMPTS, BASIC_URL, DISABLE_MOD_UPDATES
+# STARTUP, STARTUP_PARAMS, STEAM_USER, STEAM_PASS, SERVER_BINARY, MOD_FILE, MODIFICATIONS, SERVERMODS, OPTIONALMODS, UPDATE_SERVER, CLEAR_CACHE, VALIDATE_SERVER, MODS_LOWERCASE, STEAMCMD_EXTRA_FLAGS, CDLC, STEAMCMD_APPID, HC_NUM, SERVER_PASSWORD, HC_HIDE, STEAMCMD_ATTEMPTS, BASIC_URL, DISABLE_MOD_UPDATES
 
 ## === GLOBAL VARS ===
 # validateServer, extraFlags, updateAttempt, modifiedStartup, allMods, CLIENT_MODS
@@ -28,29 +28,29 @@ NC='\033[0m' # No Color
 ## === DEFINE FUNCTIONS ===
 #
 # Runs SteamCMD with specified variables and performs error handling.
-function RunSteamCMD { #[Input: int server=0 mod=1; int id]
+function RunSteamCMD { #[Input: int server=0 mod=1 optional_mod=2; int id]
     # Clear previous SteamCMD log
     if [[ -f "${STEAMCMD_LOG}" ]]; then
         rm -f "${STEAMCMD_LOG:?}"
     fi
-    
+
     updateAttempt=0
     while (( $updateAttempt < $STEAMCMD_ATTEMPTS )); do # Loop for specified number of attempts
         # Increment attempt counter
         updateAttempt=$((updateAttempt+1))
-        
+
         if (( $updateAttempt > 1 )); then # Notify if not first attempt
             echo -e "\t${YELLOW}Re-Attempting download/update in 3 seconds...${NC} (Attempt ${CYAN}${updateAttempt}${NC} of ${CYAN}${STEAMCMD_ATTEMPTS}${NC})\n"
             sleep 3
         fi
-        
+
         # Check if updating server or mod
         if [[ $1 == 0 ]]; then # Server
             ${STEAMCMD_DIR}/steamcmd.sh +force_install_dir /home/container "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +app_update $2 $extraFlags $validateServer +quit | tee -a "${STEAMCMD_LOG}"
         else # Mod
             ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}"
         fi
-        
+
         # Error checking for SteamCMD
         steamcmdExitCode=${PIPESTATUS[0]}
         if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL") ]]; then # Catch errors (ignore setlocale and SDL warnings)
@@ -110,7 +110,23 @@ function RunSteamCMD { #[Input: int server=0 mod=1; int id]
                 ModsLowercase @$2
                 # Move any .bikey's to the keys directory
                 echo -e "\tMoving any mod ${CYAN}.bikey${NC} files to the ${CYAN}~/keys/${NC} folder..."
-                find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \;
+                if [[ $1 == 1 ]]; then
+                    find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \;
+                else
+                    # Give optional mod keys a custom name which can be checked later for deleting unconfigured mods
+                    for file in $(find ./@$2 -name "*.bikey" -type f); do
+                        filename=$(basename ${file})
+
+                        cp $file ./keys/optional_$2_${filename}
+
+                    done;
+
+                    echo -e "\tMod with ID $2 is an optional mod. Deleting original mod download folder..."
+                    rm -r ./@$2
+
+                    # Recreate a directory so time-based detection of auto updates works correctly
+                    mkdir ./@$2_optional
+                fi
                 echo -e "${GREEN}[UPDATE]: Mod download/update successful!${NC}"
             fi
             break
@@ -150,9 +166,17 @@ function RemoveDuplicates { #[Input: str - Output: printf of new str]
 }
 
 # === ENTRYPOINT START ===
-cd /home/container
+
+# Wait for the container to fully initialize
 sleep 1
 
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
 # Check for old eggs
 if [[ -z ${VALIDATE_SERVER} ]]; then # VALIDATE_SERVER was not in the previous version
     echo -e "\n${RED}[STARTUP_ERR]: Please contact your administrator/host for support, and give them the following message:${NC}\n"
@@ -183,6 +207,11 @@ if [[ -n ${SERVERMODS} ]] && [[ ${SERVERMODS} != *\; ]]; then # Add server mods
 else
     allMods=${SERVERMODS}
 fi
+if [[ -n ${OPTIONALMODS} ]] && [[ ${OPTIONALMODS} != *\; ]]; then # Add specified optional mods to the mods list, while checking for trailing semicolon
+    allMods+="${OPTIONALMODS};"
+else
+    allMods+=${OPTIONALMODS}
+fi
 allMods+=$CLIENT_MODS # Add all client-side mods to the master mod list
 CLIENT_MODS=$(RemoveDuplicates ${CLIENT_MODS}) # Remove duplicate mods from CLIENT_MODS, if present
 allMods=$(RemoveDuplicates ${allMods}) # Remove duplicate mods from allMods, if present
@@ -192,17 +221,17 @@ allMods=$(echo $allMods | sed -e 's/;/ /g') # Convert from string to array
 if [[ ${UPDATE_SERVER} == 1 ]]; then
     echo -e "\n${GREEN}[STARTUP]: ${CYAN}Starting checks for all updates...${NC}"
     echo -e "(It is okay to ignore any \"SDL\" errors during this process)\n"
-    
+
     ## Update game server
     echo -e "${GREEN}[UPDATE]:${NC} Checking for game server updates with App ID: ${CYAN}${STEAMCMD_APPID}${NC}..."
-    
+
     if [[ ${VALIDATE_SERVER} == 1 ]]; then # Validate will be added as a parameter if specified
         echo -e "\t${CYAN}File validation enabled.${NC} (This may take extra time to complete)"
         validateServer="validate"
     else
         validateServer=""
     fi
-    
+
     # Determine what extra flags should be set
     if [[ -n ${STEAMCMD_EXTRA_FLAGS} ]]; then
         echo -e "\t(${YELLOW}Advanced${NC}) Extra SteamCMD flags specified: ${CYAN}${STEAMCMD_EXTRA_FLAGS}${NC}\n"
@@ -214,25 +243,37 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
         echo -e ""
         extraFlags=""
     fi
-    
+
     RunSteamCMD 0 ${STEAMCMD_APPID}
-    
+
     ## Update mods
     if [[ -n $allMods ]] && [[ ${DISABLE_MOD_UPDATES} != 1 ]]; then
         echo -e "\n${GREEN}[UPDATE]:${NC} Checking all ${CYAN}Steam Workshop mods${NC} for updates..."
         for modID in $(echo $allMods | sed -e 's/@//g')
         do
             if [[ $modID =~ ^[0-9]+$ ]]; then # Only check mods that are in ID-form
+                # If a mod is defined in OPTIONALMODS, and is not defined in CLIENT_MODS or SERVERMODS, then treat as an optional mod
+                # Optional mods are given a different directory which is checked to see if a new update is available. This is to ensure
+                # if an optional mod is switched to be a standard client-side mod, this script will redownload the mod
+                if [[ "${OPTIONALMODS}" == *"@${modID};"* ]] && [[ "${CLIENT_MODS}" != *"@${modID};"* ]] && [[ "${SERVERMODS}" != *"@${modID};"* ]]; then
+                    modType=2
+                    modDir=@${modID}_optional
+                else
+                    modType=1
+                    modDir=@${modID}
+                fi
+
                 # Get mod's latest update in epoch time from its Steam Workshop changelog page
                 latestUpdate=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep '<p id=' | head -1 | cut -d'"' -f2)
+
                 # If the update time is valid and newer than the local directory's creation date, or the mod hasn't been downloaded yet, download the mod
-                if [[ ! -d @$modID ]] || [[ ( -n $latestUpdate ) && ( $latestUpdate =~ ^[0-9]+$ ) && ( $latestUpdate > $(find @$modID | head -1 | xargs stat -c%Y) ) ]]; then
+                if [[ ! -d $modDir ]] || [[ ( -n $latestUpdate ) && ( $latestUpdate =~ ^[0-9]+$ ) && ( $latestUpdate > $(find $modDir | head -1 | xargs stat -c%Y) ) ]]; then
                     # Get the mod's name from the Workshop page as well
                     modName=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep 'workshopItemTitle' | cut -d'>' -f2 | cut -d'<' -f1)
                     if [[ -z $modName ]]; then # Set default name if unavailable
                         modName="[NAME UNAVAILABLE]"
                     fi
-                    if [[ ! -d @$modID ]]; then
+                    if [[ ! -d $modDir ]]; then
                         echo -e "\n${GREEN}[UPDATE]:${NC} Downloading new Mod: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
                     else
                         echo -e "\n${GREEN}[UPDATE]:${NC} Mod update found for: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
@@ -241,10 +282,38 @@ if [[ ${UPDATE_SERVER} == 1 ]]; then
                         echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}"
                     fi
                     echo -e "\tAttempting mod update/download via SteamCMD...\n"
-                    RunSteamCMD 1 $modID
+
+                    RunSteamCMD $modType $modID
                 fi
             fi
         done
+
+        # Check over key files for unconfigured optional mods' .bikey files
+        for keyFile in $(find ./keys -name "*.bikey" -type f); do
+            keyFileName=$(basename ${keyFile})
+
+            # If the key file is using the optional mod file name
+            if [[ "${keyFileName}" == "optional_"* ]]; then
+                modID=$(echo "${keyFileName}" | cut -d _ -f 2)
+
+                # If mod is not in optional mods, delete it
+                # If a mod is configured in CLIENT_MODS or SERVERMODS, we should still delete this file
+                # as a new file will have been copied that does not follow the naming scheme
+                if [[ "${OPTIONALMODS}" != *"@${modID};"* ]]; then
+
+                    # We only need to let the user know the key file is being deleted if this mod is no longer configured at all.
+                    # If CLIENT_MODS contains the mod ID, we'd just confuse the user by telling them we are deleting the optional .bikey file
+                    if [[ "${CLIENT_MODS}" != *"@${modID};"* ]]; then
+                        echo -e "\tKey file and directory for unconfigured optional mod ${CYAN}${modID}${NC} is being deleted..."
+                    fi
+
+                    # Delete the optional mod .bikey file and directory
+                    rm ${keyFile}
+                    rmdir ./@${modID}_optional 2> /dev/null
+                fi
+            fi
+        done;
+
         echo -e "${GREEN}[UPDATE]:${NC} Steam Workshop mod update check ${GREEN}complete${NC}!"
     fi
 fi
@@ -284,15 +353,15 @@ if [[ ! -f ./basic.cfg ]]; then
     curl -sSL ${BASIC_URL} -o ./basic.cfg
 fi
 
-# $NSS_WRAPPER_PASSWD and $NSS_WRAPPER_GROUP have been set by the Dockerfile
+# Setup NSS Wrapper for use ($NSS_WRAPPER_PASSWD and $NSS_WRAPPER_GROUP have been set by the Dockerfile)
 export USER_ID=$(id -u)
 export GROUP_ID=$(id -g)
 envsubst < /passwd.template > ${NSS_WRAPPER_PASSWD}
 
-if [[ ${SERVER_BINARY} == *"x64"* ]]; then # Check which libnss_wrapper architecture to run, based off the server binary name
-    export LD_PRELOAD=/libnss_wrapper_x64.so
+if [[ ${SERVER_BINARY} == *"x64"* ]]; then # Check which libnss-wrapper architecture to run, based off the server binary name
+    export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libnss_wrapper.so
 else
-    export LD_PRELOAD=/libnss_wrapper.so
+    export LD_PRELOAD=/usr/lib/i386-linux-gnu/libnss_wrapper.so
 fi
 
 # Replace Startup Variables
diff --git a/games/arma3/libnss_wrapper.so b/games/arma3/libnss_wrapper.so
deleted file mode 100644
index 8f32e83..0000000
Binary files a/games/arma3/libnss_wrapper.so and /dev/null differ
diff --git a/games/arma3/libnss_wrapper_x64.so b/games/arma3/libnss_wrapper_x64.so
deleted file mode 100644
index 8f7438a..0000000
Binary files a/games/arma3/libnss_wrapper_x64.so and /dev/null differ
diff --git a/games/arma3/passwd.template b/games/arma3/passwd.template
index ace1d78..2b0dd45 100644
--- a/games/arma3/passwd.template
+++ b/games/arma3/passwd.template
@@ -23,4 +23,4 @@ systemd-bus-proxy:x:103:105:systemd Bus Proxy,,,:/run/systemd:/bin/false
 syslog:x:104:108::/home/syslog:/bin/false
 messagebus:x:106:109::/var/run/dbus:/bin/false
 bind:x:108:112::/var/cache/bind:/bin/false
-${USER_NAME}:x:${USER_ID}:${GROUP_ID}:${USER_NAME}:${HOME}:/bin/bash
\ No newline at end of file
+${USER}:x:${USER_ID}:${GROUP_ID}:${USER}:${HOME}:/bin/bash
\ No newline at end of file
diff --git a/games/dayz/Dockerfile b/games/dayz/Dockerfile
new file mode 100644
index 0000000..55d074e
--- /dev/null
+++ b/games/dayz/Dockerfile
@@ -0,0 +1,49 @@
+FROM        --platform=$BUILDPLATFORM debian:stable-slim
+
+LABEL       author="David Wolfe (Red-Thirten)" maintainer="rehlmgaming@gmail.com"
+
+LABEL       org.opencontainers.image.source="https://github.com/parkervcp/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+## Update base packages and install dependencies
+ENV         DEBIAN_FRONTEND=noninteractive
+RUN         dpkg --add-architecture i386 \
+            && apt update \
+            && apt upgrade -y \
+            && apt install -y \
+                curl \
+                tzdata \
+                locales \
+                iproute2 \
+                gettext-base \
+                ca-certificates \
+                libssl-dev \
+                lib32gcc-s1 \
+                libsdl2-2.0-0 \
+                libsdl2-2.0-0:i386 \
+                libstdc++6 \
+                libstdc++6:i386 \
+                lib32stdc++6 \
+                libcap2 \
+                libnss-wrapper
+
+## Configure locale
+RUN         update-locale lang=en_US.UTF-8 \
+            && dpkg-reconfigure --frontend noninteractive locales
+
+## Prepare NSS Wrapper for the entrypoint as a workaround for Arma 3 requiring a valid UID
+ENV         NSS_WRAPPER_PASSWD=/tmp/passwd NSS_WRAPPER_GROUP=/tmp/group
+RUN         touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
+            && chgrp 0 ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \
+            && chmod g+rw ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP}
+ADD         passwd.template /passwd.template
+
+## Setup user and working directory
+RUN         useradd -m -d /home/container -s /bin/bash container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+## Copy over and execute entrypoint.sh
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/games/dayz/README.md b/games/dayz/README.md
new file mode 100644
index 0000000..f13724e
--- /dev/null
+++ b/games/dayz/README.md
@@ -0,0 +1,2 @@
+# DayZ
+Docker container designed to run Bohemia Interactive's DayZ dedicated server.
diff --git a/games/dayz/entrypoint.sh b/games/dayz/entrypoint.sh
new file mode 100644
index 0000000..9460d30
--- /dev/null
+++ b/games/dayz/entrypoint.sh
@@ -0,0 +1,284 @@
+#!/bin/bash
+
+## File: Pterodactyl DayZ SA Image - entrypoint.sh
+## Author: David Wolfe (Red-Thirten)
+## Contributors: Aussie Server Hosts (https://aussieserverhosts.com/)
+## Date: 2022/05/22
+## License: MIT License
+
+## === CONSTANTS ===
+STEAMCMD_DIR="./steamcmd"                       # SteamCMD's directory containing steamcmd.sh
+STEAMCMD_LOG="${STEAMCMD_DIR}/steamcmd.log"     # Log file for SteamCMD
+GAME_ID=221100                                  # SteamCMD ID for the DayZ SA GAME (not server). Only used for Workshop mod downloads.
+
+# Color Codes
+CYAN='\033[0;36m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+## === ENVIRONMENT VARS ===
+# STARTUP, STARTUP_PARAMS, STEAM_USER, STEAM_PASS, SERVER_BINARY, MOD_FILE, MODIFICATIONS, SERVERMODS, UPDATE_SERVER, VALIDATE_SERVER, MODS_LOWERCASE, STEAMCMD_EXTRA_FLAGS, STEAMCMD_APPID, SERVER_PASSWORD, STEAMCMD_ATTEMPTS, DISABLE_MOD_UPDATES
+
+## === GLOBAL VARS ===
+# validateServer, extraFlags, updateAttempt, modifiedStartup, allMods, CLIENT_MODS
+
+## === DEFINE FUNCTIONS ===
+
+# Runs SteamCMD with specified variables and performs error handling.
+function RunSteamCMD { #[Input: int server=0 mod=1; int id]
+    # Clear previous SteamCMD log
+    if [[ -f "${STEAMCMD_LOG}" ]]; then
+        rm -f "${STEAMCMD_LOG:?}"
+    fi
+    
+    updateAttempt=0
+    while (( $updateAttempt < $STEAMCMD_ATTEMPTS )); do # Loop for specified number of attempts
+        # Increment attempt counter
+        updateAttempt=$((updateAttempt+1))
+        
+        if (( $updateAttempt > 1 )); then # Notify if not first attempt
+            echo -e "\t${YELLOW}Re-Attempting download/update in 3 seconds...${NC} (Attempt ${CYAN}${updateAttempt}${NC} of ${CYAN}${STEAMCMD_ATTEMPTS}${NC})\n"
+            sleep 3
+        fi
+        
+        # Check if updating server or mod
+        if [[ $1 == 0 ]]; then # Server
+            ${STEAMCMD_DIR}/steamcmd.sh +force_install_dir /home/container "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +app_update $2 $extraFlags $validateServer +quit | tee -a "${STEAMCMD_LOG}"
+        else # Mod
+            ${STEAMCMD_DIR}/steamcmd.sh "+login \"${STEAM_USER}\" \"${STEAM_PASS}\"" +workshop_download_item $GAME_ID $2 +quit | tee -a "${STEAMCMD_LOG}"
+        fi
+        
+        # Error checking for SteamCMD
+        steamcmdExitCode=${PIPESTATUS[0]}
+        if [[ -n $(grep -i "error\|failed" "${STEAMCMD_LOG}" | grep -iv "setlocal\|SDL") ]]; then # Catch errors (ignore setlocale and SDL warnings)
+            # Soft errors
+            if [[ -n $(grep -i "Timeout downloading item" "${STEAMCMD_LOG}") ]]; then # Mod download timeout
+                echo -e "\n${YELLOW}[UPDATE]: ${NC}Timeout downloading Steam Workshop mod: \"${CYAN}${modName}${NC}\" (${CYAN}${2}${NC})"
+                echo -e "\t(This is expected for particularly large mods)"
+            elif [[ -n $(grep -i "0x402\|0x6\|0x602" "${STEAMCMD_LOG}") ]]; then # Connection issue with Steam
+                echo -e "\n${YELLOW}[UPDATE]: ${NC}Connection issue with Steam servers."
+                echo -e "\t(Steam servers may currently be down, or a connection cannot be made reliably)"
+            # Hard errors
+            elif [[ -n $(grep -i "Password check for AppId" "${STEAMCMD_LOG}") ]]; then # Incorrect beta branch password
+                echo -e "\n${RED}[UPDATE]: ${YELLOW}Incorrect password given for beta branch. ${CYAN}Skipping download...${NC}"
+                echo -e "\t(Check your \"[ADVANCED] EXTRA FLAGS FOR STEAMCMD\" startup parameter)"
+                break
+            # Fatal errors
+            elif [[ -n $(grep -i "Invalid Password\|two-factor\|No subscription" "${STEAMCMD_LOG}") ]]; then # Wrong username/password, Steam Guard is turned on, or host is using anonymous account
+                echo -e "\n${RED}[UPDATE]: Cannot login to Steam - Improperly configured account and/or credentials"
+                echo -e "\t${YELLOW}Please contact your administrator/host and give them the following message:${NC}"
+                echo -e "\t${CYAN}Your Egg, or your client's server, is not configured with valid Steam credentials.${NC}"
+                echo -e "\t${CYAN}Either the username/password is wrong, or Steam Guard is not properly configured\n\taccording to this egg's documentation/README.${NC}\n"
+                exit 1
+            elif [[ -n $(grep -i "Download item" "${STEAMCMD_LOG}") ]]; then # Steam account does not own base game for mod downloads, or unknown
+                echo -e "\n${RED}[UPDATE]: Cannot download mod - Download failed"
+                echo -e "\t${YELLOW}While unknown, this error is likely due to your host's Steam account not owning the base game.${NC}"
+                echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n"
+                exit 1
+            elif [[ -n $(grep -i "0x202\|0x212" "${STEAMCMD_LOG}") ]]; then # Not enough disk space
+                echo -e "\n${RED}[UPDATE]: Unable to complete download - Not enough storage"
+                echo -e "\t${YELLOW}You have run out of your allotted disk space.${NC}"
+                echo -e "\t${YELLOW}Please contact your administrator/host for potential storage upgrades.${NC}\n"
+                exit 1
+            elif [[ -n $(grep -i "0x606" "${STEAMCMD_LOG}") ]]; then # Disk write failure
+                echo -e "\n${RED}[UPDATE]: Unable to complete download - Disk write failure"
+                echo -e "\t${YELLOW}This is normally caused by directory permissions issues,\n\tbut could be a more serious hardware issue.${NC}"
+                echo -e "\t${YELLOW}(Please contact your administrator/host if this issue persists)${NC}\n"
+                exit 1
+            else # Unknown caught error
+                echo -e "\n${RED}[UPDATE]: ${YELLOW}An unknown error has occurred with SteamCMD. ${CYAN}Skipping download...${NC}"
+                echo -e "\t(Please contact your administrator/host if this issue persists)"
+                break
+            fi
+        elif [[ $steamcmdExitCode != 0 ]]; then # Unknown fatal error
+            echo -e "\n${RED}[UPDATE]: SteamCMD has crashed for an unknown reason!${NC} (Exit code: ${CYAN}${steamcmdExitCode}${NC})"
+            echo -e "\t${YELLOW}(Please contact your administrator/host for support)${NC}\n"
+            exit $steamcmdExitCode
+        else # Success!
+            if [[ $1 == 0 ]]; then # Server
+                echo -e "\n${GREEN}[UPDATE]: Game server is up to date!${NC}"
+            else # Mod
+                # Move the downloaded mod to the root directory, and replace existing mod if needed
+                mkdir -p ./@$2
+                rm -rf ./@$2/*
+                mv -f ./Steam/steamapps/workshop/content/$GAME_ID/$2/* ./@$2
+                rm -d ./Steam/steamapps/workshop/content/$GAME_ID/$2
+                # Make the mods contents all lowercase
+                ModsLowercase @$2
+                # Move any .bikey's to the keys directory
+                echo -e "\tMoving any mod ${CYAN}.bikey${NC} files to the ${CYAN}~/keys/${NC} folder..."
+                find ./@$2 -name "*.bikey" -type f -exec cp {} ./keys \;
+                echo -e "${GREEN}[UPDATE]: Mod download/update successful!${NC}"
+            fi
+            break
+        fi
+        if (( $updateAttempt == $STEAMCMD_ATTEMPTS )); then # Notify if failed last attempt
+            if [[ $1 == 0 ]]; then # Server
+                echo -e "\t${RED}Final attempt made! ${YELLOW}Unable to complete game server update. ${CYAN}Skipping...${NC}"
+                echo -e "\t(Please try again at a later time)"
+                sleep 3
+            else # Mod
+                echo -e "\t${RED}Final attempt made! ${YELLOW}Unable to complete mod download/update. ${CYAN}Skipping...${NC}"
+                echo -e "\t(You may try again later, or manually upload this mod to your server via SFTP)"
+                sleep 3
+            fi
+        fi
+    done
+}
+
+# Takes a directory (string) as input, and recursively makes all files & folders lowercase.
+function ModsLowercase {
+    echo -e "\n\tMaking mod ${CYAN}$1${NC} files/folders lowercase..."
+    for SRC in `find ./$1 -depth`
+    do
+        DST=`dirname "${SRC}"`/`basename "${SRC}" | tr '[A-Z]' '[a-z]'`
+        if [ "${SRC}" != "${DST}" ]
+        then
+            [ ! -e "${DST}" ] && mv -T "${SRC}" "${DST}"
+        fi
+    done
+}
+
+# Removes duplicate items from a semicolon delimited string
+function RemoveDuplicates { #[Input: str - Output: printf of new str]
+    if [[ -n $1 ]]; then # If nothing to compare, skip to prevent extra semicolon being returned
+        echo $1 | sed -e 's/;/\n/g' | sort -u | xargs printf '%s;'
+    fi
+}
+
+## === ENTRYPOINT START ===
+
+# Wait for the container to fully initialize
+sleep 1
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Switch to the container's working directory
+cd /home/container || exit 1
+
+# Collect and parse all specified mods
+if [[ -n ${MODIFICATIONS} ]] && [[ ${MODIFICATIONS} != *\; ]]; then # Add manually specified mods to the client-side mods list, while checking for trailing semicolon
+    CLIENT_MODS="${MODIFICATIONS};"
+else
+    CLIENT_MODS=${MODIFICATIONS}
+fi
+# If the mod list file exists and is valid, parse and add mods to the client-side mods list
+if [[ -f ${MOD_FILE} ]] && [[ -n "$(cat ${MOD_FILE} | grep 'Created by DayZ Launcher')" ]]; then
+    CLIENT_MODS+=$(cat ${MOD_FILE} | grep 'id=' | cut -d'=' -f3 | cut -d'"' -f1 | xargs printf '@%s;')
+elif [[ -n "${MOD_FILE}" ]]; then # If MOD_FILE is not null, warn user file is missing or invalid
+    echo -e "\n${YELLOW}[STARTUP_WARN]: DayZ Modlist file \"${CYAN}${MOD_FILE}${YELLOW}\" could not be found, or is invalid!${NC}"
+    echo -e "\tEnsure your uploaded modlist's file name matches your Startup Parameter."
+    echo -e "\tOnly files exported from a DayZ Launcher are permitted."
+    if [[ -n "${CLIENT_MODS}" ]]; then
+        echo -e "\t${CYAN}Reverting to the manual mod list...${NC}"
+    fi
+fi
+# Add server mods to the master mods list, while checking for trailing semicolon
+if [[ -n ${SERVERMODS} ]] && [[ ${SERVERMODS} != *\; ]]; then
+    allMods="${SERVERMODS};"
+else
+    allMods=${SERVERMODS}
+fi
+allMods+=$CLIENT_MODS # Add all client-side mods to the master mod list
+CLIENT_MODS=$(RemoveDuplicates ${CLIENT_MODS}) # Remove duplicate mods from CLIENT_MODS, if present
+allMods=$(RemoveDuplicates ${allMods}) # Remove duplicate mods from allMods, if present
+allMods=$(echo $allMods | sed -e 's/;/ /g') # Convert from string to array
+
+# Update everything (server and mods), if specified
+if [[ ${UPDATE_SERVER} == 1 ]]; then
+    echo -e "\n${GREEN}[STARTUP]: ${CYAN}Starting checks for all updates...${NC}"
+    echo -e "(It is okay to ignore any \"SDL\" errors during this process)\n"
+    
+    ## Update game server
+    echo -e "${GREEN}[UPDATE]:${NC} Checking for game server updates with App ID: ${CYAN}${STEAMCMD_APPID}${NC}..."
+    
+    if [[ ${VALIDATE_SERVER} == 1 ]]; then # Validate will be added as a parameter if specified
+        echo -e "\t${CYAN}File validation enabled.${NC} (This may take extra time to complete)"
+        validateServer="validate"
+    else
+        validateServer=""
+    fi
+    
+    # Determine what extra flags should be set
+    if [[ -n ${STEAMCMD_EXTRA_FLAGS} ]]; then
+        echo -e "\t(${YELLOW}Advanced${NC}) Extra SteamCMD flags specified: ${CYAN}${STEAMCMD_EXTRA_FLAGS}${NC}\n"
+        extraFlags=${STEAMCMD_EXTRA_FLAGS}
+    else
+        echo -e ""
+        extraFlags=""
+    fi
+    
+    RunSteamCMD 0 ${STEAMCMD_APPID}
+    
+    ## Update mods
+    if [[ -n $allMods ]] && [[ ${DISABLE_MOD_UPDATES} != 1 ]]; then
+        echo -e "\n${GREEN}[UPDATE]:${NC} Checking all ${CYAN}Steam Workshop mods${NC} for updates..."
+        for modID in $(echo $allMods | sed -e 's/@//g')
+        do
+            if [[ $modID =~ ^[0-9]+$ ]]; then # Only check mods that are in ID-form
+                # Get mod's latest update in epoch time from its Steam Workshop changelog page
+                latestUpdate=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep '<p id=' | head -1 | cut -d'"' -f2)
+                # If the update time is valid and newer than the local directory's creation date, or the mod hasn't been downloaded yet, download the mod
+                if [[ ! -d @$modID ]] || [[ ( -n $latestUpdate ) && ( $latestUpdate =~ ^[0-9]+$ ) && ( $latestUpdate > $(find @$modID | head -1 | xargs stat -c%Y) ) ]]; then
+                    # Get the mod's name from the Workshop page as well
+                    modName=$(curl -sL https://steamcommunity.com/sharedfiles/filedetails/changelog/$modID | grep 'workshopItemTitle' | cut -d'>' -f2 | cut -d'<' -f1)
+                    if [[ -z $modName ]]; then # Set default name if unavailable
+                        modName="[NAME UNAVAILABLE]"
+                    fi
+                    if [[ ! -d @$modID ]]; then
+                        echo -e "\n${GREEN}[UPDATE]:${NC} Downloading new Mod: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
+                    else
+                        echo -e "\n${GREEN}[UPDATE]:${NC} Mod update found for: \"${CYAN}${modName}${NC}\" (${CYAN}${modID}${NC})"
+                    fi
+                    if [[ -n $latestUpdate ]] && [[ $latestUpdate =~ ^[0-9]+$ ]]; then # Notify last update date, if valid
+                        echo -e "\tMod was last updated: ${CYAN}$(date -d @${latestUpdate})${NC}"
+                    fi
+                    echo -e "\tAttempting mod update/download via SteamCMD...\n"
+                    RunSteamCMD 1 $modID
+                fi
+            fi
+        done
+        echo -e "${GREEN}[UPDATE]:${NC} Steam Workshop mod update check ${GREEN}complete${NC}!"
+    fi
+fi
+
+# Check if specified server binary exists.
+if [[ ! -f ./${SERVER_BINARY} ]]; then
+    echo -e "\n${RED}[STARTUP_ERR]: Specified DayZ server binary could not be found in the root directory!${NC}"
+    echo -e "${YELLOW}Please do the following to resolve this issue:${NC}"
+    echo -e "\t${CYAN}- Double check your \"Server Binary\" Startup Variable is correct.${NC}"
+    echo -e "\t${CYAN}- Ensure your server has properly installed/updated without errors (reinstalling/updating again may help).${NC}"
+    echo -e "\t${CYAN}- Use the File Manager to check that your specified server binary file is not missing from the root directory.${NC}\n"
+    exit 1
+fi
+
+# Make mods lowercase, if specified
+if [[ ${MODS_LOWERCASE} == "1" ]]; then
+    for modDir in $allMods
+    do
+        ModsLowercase $modDir
+    done
+fi
+
+# Setup NSS Wrapper for use ($NSS_WRAPPER_PASSWD and $NSS_WRAPPER_GROUP have been set by the Dockerfile)
+export USER_ID=$(id -u)
+export GROUP_ID=$(id -g)
+envsubst < /passwd.template > ${NSS_WRAPPER_PASSWD}
+export LD_PRELOAD=/usr/lib/x86_64-linux-gnu/libnss_wrapper.so
+
+# Replace Startup Variables
+modifiedStartup=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
+
+# Start the Server
+echo -e "\n${GREEN}[STARTUP]:${NC} Starting server with the following startup command:"
+echo -e "${CYAN}${modifiedStartup}${NC}\n"
+${modifiedStartup}
+
+if [ $? -ne 0 ]; then
+    echo -e "\n${RED}PTDL_CONTAINER_ERR: There was an error while attempting to run the start command.${NC}\n"
+    exit 1
+fi
diff --git a/games/dayz/passwd.template b/games/dayz/passwd.template
new file mode 100644
index 0000000..2b0dd45
--- /dev/null
+++ b/games/dayz/passwd.template
@@ -0,0 +1,26 @@
+root:x:0:0:root:/root:/bin/bash
+daemon:x:1:1:daemon:/usr/sbin:/usr/sbin/nologin
+bin:x:2:2:bin:/bin:/usr/sbin/nologin
+sys:x:3:3:sys:/dev:/usr/sbin/nologin
+sync:x:4:65534:sync:/bin:/bin/sync
+games:x:5:60:games:/usr/games:/usr/sbin/nologin
+man:x:6:12:man:/var/cache/man:/usr/sbin/nologin
+lp:x:7:7:lp:/var/spool/lpd:/usr/sbin/nologin
+mail:x:8:8:mail:/var/mail:/usr/sbin/nologin
+news:x:9:9:news:/var/spool/news:/usr/sbin/nologin
+uucp:x:10:10:uucp:/var/spool/uucp:/usr/sbin/nologin
+proxy:x:13:13:proxy:/bin:/usr/sbin/nologin
+www-data:x:33:33:www-data:/var/www:/usr/sbin/nologin
+backup:x:34:34:backup:/var/backups:/usr/sbin/nologin
+list:x:38:38:Mailing List Manager:/var/list:/usr/sbin/nologin
+irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
+gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
+nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
+systemd-timesync:x:100:102:systemd Time Synchronization,,,:/run/systemd:/bin/false
+systemd-network:x:101:103:systemd Network Management,,,:/run/systemd/netif:/bin/false
+systemd-resolve:x:102:104:systemd Resolver,,,:/run/systemd/resolve:/bin/false
+systemd-bus-proxy:x:103:105:systemd Bus Proxy,,,:/run/systemd:/bin/false
+syslog:x:104:108::/home/syslog:/bin/false
+messagebus:x:106:109::/var/run/dbus:/bin/false
+bind:x:108:112::/var/cache/bind:/bin/false
+${USER}:x:${USER_ID}:${GROUP_ID}:${USER}:${HOME}:/bin/bash
\ No newline at end of file
diff --git a/games/mohaa/Dockerfile b/games/mohaa/Dockerfile
new file mode 100644
index 0000000..353d28e
--- /dev/null
+++ b/games/mohaa/Dockerfile
@@ -0,0 +1,12 @@
+FROM        ghcr.io/parkervcp/yolks:debian
+
+LABEL       author="Manuel Dielacher" maintainer="th3dilli@gmx.at"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN			dpkg --add-architecture i386 \
+			&& apt update && apt upgrade -y \
+			&& apt install -y lib32gcc-s1 lib32stdc++6 libstdc++5:i386
+
+
diff --git a/games/mohaa/entrypoint.sh b/games/mohaa/entrypoint.sh
new file mode 100644
index 0000000..11acd70
--- /dev/null
+++ b/games/mohaa/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Set environment variable that holds the Internal Docker IP
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
new file mode 100644
index 0000000..3ed3929
--- /dev/null
+++ b/games/samp/Dockerfile
@@ -0,0 +1,23 @@
+FROM        --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
+
+LABEL       author="QuintenQVD" maintainer="josdekurk@gmail.com"
+
+RUN         apt update \
+            && apt -y upgrade
+RUN         dpkg --add-architecture i386 \
+            && apt update \
+            && apt upgrade -y \
+            && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip  \
+            && apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386  \
+            && useradd -d /home/container -m container
+
+RUN         mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
+RUN         rm -rf /var/lib/apt/lists/*
+
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/games/samp/entrypoint.sh b/games/samp/entrypoint.sh
new file mode 100644
index 0000000..6dda5e5
--- /dev/null
+++ b/games/samp/entrypoint.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+export INTERNAL_IP=`ip route get 1 | awk '{print $(NF-2);exit}'`
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/games/source/Dockerfile b/games/source/Dockerfile
index 617a9f6..6feb9ae 100644
--- a/games/source/Dockerfile
+++ b/games/source/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
@@ -37,9 +37,9 @@ RUN         dpkg --add-architecture i386 \
 
 ## install rcon
 RUN         cd /tmp/ \
-            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.1/rcon-0.10.1-amd64_linux.tar.gz > rcon.tar.gz \
+            && curl -sSL https://github.com/gorcon/rcon-cli/releases/download/v0.10.2/rcon-0.10.2-amd64_linux.tar.gz > rcon.tar.gz \
             && tar xvf rcon.tar.gz \
-            && mv rcon-0.10.1-amd64_linux/rcon /usr/local/bin/
+            && mv rcon-0.10.2-amd64_linux/rcon /usr/local/bin/
 
 USER        container
 ENV         USER=container HOME=/home/container
diff --git a/games/source/entrypoint.sh b/games/source/entrypoint.sh
index f2f2744..8f43bc9 100644
--- a/games/source/entrypoint.sh
+++ b/games/source/entrypoint.sh
@@ -30,7 +30,7 @@ TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/go/1.14/Dockerfile b/go/1.14/Dockerfile
index 105e773..285e36b 100644
--- a/go/1.14/Dockerfile
+++ b/go/1.14/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM golang:1.14-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.14-alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/go/1.15/Dockerfile b/go/1.15/Dockerfile
index 50a8531..0279ead 100644
--- a/go/1.15/Dockerfile
+++ b/go/1.15/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM golang:1.15-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.15-alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/go/1.16/Dockerfile b/go/1.16/Dockerfile
index 9855e47..1ab08f3 100644
--- a/go/1.16/Dockerfile
+++ b/go/1.16/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM golang:1.16-alpine
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.16-alpine
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/go/1.17/Dockerfile b/go/1.17/Dockerfile
new file mode 100644
index 0000000..522c443
--- /dev/null
+++ b/go/1.17/Dockerfile
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2021 Matthew Penner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.17-alpine
+
+LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk add --update --no-cache ca-certificates tzdata \
+				&& adduser -D -h /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/ash", "/entrypoint.sh" ]
diff --git a/go/1.18/Dockerfile b/go/1.18/Dockerfile
new file mode 100644
index 0000000..be01868
--- /dev/null
+++ b/go/1.18/Dockerfile
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2021 Matthew Penner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.18-alpine
+
+LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk add --update --no-cache ca-certificates tzdata \
+				&& adduser -D -h /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/ash", "/entrypoint.sh" ]
diff --git a/go/1.19/Dockerfile b/go/1.19/Dockerfile
new file mode 100644
index 0000000..d838bb8
--- /dev/null
+++ b/go/1.19/Dockerfile
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2021 Matthew Penner
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+FROM        --platform=$TARGETOS/$TARGETARCH golang:1.19-alpine
+
+LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apk add --update --no-cache ca-certificates tzdata \
+				&& adduser -D -h /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/ash", "/entrypoint.sh" ]
diff --git a/go/entrypoint.sh b/go/entrypoint.sh
index ab6fbe7..7adafec 100644
--- a/go/entrypoint.sh
+++ b/go/entrypoint.sh
@@ -20,14 +20,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-# 
+#
 
 # Default the TZ environment variable to UTC.
 TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/installers/alpine/Dockerfile b/installers/alpine/Dockerfile
index 0f6b97f..6ecc6cb 100644
--- a/installers/alpine/Dockerfile
+++ b/installers/alpine/Dockerfile
@@ -20,11 +20,11 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM alpine:latest
+FROM        --platform=$TARGETOS/$TARGETARCH alpine:latest
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
 LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
 LABEL       org.opencontainers.image.licenses=MIT
 
-RUN         apk add --update --no-cache ca-certificates curl git jq wget
+RUN         apk add --update --no-cache ca-certificates curl unzip tar git jq wget
diff --git a/installers/debian/Dockerfile b/installers/debian/Dockerfile
index e671c61..25168ba 100644
--- a/installers/debian/Dockerfile
+++ b/installers/debian/Dockerfile
@@ -18,9 +18,9 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-# 
+#
 
-FROM        --platform=$BUILDPLATFORM debian:stable-slim
+FROM        --platform=$TARGETOS/$TARGETARCH debian:stable-slim
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/java/19/Dockerfile b/java/19/Dockerfile
new file mode 100644
index 0000000..e962f88
--- /dev/null
+++ b/java/19/Dockerfile
@@ -0,0 +1,17 @@
+FROM        --platform=$TARGETOS/$TARGETARCH openjdk:19-slim
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+LABEL       org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
+LABEL       org.opencontainers.image.licenses=MIT
+
+RUN         apt update -y \
+						&& apt install -y curl ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+						&& useradd -d /home/container -m container
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/java/entrypoint.sh b/java/entrypoint.sh
index 012d126..e92f3d3 100644
--- a/java/entrypoint.sh
+++ b/java/entrypoint.sh
@@ -27,7 +27,7 @@ TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
@@ -46,4 +46,4 @@ PARSED=$(echo "${STARTUP}" | sed -e 's/{{/${/g' -e 's/}}/}/g' | eval echo "$(cat
 # from the container itself.
 printf "\033[1m\033[33mcontainer@pterodactyl~ \033[0m%s\n" "$PARSED"
 # shellcheck disable=SC2086
-exec env ${PARSED}
+eval ${PARSED}
diff --git a/mariadb/10.3/Dockerfile b/mariadb/10.3/Dockerfile
new file mode 100644
index 0000000..17d80fe
--- /dev/null
+++ b/mariadb/10.3/Dockerfile
@@ -0,0 +1,19 @@
+# -----------------------------------------------------
+# MariaDB Image for Pterodactyl
+# -----------------------------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mariadb:10.3
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mariadb/10.4/Dockerfile b/mariadb/10.4/Dockerfile
new file mode 100644
index 0000000..83673e0
--- /dev/null
+++ b/mariadb/10.4/Dockerfile
@@ -0,0 +1,19 @@
+# -----------------------------------------------------
+# MariaDB Image for Pterodactyl
+# -----------------------------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mariadb:10.4
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mariadb/10.5/Dockerfile b/mariadb/10.5/Dockerfile
new file mode 100644
index 0000000..0bbf825
--- /dev/null
+++ b/mariadb/10.5/Dockerfile
@@ -0,0 +1,19 @@
+# -----------------------------------------------------
+# MariaDB Image for Pterodactyl
+# -----------------------------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mariadb:10.5
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mariadb/10.6/Dockerfile b/mariadb/10.6/Dockerfile
new file mode 100644
index 0000000..ea443ca
--- /dev/null
+++ b/mariadb/10.6/Dockerfile
@@ -0,0 +1,19 @@
+# -----------------------------------------------------
+# MariaDB Image for Pterodactyl
+# -----------------------------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mariadb:10.6
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mariadb/10.7/Dockerfile b/mariadb/10.7/Dockerfile
new file mode 100644
index 0000000..667aa81
--- /dev/null
+++ b/mariadb/10.7/Dockerfile
@@ -0,0 +1,19 @@
+# -----------------------------------------------------
+# MariaDB Image for Pterodactyl
+# -----------------------------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mariadb:10.7
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mariadb/entrypoint.sh b/mariadb/entrypoint.sh
new file mode 100644
index 0000000..d3884d4
--- /dev/null
+++ b/mariadb/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/mongodb/4/Dockerfile b/mongodb/4/Dockerfile
new file mode 100644
index 0000000..52b6885
--- /dev/null
+++ b/mongodb/4/Dockerfile
@@ -0,0 +1,19 @@
+# ----------------------------------
+# Environment: MongoDB
+# ----------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mongo:4-focal
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat iproute2 \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mongodb/5/Dockerfile b/mongodb/5/Dockerfile
new file mode 100644
index 0000000..0b70021
--- /dev/null
+++ b/mongodb/5/Dockerfile
@@ -0,0 +1,19 @@
+# ----------------------------------
+# Environment: MongoDB
+# ----------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mongo:5-focal
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat iproute2 \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mongodb/6/Dockerfile b/mongodb/6/Dockerfile
new file mode 100644
index 0000000..97cb7eb
--- /dev/null
+++ b/mongodb/6/Dockerfile
@@ -0,0 +1,19 @@
+# ----------------------------------
+# Environment: MongoDB
+# ----------------------------------
+FROM        --platform=$TARGETOS/$TARGETARCH mongo:6-focal
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN         apt update -y \
+            && apt install -y netcat iproute2 \
+            && useradd -d /home/container -m container -s /bin/bash
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/mongodb/entrypoint.sh b/mongodb/entrypoint.sh
new file mode 100644
index 0000000..d3884d4
--- /dev/null
+++ b/mongodb/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/mono/entrypoint.sh b/mono/entrypoint.sh
index ef6ae2e..fe2d5f6 100644
--- a/mono/entrypoint.sh
+++ b/mono/entrypoint.sh
@@ -2,7 +2,8 @@
 cd /home/container
 
 # Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP="eval $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')"
diff --git a/mono/latest/Dockerfile b/mono/latest/Dockerfile
index 041d65a..c012146 100644
--- a/mono/latest/Dockerfile
+++ b/mono/latest/Dockerfile
@@ -1,7 +1,3 @@
-# ----------------------------------
-# Mono Latest Image
-# Minimum Panel Version: 1.2.x
-# ----------------------------------
 FROM        ghcr.io/parkervcp/yolks:debian
 
 LABEL       author="Torsten Widmann" maintainer="support@goover.de"
@@ -12,11 +8,11 @@ RUN         apt install -y fontconfig dirmngr
 RUN         apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
 RUN         sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list'
 RUN         apt update
-RUN         apt install mono-complete -y
+RUN         apt install -y mono-complete lib32gcc-s1
 
 USER        container
 ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
 COPY        ./entrypoint.sh /entrypoint.sh
-CMD         ["/bin/bash", "/entrypoint.sh"]
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile
new file mode 100644
index 0000000..8ce29ce
--- /dev/null
+++ b/nodejs/18/Dockerfile
@@ -0,0 +1,15 @@
+FROM        --platform=$TARGETOS/$TARGETARCH node:18-bullseye-slim
+
+LABEL       author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+RUN         apt update \
+            && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool \
+            && npm -g install npm@latest \
+            && useradd -m -d /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/nodejs/entrypoint.sh b/nodejs/entrypoint.sh
index 440c2bf..60c2279 100644
--- a/nodejs/entrypoint.sh
+++ b/nodejs/entrypoint.sh
@@ -2,7 +2,8 @@
 cd /home/container
 
 # Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Print Node.js Version
 node -v
diff --git a/oses/alpine/Dockerfile b/oses/alpine/Dockerfile
index 9625a87..b7badc9 100644
--- a/oses/alpine/Dockerfile
+++ b/oses/alpine/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM        --platform=$BUILDPLATFORM alpine:latest
+FROM        --platform=$TARGETOS/$TARGETARCH alpine:latest
 
 LABEL       author="Matthew Penner" maintainer="matthew@pterodactyl.io"
 
diff --git a/oses/alpine/entrypoint.sh b/oses/alpine/entrypoint.sh
index 5b4ce5f..e156de6 100644
--- a/oses/alpine/entrypoint.sh
+++ b/oses/alpine/entrypoint.sh
@@ -18,14 +18,14 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-# 
+#
 
 # Default the TZ environment variable to UTC.
 TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile
index 270aaa5..e7a48ba 100644
--- a/oses/debian/Dockerfile
+++ b/oses/debian/Dockerfile
@@ -1,4 +1,4 @@
-FROM         debian:bullseye-slim
+FROM         --platform=$TARGETOS/$TARGETARCH debian:bullseye-slim
 
 LABEL        author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -18,9 +18,9 @@ RUN          apt update \
              && apt upgrade -y
 
 ## Install dependencies
-RUN          apt install -y gcc g++ libgcc1 lib32gcc-s1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
+RUN          apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
              libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \
-             liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev
+             liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4
 
 ## Configure locale
 RUN          update-locale lang=en_US.UTF-8 \
diff --git a/oses/debian/entrypoint.sh b/oses/debian/entrypoint.sh
index 9a5cab5..461e6b9 100644
--- a/oses/debian/entrypoint.sh
+++ b/oses/debian/entrypoint.sh
@@ -1,12 +1,13 @@
 #!/bin/bash
 cd /home/container
 
-# Make internal Docker IP address available to processes. 
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 echo -e ":/home/container$ ${MODIFIED_STARTUP}"
 
 # Run the Server
-eval ${MODIFIED_STARTUP}
\ No newline at end of file
+eval ${MODIFIED_STARTUP}
diff --git a/oses/ubuntu/Dockerfile b/oses/ubuntu/Dockerfile
index d6f3a62..63ff9ab 100644
--- a/oses/ubuntu/Dockerfile
+++ b/oses/ubuntu/Dockerfile
@@ -1,4 +1,4 @@
-FROM  ubuntu:18.04
+FROM  --platform=$TARGETOS/$TARGETARCH ubuntu:18.04
 
 LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
 
@@ -9,18 +9,18 @@ RUN   useradd -m -d /home/container -s /bin/bash container
 
 ## update base packages
 RUN   apt update \
- &&   apt upgrade -y
+        &&   apt upgrade -y
 
 ## install dependencies
-RUN   apt install -y gcc g++ libgcc1 lib32gcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
+RUN   apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
         libfontconfig libicu60 libiculx60 icu-devtools libunwind8 libssl1.0.0 libssl1.0-dev sqlite3 libsqlite3-dev libmariadbclient-dev libduktape202 libzip4 locales ffmpeg apt-transport-https init-system-helpers \
         libcurl3-gnutls libjsoncpp1 libleveldb1v5 liblua5.1-0 libluajit-5.1-2 libsqlite3-0 libfluidsynth1 bzip2 zlib1g libevent-dev
 
 ## configure locale
 RUN   update-locale lang=en_US.UTF-8 \
- &&   dpkg-reconfigure --frontend noninteractive locales
+        &&   dpkg-reconfigure --frontend noninteractive locales
 
 WORKDIR /home/container
 
 COPY  ./entrypoint.sh /entrypoint.sh
-CMD   ["/bin/bash", "/entrypoint.sh"]
+CMD   [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/oses/ubuntu/entrypoint.sh b/oses/ubuntu/entrypoint.sh
index d9f5b44..461e6b9 100644
--- a/oses/ubuntu/entrypoint.sh
+++ b/oses/ubuntu/entrypoint.sh
@@ -2,11 +2,12 @@
 cd /home/container
 
 # Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Replace Startup Variables
 MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
 echo -e ":/home/container$ ${MODIFIED_STARTUP}"
 
 # Run the Server
-eval ${MODIFIED_STARTUP}
\ No newline at end of file
+eval ${MODIFIED_STARTUP}
diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile
new file mode 100644
index 0000000..1a2c09d
--- /dev/null
+++ b/postgres/10/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# ----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:10-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/11/Dockerfile b/postgres/11/Dockerfile
new file mode 100644
index 0000000..4ed6f38
--- /dev/null
+++ b/postgres/11/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# -----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:11-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/12/Dockerfile b/postgres/12/Dockerfile
new file mode 100644
index 0000000..e21d236
--- /dev/null
+++ b/postgres/12/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# ----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:12-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/13/Dockerfile b/postgres/13/Dockerfile
new file mode 100644
index 0000000..ed1d229
--- /dev/null
+++ b/postgres/13/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# ----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:13-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/14/Dockerfile b/postgres/14/Dockerfile
new file mode 100644
index 0000000..c41ec76
--- /dev/null
+++ b/postgres/14/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# ----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:14-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/9/Dockerfile b/postgres/9/Dockerfile
new file mode 100644
index 0000000..fc94f1c
--- /dev/null
+++ b/postgres/9/Dockerfile
@@ -0,0 +1,16 @@
+# ----------------------------------
+# Environment: Postgres DB
+# ----------------------------------
+FROM --platform=$TARGETOS/$TARGETARCH postgres:9-alpine
+
+LABEL author="Parker" maintainer="parker@pterodactyl.io"
+
+# UID 999 is the default pterodactyl user
+RUN adduser -D -h /home/container container
+
+USER container
+ENV HOME /home/container
+WORKDIR /home/container
+
+COPY ../entrypoint.sh /entrypoint.sh
+CMD ["/bin/bash", "/entrypoint.sh"]
diff --git a/postgres/entrypoint.sh b/postgres/entrypoint.sh
new file mode 100644
index 0000000..53b47f4
--- /dev/null
+++ b/postgres/entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/ash
+cd /home/container
+
+#output current postgres version
+postgres --version
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')`
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/python/entrypoint.sh b/python/entrypoint.sh
index 0a7b93d..aab4aea 100644
--- a/python/entrypoint.sh
+++ b/python/entrypoint.sh
@@ -2,7 +2,8 @@
 cd /home/container
 
 # Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 # Print current Python version
 python --version
diff --git a/redis/5/Dockerfile b/redis/5/Dockerfile
new file mode 100644
index 0000000..0bf23ec
--- /dev/null
+++ b/redis/5/Dockerfile
@@ -0,0 +1,20 @@
+# ----------------------------------
+# Environment: redis
+# ----------------------------------
+FROM    --platform=$TARGETOS/$TARGETARCH redis:5-bullseye
+
+LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV     DEBIAN_FRONTEND noninteractive
+
+RUN     apt -y update && \
+        apt -y upgrade && \
+        apt -y install iproute2 && \
+        useradd -d /home/container -m container -s /bin/bash
+
+USER    container
+ENV     USER=container HOME=/home/container
+WORKDIR /home/container
+
+COPY    ./entrypoint.sh /entrypoint.sh
+CMD     ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/redis/6/Dockerfile b/redis/6/Dockerfile
new file mode 100644
index 0000000..6e253e4
--- /dev/null
+++ b/redis/6/Dockerfile
@@ -0,0 +1,20 @@
+# ----------------------------------
+# Environment: redis
+# ----------------------------------
+FROM    --platform=$TARGETOS/$TARGETARCH redis:6-bullseye
+
+LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV     DEBIAN_FRONTEND noninteractive
+
+RUN     apt -y update && \
+        apt -y upgrade && \
+        apt -y install iproute2 && \
+        useradd -d /home/container -m container -s /bin/bash
+
+USER    container
+ENV     USER=container HOME=/home/container
+WORKDIR /home/container
+
+COPY    ./entrypoint.sh /entrypoint.sh
+CMD     ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/redis/7/Dockerfile b/redis/7/Dockerfile
new file mode 100644
index 0000000..6a95b67
--- /dev/null
+++ b/redis/7/Dockerfile
@@ -0,0 +1,20 @@
+# ----------------------------------
+# Environment: redis
+# ----------------------------------
+FROM    --platform=$TARGETOS/$TARGETARCH redis:7-bullseye
+
+LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
+
+ENV     DEBIAN_FRONTEND noninteractive
+
+RUN     apt -y update && \
+        apt -y upgrade && \
+        apt -y install iproute2 && \
+        useradd -d /home/container -m container -s /bin/bash
+
+USER    container
+ENV     USER=container HOME=/home/container
+WORKDIR /home/container
+
+COPY    ./entrypoint.sh /entrypoint.sh
+CMD     ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/redis/entrypoint.sh b/redis/entrypoint.sh
new file mode 100644
index 0000000..6e19f17
--- /dev/null
+++ b/redis/entrypoint.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g')
+echo ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/rust/1.31/Dockerfile b/rust/1.31/Dockerfile
new file mode 100644
index 0000000..840bc9f
--- /dev/null
+++ b/rust/1.31/Dockerfile
@@ -0,0 +1,14 @@
+FROM        --platform=$TARGETOS/$TARGETARCH rust:1.31-slim
+
+LABEL       author="Ethan Coward" maintainer="ethan.coward@icloud.com"
+
+RUN         apt update \
+                && apt -y install git dnsutils curl iproute2 ffmpeg \
+                && useradd -m -d /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/1.56/Dockerfile b/rust/1.56/Dockerfile
new file mode 100644
index 0000000..9d3bed6
--- /dev/null
+++ b/rust/1.56/Dockerfile
@@ -0,0 +1,14 @@
+FROM        --platform=$TARGETOS/$TARGETARCH rust:1.56-slim
+
+LABEL       author="Ethan Coward" maintainer="ethan.coward@icloud.com"
+
+RUN         apt update \
+                && apt -y install git dnsutils curl iproute2 ffmpeg \
+                && useradd -m -d /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/1.60/Dockerfile b/rust/1.60/Dockerfile
new file mode 100644
index 0000000..5624cc2
--- /dev/null
+++ b/rust/1.60/Dockerfile
@@ -0,0 +1,14 @@
+FROM        --platform=$TARGETOS/$TARGETARCH rust:1.60-slim
+
+LABEL       author="Ethan Coward" maintainer="ethan.coward@icloud.com"
+
+RUN         apt update \
+                && apt -y install git dnsutils curl iproute2 ffmpeg \
+                && useradd -m -d /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/entrypoint.sh b/rust/entrypoint.sh
new file mode 100644
index 0000000..c865f6c
--- /dev/null
+++ b/rust/entrypoint.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+cd /home/container
+
+# Make internal Docker IP address available to processes.
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
+
+# Print current Rust version
+cargo --version
+
+# Replace Startup Variables
+MODIFIED_STARTUP=$(echo -e $(echo -e ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'))
+echo -e ":/home/container$ ${MODIFIED_STARTUP}"
+
+# Run the Server
+eval ${MODIFIED_STARTUP}
diff --git a/rust/latest/Dockerfile b/rust/latest/Dockerfile
new file mode 100644
index 0000000..3d94aeb
--- /dev/null
+++ b/rust/latest/Dockerfile
@@ -0,0 +1,14 @@
+FROM        --platform=$TARGETOS/$TARGETARCH rust:slim
+
+LABEL       author="Ethan Coward" maintainer="ethan.coward@icloud.com"
+
+RUN         apt update \
+                && apt -y install git dnsutils curl iproute2 ffmpeg \
+                && useradd -m -d /home/container container
+
+USER        container
+ENV         USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
+WORKDIR     /home/container
+
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
diff --git a/voice/teaspeak/Dockerfile b/voice/teaspeak/Dockerfile
index 809b228..ffa3d3a 100644
--- a/voice/teaspeak/Dockerfile
+++ b/voice/teaspeak/Dockerfile
@@ -20,7 +20,7 @@
 # SOFTWARE.
 #
 
-FROM      --platform=$BUILDPLATFORM debian:stable-slim
+FROM      --platform=$TARGETOS/$TARGETARCH debian:stable-slim
 
 LABEL     author="Torsten Widmann" maintainer="info@goover.de"
 
diff --git a/voice/teaspeak/entrypoint.sh b/voice/teaspeak/entrypoint.sh
index 49123df..9b0d21f 100644
--- a/voice/teaspeak/entrypoint.sh
+++ b/voice/teaspeak/entrypoint.sh
@@ -3,7 +3,7 @@ TZ=${TZ:-UTC}
 export TZ
 
 # Set environment variable that holds the Internal Docker IP
-INTERNAL_IP=$(ip route get 1 | awk '{print $NF;exit}')
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
 export INTERNAL_IP
 
 # Switch to the container's working directory
diff --git a/wine/entrypoint.sh b/wine/entrypoint.sh
index c98e308..2066497 100644
--- a/wine/entrypoint.sh
+++ b/wine/entrypoint.sh
@@ -7,7 +7,8 @@ echo "Current timezone: $(cat /etc/timezone)"
 wine --version
 
 # Make internal Docker IP address available to processes.
-export INTERNAL_IP=`ip route get 1 | awk '{print $NF;exit}'`
+INTERNAL_IP=$(ip route get 1 | awk '{print $(NF-2);exit}')
+export INTERNAL_IP
 
 ## just in case someone removed the defaults.
 if [ "${STEAM_USER}" == "" ]; then
@@ -64,7 +65,7 @@ if [[ $WINETRICKS_RUN =~ mono ]]; then
         WINETRICKS_RUN=${WINETRICKS_RUN/mono}
 
         if [ ! -f "$WINEPREFIX/mono.msi" ]; then
-                wget -q -O $WINEPREFIX/mono.msi http://dl.winehq.org/wine/wine-mono/6.4.0/wine-mono-6.4.0-x86.msi
+                wget -q -O $WINEPREFIX/mono.msi https://dl.winehq.org/wine/wine-mono/7.2.0/wine-mono-7.2.0-x86.msi
         fi
 
         wine msiexec /i $WINEPREFIX/mono.msi /qn /quiet /norestart /log $WINEPREFIX/mono_install.log
diff --git a/wine/latest/Dockerfile b/wine/latest/Dockerfile
index 7ab8e30..4c47ef7 100644
--- a/wine/latest/Dockerfile
+++ b/wine/latest/Dockerfile
@@ -1,6 +1,6 @@
-# ----------------------------------
-# Generic Wine 6 image
-# ----------------------------------
+# ---------------------------------------
+# Generic Wine image based on Wine stable 
+# ---------------------------------------
 FROM    ghcr.io/parkervcp/yolks:debian
 
 LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
@@ -8,7 +8,7 @@ LABEL   author="Michael Parker" maintainer="parker@pterodactyl.io"
 ## install required packages
 RUN     dpkg --add-architecture i386 \
         && apt update -y \
-        && apt install -y --no-install-recommends gnupg2 software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386
+        && apt install -y --no-install-recommends gnupg2 tzdata software-properties-common libntlm0 winbind xvfb xauth python3 libncurses5:i386 libncurses6:i386
 
 # Install winehq-stable and with recommends
 RUN     wget -nc https://dl.winehq.org/wine-builds/winehq.key \