diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab79301a696bf63967e5013acd8be29a928f6e7d..93af702bf3c21250e9b9da05c71e080de0b9e11f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,10 +42,10 @@ Publish to Docker Hub:
   script:
     - echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"username\":\"$DOCKERHUB_USERNAME\",\"password\":\"$DOCKERHUB_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor
-      --build-arg=IMAGE_CREATED="$(date --utc -Iseconds)"
-      --build-arg=IMAGE_REVISION="$(git show --pretty=oneline | tac | tail -n 1 | awk '{print $1}')"
-      --build-arg=IMAGE_AUTHOR="${IMAGE_AUTHOR}"
-      --tag $IMAGE_NAMESPACE/sonar-scanner-flutter-cli:latest
+      --build-arg IMAGE_CREATED="$(date --utc -Iseconds)"
+      --build-arg IMAGE_REVISION="${CI_COMMIT_SHA}"
+      --build-arg IMAGE_AUTHOR="${IMAGE_AUTHOR}"
+      --destination $IMAGE_NAMESPACE/sonar-scanner-flutter-cli:latest
   when: manual
   allow_failure: true
   only:
diff --git a/Dockerfile b/Dockerfile
index de2c042dff150ce89e34abe17b86c15549e56b32..0146c9789a091fea18ba8d3109da04a1c6d10ea4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN sudo apt-get update \
     && sudo rm -rf /var/lib/apt/lists/*
 
 # Configure Sonar Scanner CLI
-ARG SONAR_SCANNER_CLI_VERSION=4.0.0.1744
+ARG SONAR_SCANNER_CLI_VERSION=4.6.0.2311
 RUN wget -qO sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_CLI_VERSION-linux.zip \
     && sudo unzip sonar-scanner-cli.zip -d /opt \
     && sudo chown -R $(whoami):$(whoami) /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux \