diff --git a/.azure/pipelines/azure-pipelines-build.yml b/.azure/pipelines/azure-pipelines-build.yml
index 70dbac7b..f69702c5 100644
--- a/.azure/pipelines/azure-pipelines-build.yml
+++ b/.azure/pipelines/azure-pipelines-build.yml
@@ -21,6 +21,8 @@ stages:
   jobs:
   - job: build
     displayName: Build and Publish
+    workspace:
+      clean: all
 
     steps:
     - template: azure-pipelines-clean-agent.yml@self
diff --git a/.azure/pipelines/azure-pipelines-deploy.yml b/.azure/pipelines/azure-pipelines-deploy.yml
index a35b5a79..97eaf49c 100644
--- a/.azure/pipelines/azure-pipelines-deploy.yml
+++ b/.azure/pipelines/azure-pipelines-deploy.yml
@@ -29,6 +29,8 @@ stages:
   - deployment: deploy${{parameters.DeploymentType}}
     displayName: Deploy ${{parameters.DeploymentType}}
     environment: github-servermanager-${{ lower(parameters.DeploymentType) }}
+    workspace:
+      clean: all
     
     strategy:
       runOnce:
@@ -42,12 +44,9 @@ stages:
                 CleanPublishFolder: false
                 PublishFolder: $(PublishFolder)
 
-            - template: output-environment-variables.yml@self
-
-            - checkout: MasterRepo
-
             - task: PowerShell@2
-              displayName: Display Deployment Details (temp task)
+              displayName: Output Deployment Details
+              condition: contains(variables['system.debug'], 'true')
               inputs:
                 targetType: inline
                 script: |
@@ -56,6 +55,10 @@ stages:
                   Write-Host "Repository folder: ${{parameters.RepositoryFolder}}"
                 pwsh: true
 
+            - template: output-environment-variables.yml@self
+
+            - checkout: MasterRepo
+
             - template: azure-pipelines-clean-agent.yml@self
               parameters:
                 CleanArtifactsFolder: false