diff --git a/infra/setup_server.sh b/infra/setup_server.sh
index a4b031f..09f7bc9 100644
--- a/infra/setup_server.sh
+++ b/infra/setup_server.sh
@@ -33,7 +33,9 @@ echo "Added $SERVICE_USER to docker group"
 
 # Create app directory owned by service user
 mkdir -p "$APP_DIR"
-chown "$SERVICE_USER:$SERVICE_USER" "$APP_DIR"
+if [ "$(stat -c '%U' "$APP_DIR")" != "$SERVICE_USER" ]; then
+    chown "$SERVICE_USER:$SERVICE_USER" "$APP_DIR"
+fi
 echo "Created $APP_DIR"
 
 # Generate deploy key as service user if not present
@@ -71,7 +73,9 @@ fi
 
 # Create data directories owned by service user
 mkdir -p /data/padelnomics/landing
-chown -R "$SERVICE_USER:$SERVICE_USER" /data/padelnomics
+if [ "$(stat -c '%U' /data/padelnomics)" != "$SERVICE_USER" ]; then
+    chown -R "$SERVICE_USER:$SERVICE_USER" /data/padelnomics
+fi
 echo "Created /data/padelnomics/landing"
 
 # Install and enable systemd services