diff --git a/Dockerfile.codescan b/Dockerfile.codescan
index 99aa9d5..fbda44d 100644
--- a/Dockerfile.codescan
+++ b/Dockerfile.codescan
@@ -10,6 +10,10 @@ WORKDIR /workspace/source
 RUN apt-get update
 RUN apt-get install -y curl git unzip
 
+RUN groupadd -r nonroot && useradd -r -s /bin/false -g nonroot nonroot
+RUN chown -R nonroot:nonroot /workspace/source
+USER nonroot
+
 #clone flutter
 RUN git clone https://github.com/flutter/flutter.git $FLUTTER_SDK
 
@@ -23,12 +27,7 @@ RUN cd /workspace/source
 
 RUN flutter doctor
 
-RUN groupadd -r nonroot && useradd -r -s /bin/false -g nonroot nonroot
-RUN chown -R nonroot:nonroot /workspace/source
-RUN chown -R nonroot:nonroot /usr/local/flutter
-USER nonroot
-
 # remove unnecessary files
-CMD chown -R nonroot:nonroot /home/nonroot/.config && flutter pub get && cat pubspec.lock && rm -rf example
+CMD flutter pub get && cat pubspec.lock && rm -rf example