diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile
index eac865a..f5167b6 100644
--- a/dotnet/2.1/Dockerfile
+++ b/dotnet/2.1/Dockerfile
@@ -1,21 +1,21 @@
-FROM    ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
 
-LABEL   author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
-ENV     DEBIAN_FRONTEND noninteractive
+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 \
-          && dpkg -i packages-microsoft-prod.deb \
-          && rm packages-microsoft-prod.deb \
-          && apt update -y \
-          && apt install -y aspnetcore-runtime-2.1 libgdiplus
+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 \
+            && dpkg -i packages-microsoft-prod.deb \
+            && rm packages-microsoft-prod.deb \
+            && apt update -y \
+            && apt install -y aspnetcore-runtime-2.1 libgdiplus
 
-USER    container
-ENV     USER=container HOME=/home/container
-WORKDIR /home/container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
-COPY    ./../entrypoint.sh /entrypoint.sh
-CMD     ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile
index d6017e9..b63d1a1 100644
--- a/dotnet/3.1/Dockerfile
+++ b/dotnet/3.1/Dockerfile
@@ -1,21 +1,21 @@
-FROM    ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
 
-LABEL   author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
-ENV     DEBIAN_FRONTEND noninteractive
+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 \
-          && dpkg -i packages-microsoft-prod.deb \
-          && rm packages-microsoft-prod.deb \
-          && apt update -y \
-          && apt install -y aspnetcore-runtime-3.1 libgdiplus
+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 \
+            && dpkg -i packages-microsoft-prod.deb \
+            && rm packages-microsoft-prod.deb \
+            && apt update -y \
+            && apt install -y aspnetcore-runtime-3.1 libgdiplus
 
-USER    container
-ENV     USER=container HOME=/home/container
-WORKDIR /home/container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
-COPY    ./../entrypoint.sh /entrypoint.sh
-CMD     ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index afcf253..7a3d14b 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -1,21 +1,21 @@
-FROM    ghcr.io/parkervcp/yolks:debian
+FROM        --platform=$BUILDPLATFORM ghcr.io/parkervcp/yolks:debian
 
-LABEL   author="Torsten Widmann" maintainer="info@goover.de"
+LABEL       author="Torsten Widmann" maintainer="info@goover.de"
 
-ENV     DEBIAN_FRONTEND noninteractive
+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 \
-          && dpkg -i packages-microsoft-prod.deb \
-          && rm packages-microsoft-prod.deb \
-          && apt update -y \
-          && apt install -y aspnetcore-runtime-5.0 libgdiplus
+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 \
+            && dpkg -i packages-microsoft-prod.deb \
+            && rm packages-microsoft-prod.deb \
+            && apt update -y \
+            && apt install -y aspnetcore-runtime-5.0 libgdiplus
 
-USER    container
-ENV     USER=container HOME=/home/container
-WORKDIR /home/container
+USER        container
+ENV         USER=container HOME=/home/container
+WORKDIR     /home/container
 
-COPY    ./../entrypoint.sh /entrypoint.sh
-CMD     ["/bin/bash", "/entrypoint.sh"]
+COPY        ./../entrypoint.sh /entrypoint.sh
+CMD         [ "/bin/bash", "/entrypoint.sh" ]