diff --git a/Dockerfile b/Dockerfile
index 2504101ae66c7359596ae556a579091f10215a89..f38536fba81e08d8f991b748e41c875e169429e7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,8 +4,8 @@ FROM cirrusci/flutter:latest
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Setup workspace folder
-RUN mkdir workspace
-WORKDIR workspace
+RUN sudo mkdir /workspace && sudo chown -R $(whoami):$(whoami) /workspace
+WORKDIR /workspace
 
 # Install packages
 RUN sudo apt-get update \
@@ -22,7 +22,7 @@ RUN wget -qO sonar-scanner-cli.zip https://binaries.sonarsource.com/Distribution
     && sudo chown -R $(whoami):$(whoami) /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux \
     && rm sonar-scanner-cli.zip \
     && chmod +x /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner \
-    && ln -s /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
+    && sudo ln -s /opt/sonar-scanner-$SONAR_SCANNER_CLI_VERSION-linux/bin/sonar-scanner /usr/local/bin/sonar-scanner
 
 # Configure shellcheck
 ARG SHELLCHECK_VERSION=latest
@@ -32,7 +32,7 @@ RUN sudo wget -qO /opt/shellcheck-${SHELLCHECK_VERSION}.tar.xz https://shellchec
     && sudo chown -R $(whoami):$(whoami) /opt/shellcheck-${SHELLCHECK_VERSION}-linux \
     && sudo rm shellcheck-${SHELLCHECK_VERSION}.tar.xz \
     && chmod +x /opt/shellcheck-${SHELLCHECK_VERSION}/shellcheck \
-    && ln -s /opt/shellcheck-${SHELLCHECK_VERSION}/shellcheck /usr/local/bin/shellcheck
+    && sudo ln -s /opt/shellcheck-${SHELLCHECK_VERSION}/shellcheck /usr/local/bin/shellcheck
 
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=''