diff --git a/.github/workflows/on-push-to-main.yml b/.github/workflows/on-push-to-main.yml
index 76a6153..adcdf1a 100644
--- a/.github/workflows/on-push-to-main.yml
+++ b/.github/workflows/on-push-to-main.yml
@@ -45,4 +45,6 @@ jobs:
         file: ./Dockerfile
         push: true
         platforms: linux/arm64
-        tags: weatherstationproject/dashboard:${{ steps.dashboard_version.outputs.version }} , weatherstationproject/dashboard:latest
\ No newline at end of file
+        tags: |
+          weatherstationproject/dashboard:${{ steps.dashboard_version.outputs.version }}
+          weatherstationproject/dashboard:latest
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 655bfd0..69aea55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ ARG PROJECT_NAME_ARG
 ARG ENVIRONMENT_ARG
 
 # Pull down the image with .NET Core SDK
-FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine-arm64v8 AS Build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-arm64v8 AS Build
 LABEL maintainer="David Leon <david.leon.m@gmail.com>"
 
 # Global args re-mapped for this stage
@@ -24,7 +24,7 @@ WORKDIR "/src/$PROJECT_NAME_ARG"
 RUN dotnet publish "./$PROJECT_NAME_ARG.csproj" --configuration Release --output "/app/publish"
 
 # Pull down the image which includes only the ASP.NET core runtime
-FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine-arm64v8
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-alpine3.20-arm64v8
 
 # Install needed app
 RUN apk --no-cache add curl