diff --git a/.azure/cd.yml b/.azure/cd.yml
index 1333d05..e16168b 100644
--- a/.azure/cd.yml
+++ b/.azure/cd.yml
@@ -20,4 +20,4 @@ stages:
       checkmarxEnabled: true
       deployEnabled: true
       secretScannerEnabled: true
-      sonarqubeEnabled: true
+      sonarqubeEnabled: false
diff --git a/.azure/ci.yml b/.azure/ci.yml
index d055c80..c35420e 100644
--- a/.azure/ci.yml
+++ b/.azure/ci.yml
@@ -19,4 +19,4 @@ stages:
       checkmarxEnabled: true
       deployEnabled: false
       secretScannerEnabled: true
-      sonarqubeEnabled: true
+      sonarqubeEnabled: false
diff --git a/.azure/release.yml b/.azure/release.yml
index 12c63ed..da87be9 100644
--- a/.azure/release.yml
+++ b/.azure/release.yml
@@ -18,5 +18,6 @@ stages:
     parameters:
       checkmarxEnabled: true
       deployEnabled: true
+      deployRelease: true
       secretScannerEnabled: true
-      sonarqubeEnabled: true
+      sonarqubeEnabled: false
diff --git a/.azure/templates/build.yml b/.azure/templates/build.yml
index 0546cfa..ae8c899 100644
--- a/.azure/templates/build.yml
+++ b/.azure/templates/build.yml
@@ -5,6 +5,9 @@ parameters:
   - name: deployEnabled
     type: boolean
     default: false
+  - name: deployRelease
+    type: boolean
+    default: false
   - name: nexusIQEnabled
     type: boolean
     default: true
@@ -43,6 +46,21 @@ stages:
               ' pom.xml > pom.tmp && mv pom.tmp pom.xml
             displayName: 'Replace Distribution Management'
 
+          - task: Maven@4
+            condition: and(succeeded(), eq('${{ parameters.deployRelease }}', true))
+            displayName: Maven Set Release Version
+            inputs:
+              goals: 'build-helper:parse-version versions:set -DnewVersion=\${parsedVersion.majorVersion}.\${parsedVersion.minorVersion}.\${parsedVersion.incrementalVersion} versions:commit'
+              javaHomeOption: 'JDKVersion'
+              jdkVersionOption: '1.17'
+              mavenAuthenticateFeed: false
+              mavenOptions: '-Xmx3072m'
+              mavenPomFile: 'pom.xml'
+              mavenVersionOption: 'Default'
+              publishJUnitResults: false
+              sonarQubeRunAnalysis: false
+              testResultsFiles: '**/surefire-reports/TEST-*.xml'
+
           - task: Maven@4
             displayName: Maven Build
             inputs:
@@ -54,6 +72,7 @@ stages:
               mavenOptions: '-Xmx3072m'
               mavenPomFile: 'pom.xml'
               mavenVersionOption: 'Default'
+              options: '-B -s $(mvnsettings.secureFilePath) -ntp'
               publishJUnitResults: true
               sonarQubeRunAnalysis: false
               testResultsFiles: '**/surefire-reports/TEST-*.xml'
@@ -72,7 +91,7 @@ stages:
               displayName: Deploy
               inputs:
                 effectivePomSkip: false
-                goals: 'clean deploy'
+                goals: 'deploy'
                 javaHomeOption: 'JDKVersion'
                 jdkVersionOption: '1.17'
                 mavenAuthenticateFeed: false