diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index cf5b66d..a1aab8f 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,84 +15,116 @@ trigger:
 
 variables:
   buildConfiguration: "Release"
-  assemblyTitle: "Fab2ApprovalSystem"
   targetFrameworkVersion: 'v4.8'
   coreVersion: 'na'
   nugetSource: 'https://eaf-prod.mes.infineon.com/v3/index.json'
-  gitCommit: '$(Build.SourceVersion)'
-  gitCommitSeven: '%gitCommit:~0,7%'
 
 stages:
-  - stage: Development
-    displayName: Development
+  - stage: Production-EC
+    displayName: Production-EC
     pool:
       name: Mesa-FabApproval
-      demands: Fab2ApprovalSystem-Dev
-    variables:
-      ASPNETCORE_ENVIRONMENT: "Development"
-      configuration: 'Debug'
-    jobs:
-    - job: Debug
-      steps:
-        - script: |
-            echo $(AssemblyTitle)
-            echo $(Build.BuildId)
-            echo $(Build.Reason)
-            echo $(Build.Repository.Id)
-            echo $(Build.Repository.Name)
-            echo $(Build.SourceVersion)
-            echo $(CoreVersion)
-            echo $(Configuration)
-            echo $(NugetSource)
-            echo $(GitCommitSeven)
-            echo $(TargetFrameworkVersion)
-            REM echo $(pipelinePassword)
-          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)\$(GitCommitSeven)-$(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"
-  - stage: Production
-    displayName: Production
-    pool:
-      name: Mesa-FabApproval
-      demands: Fab2ApprovalSystem
+      demands: Fab2ApprovalSystem-EC
     variables:
       ASPNETCORE_ENVIRONMENT: "Production"
+      configuration: 'Release'
     jobs:
       - job: Release
         steps:
           - script: |
-              echo $(AssemblyTitle)
               echo $(Build.BuildId)
               echo $(Build.Reason)
               echo $(Build.Repository.Id)
               echo $(Build.Repository.Name)
               echo $(Build.SourceVersion)
               echo $(CoreVersion)
+              echo $(BuildConfiguration)
               echo $(Configuration)
               echo $(NugetSource)
-              echo $(GitCommitSeven)
               echo $(TargetFrameworkVersion)
               REM echo $(pipelinePassword)
             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'
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Restore /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:RestoreSources=$(NugetSource) $(Build.Repository.Name).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'
+          - script: '"C:/Program Files (x86)/Microsoft Visual Studio/2022/BuildTools/MSBuild/Current/Bin/MSBuild.exe" /target:Build /DetailedSummary /ConsoleLoggerParameters:PerformanceSummary;ErrorsOnly; /p:Configuration=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(Build.Repository.Name).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)\$(GitCommitSeven)-$(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'
+          - 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=$(BuildConfiguration) /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 $(Build.Repository.Name).csproj'
             workingDirectory: Fab2ApprovalSystem
-            displayName: "Framework Pack"
\ No newline at end of file
+            displayName: "Framework Pack"
+  # - stage: Development
+  #   displayName: Development
+  #   pool:
+  #     name: Mesa-FabApproval
+  #     demands: Fab2ApprovalSystem-Dev
+  #   variables:
+  #     ASPNETCORE_ENVIRONMENT: "Development"
+  #     configuration: 'Debug'
+  #   jobs:
+  #   - job: Debug
+  #     steps:
+  #       - script: |
+  #           echo $(Build.BuildId)
+  #           echo $(Build.Reason)
+  #           echo $(Build.Repository.Id)
+  #           echo $(Build.Repository.Name)
+  #           echo $(Build.SourceVersion)
+  #           echo $(CoreVersion)
+  #           echo $(BuildConfiguration)
+  #           echo $(Configuration)
+  #           echo $(NugetSource)
+  #           echo $(TargetFrameworkVersion)
+  #           REM echo $(pipelinePassword)
+  #         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=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:RestoreSources=$(NugetSource) $(Build.Repository.Name).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=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(Build.Repository.Name).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=$(BuildConfiguration) /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 $(Build.Repository.Name).csproj'
+  #         workingDirectory: Fab2ApprovalSystem
+  #         displayName: "Framework Pack"
+  # - stage: Production
+  #   displayName: Production
+  #   pool:
+  #     name: Mesa-FabApproval
+  #     demands: Fab2ApprovalSystem
+  #   variables:
+  #     configuration: 'Release'
+  #     ASPNETCORE_ENVIRONMENT: "Production"
+  #   jobs:
+  #     - job: Release
+  #       steps:
+  #         - script: |
+  #             echo $(Build.BuildId)
+  #             echo $(Build.Reason)
+  #             echo $(Build.Repository.Id)
+  #             echo $(Build.Repository.Name)
+  #             echo $(Build.SourceVersion)
+  #             echo $(CoreVersion)
+  #             echo $(BuildConfiguration)
+  #             echo $(Configuration)
+  #             echo $(NugetSource)
+  #             echo $(TargetFrameworkVersion)
+  #             REM echo $(pipelinePassword)
+  #           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=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) /p:RestoreSources=$(NugetSource) $(Build.Repository.Name).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=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(Build.Repository.Name).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=$(BuildConfiguration) /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 $(Build.Repository.Name).csproj'
+  #           workingDirectory: Fab2ApprovalSystem
+  #           displayName: "Framework Pack"
\ No newline at end of file