diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index e8ef7d354..c8df4bc73 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -21,6 +21,7 @@ jobs:
           - 6
           - 7
           - 8
+          - 9
     steps:
       - uses: actions/checkout@v4
             # Setup QEMU for ARM64 Build
diff --git a/README.md b/README.md
index 39db07400..f86df096c 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,8 @@ these images on an arm system, no modification to them or the tag is needed, the
   * `ghcr.io/egomaw/yolks:dotnet_7`
 * [`DotNet 8.0`](/dotnet/8)
   * `ghcr.io/egomaw/yolks:dotnet_8`
+* [`DotNet 9.0`](/dotnet/9)
+  * `ghcr.io/egomaw/yolks:dotnet_9`
 
 ### [Games](/games)
 
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index ff29434cb..3eb8e4d9f 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -15,4 +15,5 @@ ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
 COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile
index 8c782ec62..37ef2d6af 100644
--- a/dotnet/6/Dockerfile
+++ b/dotnet/6/Dockerfile
@@ -15,4 +15,5 @@ ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
 COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/dotnet/7/Dockerfile b/dotnet/7/Dockerfile
index f830a7571..54fba849f 100644
--- a/dotnet/7/Dockerfile
+++ b/dotnet/7/Dockerfile
@@ -1,18 +1,19 @@
-FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/egomaw/yolks:debian
-
-LABEL       author="EgoMaw" maintainer="egomaw@dedicatedmc.io"
-
-ENV         DEBIAN_FRONTEND noninteractive
-
-RUN        apt-get update -y \
-            && apt-get upgrade -y \
-            && apt-get install -y --no-install-recommends apt-transport-https curl iproute2 libgdiplus gettext-base \
-            && curl -sSL https://dot.net/v1/dotnet-install.sh | bash -s -- -c 7.0 --runtime aspnetcore --install-dir /usr/share \
-            && ln -s /usr/share/dotnet /usr/bin/dotnet
-
-USER        container
-ENV         USER=container HOME=/home/container
-WORKDIR     /home/container
-
-COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/egomaw/yolks:debian
+
+LABEL       author="EgoMaw" maintainer="egomaw@dedicatedmc.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN        apt-get update -y \
+            && apt-get upgrade -y \
+            && apt-get install -y --no-install-recommends apt-transport-https curl iproute2 libgdiplus gettext-base \
+            && curl -sSL https://dot.net/v1/dotnet-install.sh | bash -s -- -c 7.0 --runtime aspnetcore --install-dir /usr/share \
+            && ln -s /usr/share/dotnet /usr/bin/dotnet
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/dotnet/8/Dockerfile b/dotnet/8/Dockerfile
index 5ec646bc7..e0f47168e 100644
--- a/dotnet/8/Dockerfile
+++ b/dotnet/8/Dockerfile
@@ -6,7 +6,7 @@ ENV         DEBIAN_FRONTEND noninteractive
 
 RUN        apt-get update -y \
             && apt-get upgrade -y \
-            && apt-get install -y libgdiplus gettext-base \
+            && apt-get install -y --no-install-recommends apt-transport-https curl iproute2 libgdiplus gettext-base \
             && curl -sSL https://dot.net/v1/dotnet-install.sh | bash -s -- -c 8.0 --runtime aspnetcore --install-dir /usr/share \
             && ln -s /usr/share/dotnet /usr/bin/dotnet
 
@@ -15,4 +15,5 @@ ENV         USER=container HOME=/home/container
 WORKDIR     /home/container
 
 COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
-CMD         [ "/bin/bash", "/entrypoint.sh" ]
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]
diff --git a/dotnet/9/Dockerfile b/dotnet/9/Dockerfile
new file mode 100644
index 000000000..8f4f798bc
--- /dev/null
+++ b/dotnet/9/Dockerfile
@@ -0,0 +1,19 @@
+FROM        --platform=$TARGETOS/$TARGETARCH ghcr.io/egomaw/yolks:debian
+
+LABEL       author="EgoMaw" maintainer="egomaw@dedicatedmc.io"
+
+ENV         DEBIAN_FRONTEND noninteractive
+
+RUN        apt-get update -y \
+            && apt-get upgrade -y \
+            && apt-get install -y --no-install-recommends apt-transport-https curl iproute2 libgdiplus gettext-base \
+            && curl -sSL https://dot.net/v1/dotnet-install.sh | bash -s -- -c 9.0 --runtime aspnetcore --install-dir /usr/share \
+            && ln -s /usr/share/dotnet /usr/bin/dotnet
+
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
+
+COPY       --chown=container --chmod=555 ./../entrypoint.sh /entrypoint.sh
+ENTRYPOINT    ["/usr/bin/tini", "-g", "--"]
+CMD         ["/entrypoint.sh"]