diff --git a/Dockerfile b/Dockerfile
index a95f5389..021ecea4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -52,7 +52,7 @@ RUN flutter build linux
 RUN flutter build apk
 WORKDIR /tmp
 RUN rm -rf deps
-RUN chmod -R 777 $PUB_CACHE $GRADLE_USER_HOME
+RUN find $GRADLE_USER_HOME/daemon -exec chmod 777 {} \;
 
 # Install AppImage Builder
 RUN pip3 install appimage-builder
diff --git a/ci.py b/ci.py
index a40b1e0f..98209001 100755
--- a/ci.py
+++ b/ci.py
@@ -40,7 +40,8 @@ def podman_online(dir, *args):
 # Targets
 
 def build_linux():
-  podman_offline(f"{CONTAINER_HOME}/src", "flutter pub get --offline",
+  podman_offline(f"{CONTAINER_HOME}/src", "chown -R $(id -u):$(id -g) /tmp/flutter_pub_cache",
+                                          "&& flutter pub get --offline",
                                           "&& flutter build linux")
 
 def build_apk():
@@ -94,7 +95,8 @@ def deploy_fdroid_repo():
                   """], shell=True, check=True)
 
 def ci_build_linux():
-  podman_online(f"{CONTAINER_HOME}/src", "flutter build linux --debug")
+  podman_online(f"{CONTAINER_HOME}/src", "chown -R $(id -u):$(id -g) /tmp/flutter_pub_cache",
+                                         "&& flutter build linux --debug")
 
 def ci_build_apk():
   podman_online(f"{CONTAINER_HOME}/src", "chown -R $(id -u):$(id -g) /tmp/gradle",