diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index fabf9fb..078e258 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,6 +19,7 @@ variables:
   coreVersion: 'na'
   nugetSource: 'https://eaf-prod.mes.infineon.com/v3/index.json'
   assemblyTitle: 'Fab2ApprovalSystem'
+  architecture: 'x64'
 
 stages:
   - stage: Production_EC
@@ -33,40 +34,40 @@ stages:
       - job: Release
         steps:
           - script: |
-              echo 'Build.BuildId:' + $(Build.BuildId)
-              echo 'Build.Reason: ' + $(Build.Reason)
-              echo 'Build.Repository.Id: ' + $(Build.Repository.Id)
-              echo 'Build.Repository.Name: ' + $(Build.Repository.Name)
-              echo 'Build.SourceVersion: ' + $(Build.SourceVersion)
-              echo 'CoreVersion: ' + $(CoreVersion)
-              echo 'BuildConfiguration: ' + $(BuildConfiguration)
-              echo 'Configuration: ' + $(Configuration)
-              echo 'NugetSource: ' + $(NugetSource)
-              echo 'TargetFrameworkVersion: ' + $(TargetFrameworkVersion)
-              echo 'AssemblyTitle: ' + $(AssemblyTitle)
-              echo 'OutputPath: D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
+              echo Build.BuildId: $(Build.BuildId)
+              echo Build.Reason: $(Build.Reason)
+              echo Build.Repository.Id: $(Build.Repository.Id)
+              echo Build.Repository.Name: $(Build.Repository.Name)
+              echo Build.SourceVersion: $(Build.SourceVersion)
+              echo CoreVersion: $(CoreVersion)
+              echo BuildConfiguration: $(BuildConfiguration)
+              echo Configuration: $(Configuration)
+              echo NugetSource: $(NugetSource)
+              echo TargetFrameworkVersion: $(TargetFrameworkVersion)
+              echo AssemblyTitle: $(AssemblyTitle)
+              echo OutputPath: D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)
             displayName: "Echo Check"
 
-          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:RestoreSources=$(NugetSource) $(AssemblyTitle).csproj'
-            workingDirectory: Fab2ApprovalSystem
-            displayName: "Framework Restore"
-
-          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(AssemblyTitle).csproj'
-            workingDirectory: Fab2ApprovalSystem
-            displayName: "Framework Build"
-
-          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(Configuration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:DebugSymbols=false /p:DeleteExistingFiles=true /p:DeployOnBuild=true /p:EnableUpdateAble=true /p:ExcludeApp_Data=true /p:LastUsedBuildConfiguration=$(Configuration) /p:LastUsedPlatform="Any CPU" /p:LaunchSiteAfterPublish=true /p:OutputPath="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" /p:PreCompileBeforePublish=true /p:PublishProvider=FileSystem /p:PublishUrl="D:/PublishUrl" /p:SiteUrlToLaunchAfterPublish="" /p:WDPMergeOption=DoNotMerge /p:WebPublishMethod=FileSystem $(AssemblyTitle).csproj'
-            workingDirectory: Fab2ApprovalSystem
-            displayName: "Framework Pack"
-
-          - script: '"C:/Program Files (x86)/IIS/Microsoft Web Deploy V3/MSDeploy.exe" -AllowUntrusted -dest:auto -disableLink:AppPoolExtension -disableLink:CertificateExtension -disableLink:ContentExtension -setParam:name="IIS Web Application Name",value=$(Build.Repository.Name) -setParamFile:"D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" "/_PublishedWebsites/$(Build.Repository.Name)_Package/$(Build.Repository.Name).SetParameters.xml" -source:package="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)" "/_PublishedWebsites/$(AssemblyTitle)_Package/$(AssemblyTitle).zip" -verb:sync'
-            workingDirectory: Fab2ApprovalSystem
-            displayName: "Framework Deploy"
-            enabled: false
-
-          - script: 'echo $(Build.SourceVersion)-$(Build.BuildId)>bin_x_x_\$(Configuration)\$(CoreVersion)\win-x64\$(Build.Repository.Name).txt'
-            displayName: "Force Fail"
-            enabled: false
+          - task: NuGetCommand@2
+            inputs:
+              command: 'restore'
+              restoreSolution: '**/*.sln'
+              feedsToUse: 'select'
+              vstsFeed: '$(NugetSource)'
+              includeNuGetOrg: false
+          
+          - task: VSBuild@1
+            inputs:
+              solution: '**/*.sln'
+              msbuildArgs: '/p:DeployOnBuild=true /p:WebPublishMethod=Package /p:PackageAsSingleFile=true /p:SkipInvalidConfigurations=true /p:PackageLocation="$(Build.ArtifactStagingDirectory)"'
+              platform: $(Architecture)
+              configuration: $(Configuration)
+          
+          - task: CopyFiles@2
+            displayName: 'Copy Files' 
+            inputs:
+              SourceFolder: '$(Build.ArtifactStagingDirectory)'
+              TargetFolder: 'D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)-$(Build.Repository.Name)-$(Configuration)'
   # - stage: Development
   #   displayName: Development
   #   pool: