diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 078e258..568bfc0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -17,11 +17,83 @@ variables:
   buildConfiguration: "Release"
   targetFrameworkVersion: 'v4.8'
   coreVersion: 'na'
-  nugetSource: 'https://eaf-prod.mes.infineon.com/v3/index.json'
+  nugetSource: 'https://messa017.infineon.com/v3/index.json'
   assemblyTitle: 'Fab2ApprovalSystem'
   architecture: 'x64'
 
 stages:
+  - stage: Development
+    displayName: Development
+    pool:
+      name: Mesa-FabApproval
+      demands: Fab2ApprovalSystem-Dev
+    variables:
+      ASPNETCORE_ENVIRONMENT: "Development"
+      configuration: 'Debug'
+    jobs:
+    - job: Debug
+      steps:
+        - script: |
+            echo BuildId: $(Build.BuildId)
+            echo Build reason: $(Build.Reason)
+            echo Repo Id: $(Build.Repository.Id)
+            echo Repo name: $(Build.Repository.Name)
+            echo Source version: $(Build.SourceVersion)
+            echo Core version: $(CoreVersion)
+            echo Build configuration: $(BuildConfiguration)
+            echo Configuration: $(Configuration)
+            echo Nuget source: $(NugetSource)
+            echo Target Framework version: $(TargetFrameworkVersion)
+            echo Assembly title: $(AssemblyTitle)
+          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) $(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=$(BuildConfiguration);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=$(BuildConfiguration) /p:LastUsedPlatform="Any CPU" /p:LaunchSiteAfterPublish=true /p:OutputPath="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)\$(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
+    variables:
+      configuration: 'Release'
+      ASPNETCORE_ENVIRONMENT: "Production"
+    jobs:
+      - job: Release
+        steps:
+          - script: |
+              echo BuildId: $(Build.BuildId)
+              echo Build reason: $(Build.Reason)
+              echo Repo Id: $(Build.Repository.Id)
+              echo Repo name: $(Build.Repository.Name)
+              echo Source version: $(Build.SourceVersion)
+              echo Core version: $(CoreVersion)
+              echo Build configuration: $(BuildConfiguration)
+              echo Configuration: $(Configuration)
+              echo Nuget source: $(NugetSource)
+              echo Target Framework version: $(TargetFrameworkVersion)
+              echo Assembly title: $(AssemblyTitle)
+            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) $(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=$(BuildConfiguration);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=$(BuildConfiguration) /p:LastUsedPlatform="Any CPU" /p:LaunchSiteAfterPublish=true /p:OutputPath="D:\$(TargetFrameworkVersion)\$(Build.Repository.Name)\$(Build.BuildId)\$(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_EC
     displayName: Production-EC
     pool:
@@ -34,109 +106,28 @@ 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 BuildId: $(Build.BuildId)
+              echo Build reason: $(Build.Reason)
+              echo Repo Id: $(Build.Repository.Id)
+              echo Repo name: $(Build.Repository.Name)
+              echo Source version: $(Build.SourceVersion)
+              echo Core version: $(CoreVersion)
+              echo Build configuration: $(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 Nuget source: $(NugetSource)
+              echo Target Framework version: $(TargetFrameworkVersion)
+              echo Assembly title: $(AssemblyTitle)
             displayName: "Echo Check"
 
-          - 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:
-  #     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)
-  #           echo $(AssemblyTitle)
-  #         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) $(AssemblyTitle).csproj'
+            workingDirectory: Fab2ApprovalSystem
+            displayName: "Framework Restore"
 
-  #       - 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) $(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=$(BuildConfiguration);TargetFrameworkVersion=$(TargetFrameworkVersion) $(AssemblyTitle).csproj'
+            workingDirectory: Fab2ApprovalSystem
+            displayName: "Framework Build"
 
-  #       - 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) $(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=$(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 $(AssemblyTitle).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)
-  #             echo $(AssemblyTitle)
-  #           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) $(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=$(BuildConfiguration);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=$(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 $(AssemblyTitle).csproj'
-  #           workingDirectory: Fab2ApprovalSystem
-  #           displayName: "Framework Pack"
\ No newline at end of file
+          - 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)\$(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"
+  
\ No newline at end of file