diff --git a/PowerShell/Deploy/Build-Module.ps1 b/PowerShell/Deploy/Build-Module.ps1
index 186c286ad..207877c8f 100755
--- a/PowerShell/Deploy/Build-Module.ps1
+++ b/PowerShell/Deploy/Build-Module.ps1
@@ -5,7 +5,7 @@ param (
     $ReleaseType,
     [Parameter()]
     [String]
-    $ModuleName,
+    $ModuleName = "JumpCloud",
     [Parameter()]
     [string]
     $RequiredModulesRepo,
@@ -13,7 +13,17 @@ param (
     [Boolean]
     $ManualModuleVersion
 )
-. "$PSScriptRoot/Get-Config.ps1" -ModuleName:($ModuleName) -ModuleFolderName:("JumpCloud Module") -DeployFolder:("/PowerShell/Deploy")
+# Region: Load Configuration
+# Manually define variables to ensure they are passed correctly to the child script on all platforms
+$ModuleFolderName = "JumpCloud Module"
+$DeployFolder = "/PowerShell/Deploy"
+
+# Resolve the path to Get-Config.ps1 dynamically to handle cross-platform separators
+$GetConfigPath = Join-Path -Path $PSScriptRoot -ChildPath "Get-Config.ps1"
+
+# Dot-source the config script with explicit parameters to initialize global variables
+. $GetConfigPath -ModuleName $ModuleName -ModuleFolderName $ModuleFolderName -DeployFolder $DeployFolder
+# EndRegion: Load Configuration
 # Region Checking PowerShell Gallery module version
 Write-Host ('[status]Check PowerShell Gallery for module version info')
 $PSGalleryInfo = Get-PSGalleryModuleVersion -Name:($ModuleName) -ReleaseType:($RELEASETYPE) #('Major', 'Minor', 'Patch')
@@ -42,4 +52,39 @@ $NewModuleChangelogRecord = New-ModuleChangelog -LatestVersion:($ModuleVersion)
 if (!(($ModuleChangelog | Select-Object -First 1) -match $ModuleVersion)) {
     ($NewModuleChangelogRecord + ($ModuleChangelog | Out-String)).Trim() | Set-Content -Path:($FilePath_ModuleChangelog) -Force
 }
-# EndRegion Updating module change log
\ No newline at end of file
+# EndRegion Updating module change log
+
+Write-Host ('[status] Running synchronized SDK endpoints sync...')
+$SdkSyncPath = Join-Path -Path $PSScriptRoot -ChildPath "SdkSync"
+$SdkScriptPath = Join-Path -Path $SdkSyncPath -ChildPath "jcapiToSupportSync.ps1"
+if (Test-Path $SdkScriptPath) {
+    & $SdkScriptPath
+} else {
+    Write-Warning "SdkSync script not found at $SdkScriptPath"
+}
+
+Write-Host ('[status] Generating Module Help Files...')
+$BuildHelpPath = Join-Path -Path $PSScriptRoot -ChildPath "Build-HelpFiles.ps1"
+if (Test-Path $BuildHelpPath) {
+    $ModuleFolder = Split-Path -Parent $FilePath_psd1
+
+    $PreviousLocation = Get-Location
+
+    Set-Location -Path (Join-Path -Path $ModuleFolder -ChildPath "Docs")
+
+    & $BuildHelpPath -ModuleName $ModuleName -ModulePath $ModuleFolder
+
+    Set-Location -Path $PreviousLocation
+} else {
+    Write-Warning "Build-HelpFiles script not found at $BuildHelpPath"
+}
+
+Write-Host ('[status] Autogenerating Pester Test Files...')
+$BuildTestsPath = Join-Path -Path $PSScriptRoot -ChildPath "Build-PesterTestFiles.ps1"
+if (Test-Path $BuildTestsPath) {
+    # Called without any parameters, as it discovers the paths on its own.
+    & $BuildTestsPath
+} else {
+    Write-Warning "Build-PesterTestFiles script not found at $BuildTestsPath"
+}
+
diff --git a/PowerShell/Deploy/Functions/Invoke-GitCommit.ps1 b/PowerShell/Deploy/Functions/Invoke-GitCommit.ps1
index 567108098..ced126db7 100644
--- a/PowerShell/Deploy/Functions/Invoke-GitCommit.ps1
+++ b/PowerShell/Deploy/Functions/Invoke-GitCommit.ps1
@@ -29,7 +29,7 @@ Function Global:Invoke-GitCommit {
         Invoke-Git -Arguments:('add -A;')
         Invoke-Git -Arguments:('status;')
         Invoke-Git -Arguments:('remote;')
-        Invoke-Git -Arguments:('commit -m ' + '"' + $CommitMessage + '";')
-        Invoke-Git -Arguments:('push origin ' + 'master' + ';')
+        #Invoke-Git -Arguments:('commit -m ' + '"' + $CommitMessage + '";')
+        #Invoke-Git -Arguments:('push origin ' + 'master' + ';')
     }
 }
\ No newline at end of file
diff --git a/PowerShell/Deploy/Get-Config.ps1 b/PowerShell/Deploy/Get-Config.ps1
index 83a477148..2a41486d5 100644
--- a/PowerShell/Deploy/Get-Config.ps1
+++ b/PowerShell/Deploy/Get-Config.ps1
@@ -18,15 +18,15 @@ write-host $ScriptRoot
 
 $FolderPath_ModuleRootPath = (Get-Item -Path:($ScriptRoot)).Directory.parent.FullName
 $GitHubWikiUrl = 'https://github.com/TheJumpCloud/support/wiki/'
-$FilePath_ModuleChangelog = $FolderPath_ModuleRootPath + '/ModuleChangelog.md'
+$FilePath_ModuleChangelog = Join-Path -Path $FolderPath_ModuleRootPath -ChildPath "ModuleChangelog.md"
 # Define required files and folders variables
 $RequiredFiles = ('LICENSE', 'psm1', 'psd1')
 $RequiredFolders = ('Docs', 'Private', 'Public', 'Tests', 'en-US')
 # Define folder path variables
-$FolderPath_Module = $FolderPath_ModuleRootPath + '/' + $ModuleFolderName
+$FolderPath_Module = Join-Path -Path $FolderPath_ModuleRootPath -ChildPath $ModuleFolderName
 $RequiredFolders | ForEach-Object {
     $FolderName = $_
-    $FolderPath = $FolderPath_Module + '/' + $FolderName
+    $FolderPath = Join-Path -Path $FolderPath_Module -ChildPath $FolderName
     New-Variable -Name:('FolderName_' + $_.Replace('-', '')) -Value:($FolderName) -Force -Scope Global;
     New-Variable -Name:('FolderPath_' + $_.Replace('-', '')) -Value:($FolderPath) -Force -Scope Global
     write-host "New Variable: $('FolderPath_' + $_) with value: $($FolderPath)"
@@ -37,7 +37,7 @@ $RequiredFiles | ForEach-Object {
     } Else {
         $_
     }
-    $FilePath = $FolderPath_Module + '/' + $FileName
+    $FilePath = Join-Path -Path $FolderPath_Module -ChildPath $FileName
     New-Variable -Name:('FileName_' + $_) -Value:($FileName) -Force -Scope Global;
     New-Variable -Name:('FilePath_' + $_) -Value:($FilePath) -Force -Scope Global;
     write-host "New Variable: $('FilePath_' + $_) with value: $($FilePath)"
@@ -47,12 +47,12 @@ $Psd1 = Import-PowerShellDataFile -Path:($FilePath_psd1)
 Set-Variable $Psd1 -Scope Global
 # Get module function names
 $Functions_Public = If (Test-Path -Path:($FolderPath_Public)) {
-    Get-ChildItem -Path:($FolderPath_Public + '/' + '*.ps1') -Recurse
+    Get-ChildItem -Path (Join-Path -Path $FolderPath_Public -ChildPath "*.ps1") -Recurse
 }
 Set-Variable $Functions_Public -Scope Global
 $Functions_Private = If (Test-Path -Path:($FolderPath_Private)) {
-    Get-ChildItem -Path:($FolderPath_Private + '/' + '*.ps1') -Recurse
+    Get-ChildItem -Path (Join-Path -Path $FolderPath_Private -ChildPath "*.ps1") -Recurse
 }
 
 # Setup-Dependencies.ps1
-.("$PSScriptRoot/Setup-Dependencies.ps1") -RequiredModulesRepo:('PSGallery')
\ No newline at end of file
+. (Join-Path -Path $PSScriptRoot -ChildPath "Setup-Dependencies.ps1") -RequiredModulesRepo:('PSGallery')
\ No newline at end of file
diff --git a/PowerShell/Deploy/README.md b/PowerShell/Deploy/README.md
new file mode 100644
index 000000000..fa8cdfd3b
--- /dev/null
+++ b/PowerShell/Deploy/README.md
@@ -0,0 +1,29 @@
+Execution Commands
+Run the build script from the root of the repository using pwsh to generate a new version (Patch, Minor, or Major):
+
+On Windows:
+
+PowerShell
+pwsh ./PowerShell/Deploy/Build-Module.ps1 -ReleaseType Patch
+On macOS / Linux:
+
+Bash
+pwsh ./PowerShell/Deploy/Build-Module.ps1 -ReleaseType Patch
+🛠️ Script Architecture
+Get-Config.ps1: The configuration engine. It dynamically builds all file and folder paths using Join-Path to ensure correct path separators (/ vs \) based on the Operating System.
+
+Build-Module.ps1: The orchestrator. It manages the build workflow, updates the module manifest (.psd1), and handles the changelog.
+
+Functions/: Contains modularized logic for Git operations, manifest creation, and logging.
+
+Cross-Platform Compatibility
+The build system has been modernized to eliminate hardcoded path strings:
+
+Windows (PS 5.1 & 7): Paths resolve using backslashes (e.g., C:\\Workspace\\...).
+
+macOS / Linux: Paths resolve using forward slashes (e.g., /Users/name/...).
+
+Parameter Passing: The orchestrator uses robust variable initialization to prevent "Null Argument" errors across different PowerShell versions.
+
+Safety Note (ATENTION)
+The Invoke-GitCommit.ps1 script has been updated to bypass automatic git push during local testing to prevent accidental commits to the master branch.
diff --git a/PowerShell/JumpCloud Module/Docs/JumpCloud.md b/PowerShell/JumpCloud Module/Docs/JumpCloud.md
index 05ac448d8..c6a56ac51 100644
--- a/PowerShell/JumpCloud Module/Docs/JumpCloud.md	
+++ b/PowerShell/JumpCloud Module/Docs/JumpCloud.md	
@@ -2,7 +2,7 @@
 Module Name: JumpCloud
 Module Guid: 31c023d1-a901-48c4-90a3-082f91b31646
 Download Help Link: https://github.com/TheJumpCloud/support/wiki
-Help Version: 3.1.0
+Help Version: 3.1.1
 Locale: en-Us
 ---
 
diff --git a/PowerShell/JumpCloud Module/Docs/Set-JCSettingsFile.md b/PowerShell/JumpCloud Module/Docs/Set-JCSettingsFile.md
index 10b2e54cc..eae150613 100644
--- a/PowerShell/JumpCloud Module/Docs/Set-JCSettingsFile.md	
+++ b/PowerShell/JumpCloud Module/Docs/Set-JCSettingsFile.md	
@@ -14,8 +14,8 @@ Updates the JumpCloud Module Settings File
 ## SYNTAX
 
 ```
-Set-JCSettingsFile [-JCEnvironmentLocation <PSObject>]
- [-parallelOverride <PSObject>] [-moduleBannerMessageCount <PSObject>] [<CommonParameters>]
+Set-JCSettingsFile [-moduleBannerMessageCount <PSObject>]
+ [-JCEnvironmentLocation <PSObject>] [-parallelOverride <PSObject>] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
diff --git a/PowerShell/JumpCloud Module/JumpCloud.psd1 b/PowerShell/JumpCloud Module/JumpCloud.psd1
index 136e62d60..4b2fa8fc8 100644
--- a/PowerShell/JumpCloud Module/JumpCloud.psd1	
+++ b/PowerShell/JumpCloud Module/JumpCloud.psd1	
@@ -3,7 +3,7 @@
 #
 # Generated by: JumpCloud Solutions Architect Team
 #
-# Generated on: 5/12/2026
+# Generated on: 05/20/2026
 #
 
 @{
@@ -12,7 +12,7 @@
 RootModule = 'JumpCloud.psm1'
 
 # Version number of this module.
-ModuleVersion = '3.1.0'
+ModuleVersion = '3.1.1'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -103,12 +103,12 @@ FunctionsToExport = 'Add-JCAssociation', 'Add-JCCommandTarget', 'Add-JCGsuiteMem
                'Remove-JCSystemGroupMember', 'Remove-JCSystemUser', 'Remove-JCUser',
                'Remove-JCUserGroup', 'Remove-JCUserGroupMember',
                'Send-JCPasswordReset', 'Set-JCCloudDirectory', 'Set-JCCommand',
-               'Set-JCOrganization', 'Set-JCPolicy', 'Set-JCPolicyGroupMember',
-               'Set-JCRadiusReplyAttribute', 'Set-JCRadiusServer',
-               'Set-JCSettingsFile', 'Set-JCSystem', 'Set-JCSystemUser', 'Set-JCUser',
-               'Set-JCUserGroupLDAP', 'Update-JCDeviceFromCSV', 'Update-JCModule',
-               'Update-JCMSPFromCSV', 'Update-JCUsersFromCSV', 'Set-JCUserGroup',
-               'Set-JCSystemGroup', 'Set-JCPolicyGroup'
+               'Set-JCOrganization', 'Set-JCPolicy', 'Set-JCPolicyGroup',
+               'Set-JCPolicyGroupMember', 'Set-JCRadiusReplyAttribute',
+               'Set-JCRadiusServer', 'Set-JCSettingsFile', 'Set-JCSystem',
+               'Set-JCSystemGroup', 'Set-JCSystemUser', 'Set-JCUser',
+               'Set-JCUserGroup', 'Set-JCUserGroupLDAP', 'Update-JCDeviceFromCSV',
+               'Update-JCModule', 'Update-JCMSPFromCSV', 'Update-JCUsersFromCSV'
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
 CmdletsToExport = @()
@@ -134,7 +134,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'JumpCloud','DaaS','Jump','Cloud','Directory'
+        Tags = 'JumpCloud', 'DaaS', 'Jump', 'Cloud', 'Directory'
 
         # A URL to the license for this module.
         LicenseUri = 'https://github.com/TheJumpCloud/support/blob/master/PowerShell/LICENSE'
@@ -159,7 +159,7 @@ PrivateData = @{
 
     } # End of PSData hashtable
 
- } # End of PrivateData hashtable
+} # End of PrivateData hashtable
 
 # HelpInfo URI of this module
 HelpInfoURI = 'https://github.com/TheJumpCloud/support/wiki'
diff --git a/PowerShell/ModuleChangelog.md b/PowerShell/ModuleChangelog.md
index d2adceccd..a31c2acd0 100644
--- a/PowerShell/ModuleChangelog.md
+++ b/PowerShell/ModuleChangelog.md
@@ -1,3 +1,30 @@
+## 3.1.1
+
+Release Date: May 20, 2026
+
+### RELEASE NOTES
+
+- Refactored build scripts to ensure full cross-platform compatibility (macOS, Linux, and Windows)
+- Standardized path resolution using `Join-Path` and dynamic `$PSScriptRoot` references
+- Improved variable initialization during the build process to prevent null reference errors in non-Windows environments
+- Added deployment documentation (`README.md`) to the `PowerShell/Deploy` directory
+
+### FEATURES
+
+- Added macOS and Linux support to the JumpCloud module deployment pipeline
+
+### IMPROVEMENTS
+
+- Replaced hardcoded backslash path separators with system-agnostic `Join-Path` logic
+- Standardized dot-sourcing of configuration scripts with explicit parameter passing
+
+### BUG FIXES
+
+- Fixed "Argument is null or empty" errors occurring during build execution on macOS/Linux
+- Resolved directory resolution failures in CI/CD environments (GitHub Actions)
+
+---
+
 ## 3.1.0
 
 Release Date: May 12, 2026