diff --git a/deploy.ps1 b/deploy.ps1
index 5736c2e..aecf108 100644
--- a/deploy.ps1
+++ b/deploy.ps1
@@ -64,6 +64,7 @@ $FunctionPath = "$PSScriptRoot\Functions"
 $OutputDirectory = "$PSScriptRoot\$ModuleName"
 $PSD1OutputPath = "$OutputDirectory\$ModuleName.psd1"
 $PSM1OutputPath = "$OutputDirectory\$ModuleName.psm1"
+$PS1FunctionFiles = Get-ChildItem $FunctionPath -Filter "*.ps1" -Recurse | Sort-Object Name
 
 
 Write-Host "Removing whitespace from files" -ForegroundColor Green
@@ -71,7 +72,6 @@ Invoke-ScriptAnalyzer -Path $FunctionPath -IncludeRule 'PSAvoidTrailingWhitespac
 
 
 Write-Host "Concatenating [$($PS1FunctionFiles.Count)] PS1 files from $FunctionPath"
-$PS1FunctionFiles = Get-ChildItem $FunctionPath -Filter "*.ps1" -Recurse | Sort-Object Name
 
 "" | Out-File -FilePath $ConcatenatedFilePath -Encoding utf8
 
@@ -165,6 +165,8 @@ if (-not (Test-Path $OutputDirectory)) {
 Write-Host " Copying psd1"
 Copy-Item -Path "$PSScriptRoot\$ModuleName.psd1" -Destination $PSD1OutputPath -Force
 
+Write-Host " Removing trailing whitespaces from psd1"
+Invoke-ScriptAnalyzer -Path $PSD1OutputPath -IncludeRule 'PSAvoidTrailingWhitespace' -Fix
 
 Write-Host " Copying psm1"
 Copy-Item -Path $ConcatenatedFilePath -Destination $PSM1OutputPath -Force