diff --git a/BaseGit.bat b/BaseGit.bat
index d8b0f6d..74a9601 100755
--- a/BaseGit.bat
+++ b/BaseGit.bat
@@ -2,8 +2,6 @@
 set check_computername=%COMPUTERNAME%
 echo "Found computer %check_computername%"
 
-set PACKAGES="C:\Packages"
-set WPUBLIC="C:\wPublic"
 set SCRIPTS="C:\Scripts"
 set GIT="C:\Program Files\Git\git-bash.exe"
 
@@ -11,9 +9,6 @@ mkdir %SCRIPTS%
 
 
 if exist %GIT% (
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
-
 
    echo "Found git. Attempting pull"
    cd %SCRIPTS%\wBase
diff --git a/BaseGitClone.bat b/BaseGitClone.bat
index 7e190b0..c9532ab 100755
--- a/BaseGitClone.bat
+++ b/BaseGitClone.bat
@@ -1,4 +1,4 @@
-@echo on
+@echo off
 set check_computername=%COMPUTERNAME%
 echo "Found computer %check_computername%"
 
@@ -18,16 +18,6 @@ if exist %GIT% (
    del /f/s/q "C:\Scripts\wPublic\*.*"
    rmdir /s/q "C:\Scripts\wPublic"
 
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wPublic"
-
-   %GIT% -c "git config --global core.sshCommand "ssh -i ~/.ssh/giteadeploy -F /dev/null""
-   %GIT% -c "git config --global user.name "USER""
-   %GIT% -c "git config --global user.email "USER@DOMAIN.com""
-   %GIT% -c "git config --global init.defaultBranch main"
-   %GIT% -c "git config --global pull.rebase "False""
-
    echo "Found git."
    echo "Attempting clone of wBase"
    cd %SCRIPTS%
diff --git a/BaseGitConfig.bat b/BaseGitConfig.bat
index 0f007de..f14a762 100755
--- a/BaseGitConfig.bat
+++ b/BaseGitConfig.bat
@@ -1,4 +1,4 @@
-@echo on
+@echo off
 set check_computername=%COMPUTERNAME%
 echo "Found computer %check_computername%"
 
diff --git a/BaseGitPull.bat b/BaseGitPull.bat
index dc8ec77..11a9741 100755
--- a/BaseGitPull.bat
+++ b/BaseGitPull.bat
@@ -9,9 +9,7 @@ mkdir %SCRIPTS%
 
 
 if exist %GIT% (
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wBase"
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wLocal"
-   %GIT% -c "git config --global --add safe.directory C:/Scripts/wPublic"
+
 
    echo "Found git."
    echo "Attempting pull of wBase"
diff --git a/base_Onboot.bat b/base_Onboot.bat
index 0051d46..1af3ce8 100644
--- a/base_Onboot.bat
+++ b/base_Onboot.bat
@@ -5,6 +5,7 @@ echo "START: %~n0"
 
 echo "Fixing time...."
 call %BASE%\baseFixTime.bat
+call %BASE%\BaseGitConfig.bat
 
 del C:\Scripts\bSecrets\b_Syncthing.bat
 del C:\Scripts\lSecrets\l_Syncthing.bat