diff --git a/Dockerfile b/Dockerfile
index 6dc91e1..b564ce2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,13 @@
-FROM mcr.microsoft.com/dotnet/core/sdk:3.1.410
+FROM mcr.microsoft.com/dotnet/sdk:5.0.301
 
 # Dockerfile meta-information
 LABEL maintainer="NOS Inovação S.A." \
     app_name="dotnet-sonar"
 
 ENV SONAR_SCANNER_MSBUILD_VERSION=5.2.1.31210 \
-    DOTNETCORE_SDK=3.1.410 \
-    DOTNETCORE_RUNTIME=3.1.16 \
-    NETCOREAPP_VERSION=netcoreapp3.0 \
+    DOTNETCORE_SDK=5.0.301 \
+    DOTNETCORE_RUNTIME=5.0.7 \
+    NETAPP_VERSION=net5.0 \
     DOCKER_VERSION=5:20.10.7~3-0~debian-buster \
     CONTAINERD_VERSION=1.4.6-1 \
     OPENJDK_VERSION=11 \
@@ -48,9 +48,9 @@ RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \
 
 # Install Sonar Scanner
 RUN apt-get install -y unzip \
-    && wget https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/$SONAR_SCANNER_MSBUILD_VERSION/sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETCOREAPP_VERSION.zip \
-    && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETCOREAPP_VERSION.zip -d /sonar-scanner \
-    && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETCOREAPP_VERSION.zip \
+    && wget https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/$SONAR_SCANNER_MSBUILD_VERSION/sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip \
+    && unzip sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip -d /sonar-scanner \
+    && rm sonar-scanner-msbuild-$SONAR_SCANNER_MSBUILD_VERSION-$NETAPP_VERSION.zip \
     && chmod +x -R /sonar-scanner
 
 # Cleanup
diff --git a/README.md b/README.md
index b89b16c..c27115b 100644
--- a/README.md
+++ b/README.md
@@ -15,23 +15,25 @@ It also allows you to run Docker in Docker using a docker.sock mount.
 
 This latest image was built with the following components:
 
-* dotnetcore-sdk 5.0.202
-* dotnetcore-runtime 5.0.5 (required by Sonar-Scanner)
+* dotnetcore-sdk 5.0.301
+* dotnetcore-runtime 5.0.7 (required by Sonar-Scanner)
 * SonarQube MSBuild Scanner 5.2.1.31210
 * Docker binaries 20.10.x (for running Docker in Docker using the docker.sock mount)
 * OpenJDK Java Runtime 11 (required by Sonar-Scanner and some Sonar-SCanner plugins)
-* NodeJS 15 (required by Sonar-Scanner web analysis plugins)
+* NodeJS 16 (required by Sonar-Scanner web analysis plugins)
 
 ## Supported tags and respective `Dockerfile` links
 
 > Tags are written using the following pattern: `dotnet-sonar:<year>.<month>.<revision>`
 
-* `21.05.1`, `latest` [(21.05.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.1/Dockerfile)
-  * DotNet 5.0.202
+* `21.06.1`, `latest` [(21.06.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.06.1/Dockerfile)
+  * DotNet 5.0.301
   * SonarScanner 5.2.1.31210
-* `21.05.0` [(21.05.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.0/Dockerfile)
-  * DotNetCore 3.1.408
+* `21.06.0` [(21.06.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.06.0/Dockerfile)
+  * DotNetCore 3.1.410
   * SonarScanner 5.2.1.31210
+* `21.05.1` [(21.05.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.1/Dockerfile)
+* `21.05.0` [(21.05.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.05.0/Dockerfile)
 * `21.04.1` [(21.04.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.04.1/Dockerfile)
 * `21.04.0` [(21.04.0/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.04.0/Dockerfile)
 * `21.01.1` [(21.01.1/Dockerfile)](https://github.com/nosinovacao/dotnet-sonar/blob/21.01.1/Dockerfile)