diff --git a/Makefile b/Makefile
index 9e99ea1..46fbcea 100644
--- a/Makefile
+++ b/Makefile
@@ -131,6 +131,7 @@ shell-%:
 
 update:
 	@echo "Pulling latest code..."
+	@git config --global --add safe.directory $$(pwd) 2>/dev/null || true
 	@git stash --include-untracked --quiet 2>/dev/null || true
 	git pull
 	@git stash pop --quiet 2>/dev/null || true
diff --git a/install.sh b/install.sh
index c3590c4..a1f1c0a 100755
--- a/install.sh
+++ b/install.sh
@@ -247,6 +247,9 @@ fi
 
 # Ensure the pic user owns the directory
 chown -R "${PIC_USER}:${PIC_USER}" "$PIC_DIR"
+# Allow any user to run git commands in this directory (installer runs as root,
+# operators run as themselves — git safe.directory prevents ownership errors)
+git config --system --add safe.directory "$PIC_DIR" 2>/dev/null || true
 
 # ---------------------------------------------------------------------------
 # Step 5 — Run make install