diff --git a/azure-pipelines-e2e-applications.yml b/azure-pipelines-e2e-applications.yml
index e311d43711..1582b1f32e 100644
--- a/azure-pipelines-e2e-applications.yml
+++ b/azure-pipelines-e2e-applications.yml
@@ -18,49 +18,16 @@ trigger: none
 jobs:
   - job: E2E_Tests_Group_1
     timeoutInMinutes: 60
-    pool: pins-odt-agent-pool-tests
+    pool: pins-template-test
     steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "20.x"
-        displayName: "Install Node.js"
-
-      - task: Npm@1
-        inputs:
-          command: "install"
-          workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
-        displayName: "Install Dependencies"
-
-      - task: Bash@3
-        inputs:
-          targetType: 'inline'
-          script: npx cypress run --spec "cypress/e2e/back-office-applications/addRepresentation.spec.js,cypress/e2e/back-office-applications/addTeam.spec.js,cypress/e2e/back-office-applications/createCase.spec.js,cypress/e2e/back-office-applications/documentProperties.spec.js,cypress/e2e/back-office-applications/documentPropertiesWelsh.spec.js,cypress/e2e/back-office-applications/documentUpload.spec.js"
-          workingDirectory: 'apps/e2e'
-
-        env:
-          BASE_URL: $(BASE_URL)
-          CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
-          CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
-          INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
-          USER_PASSWORD: $(USER_PASSWORD)
-          FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
-        displayName: "Run Cypress Tests Group 1"
+      - script: |
+          echo "node: $(node -v)"
+        displayName: 'check node version'
 
-      - task: PublishBuildArtifacts@1
-        inputs:
-          pathToPublish: 'apps/e2e/cypress/screenshots'
-          artifactName: 'FailedTests'
-        displayName: "Publish Failed Tests Artifacts"
-        condition: failed()
-
-  - job: E2E_Tests_Group_2
-    timeoutInMinutes: 60
-    pool: pins-odt-agent-pool-tests
-    steps:
       - task: NodeTool@0
         inputs:
-          versionSpec: "20.x"
-        displayName: "Install Node.js"
+          versionSpec: '20.x'
+        displayName: 'Use Node 20'
 
       - task: Npm@1
         inputs:
@@ -71,7 +38,7 @@ jobs:
       - task: Bash@3
         inputs:
           targetType: 'inline'
-          script: npx cypress run --spec "cypress/e2e/back-office-applications/documentVersioning.spec.js,cypress/e2e/back-office-applications/editCase.spec.js,cypress/e2e/back-office-applications/examTimetable.spec.js"
+          script: npx cypress run --spec "cypress/e2e/back-office-applications/addRepresentation.spec.js"
           workingDirectory: 'apps/e2e'
 
         env:
@@ -81,44 +48,7 @@ jobs:
           INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
           USER_PASSWORD: $(USER_PASSWORD)
           FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
-        displayName: "Run Cypress Tests Group 2"
-
-      - task: PublishBuildArtifacts@1
-        inputs:
-          pathToPublish: 'apps/e2e/cypress/screenshots'
-          artifactName: 'FailedTests'
-        displayName: "Publish Failed Tests Artifacts"
-        condition: failed()
-
-  - job: E2E_Tests_Group_3
-    timeoutInMinutes: 60
-    pool: pins-odt-agent-pool-tests
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "20.x"
-        displayName: "Install Node.js"
-
-      - task: Npm@1
-        inputs:
-          command: "install"
-          workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
-        displayName: "Install Dependencies"
-
-      - task: Bash@3
-        inputs:
-          targetType: 'inline'
-          script: npx cypress run --spec "cypress/e2e/back-office-applications/publishDocuments.spec.js,cypress/e2e/back-office-applications/s51Advice.spec.js,cypress/e2e/back-office-applications/search.spec.js,cypress/e2e/back-office-applications/searchDocuments.spec.js,cypress/e2e/back-office-applications/sectorAsTraing.spec.js,cypress/e2e/back-office-applications/smokeTests.spec.js"
-          workingDirectory: 'apps/e2e'
-
-        env:
-          BASE_URL: $(BASE_URL)
-          CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
-          CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
-          INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
-          USER_PASSWORD: $(USER_PASSWORD)
-          FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
-        displayName: "Run Cypress Tests Group 3"
+        displayName: "Run Cypress Tests Group 1"
 
       - task: PublishBuildArtifacts@1
         inputs:
@@ -127,39 +57,113 @@ jobs:
         displayName: "Publish Failed Tests Artifacts"
         condition: failed()
 
-  - job: E2E_Tests_Group_4
-    timeoutInMinutes: 60
-    pool: pins-odt-agent-pool-tests
-    steps:
-      - task: NodeTool@0
-        inputs:
-          versionSpec: "20.x"
-        displayName: "Install Node.js"
-
-      - task: Npm@1
-        inputs:
-          command: "install"
-          workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
-        displayName: "Install Dependencies"
-
-      - task: Bash@3
-        inputs:
-          targetType: 'inline'
-          script: DEBUG=cypress:* npx cypress run --headed --browser chrome --spec "cypress/e2e/back-office-applications/publishDocuments.spec.js,cypress/e2e/back-office-applications/s51Advice.spec.js,cypress/e2e/back-office-applications/search.spec.js,cypress/e2e/back-office-applications/searchDocuments.spec.js,cypress/e2e/back-office-applications/sectorAsTraing.spec.js,cypress/e2e/back-office-applications/smokeTests.spec.js"
-          workingDirectory: 'apps/e2e'
-
-        env:
-          BASE_URL: $(BASE_URL)
-          CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
-          CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
-          INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
-          USER_PASSWORD: $(USER_PASSWORD)
-          FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
-        displayName: "Run Cypress Tests Group 4"
-
-      - task: PublishBuildArtifacts@1
-        inputs:
-          pathToPublish: 'apps/e2e/cypress/screenshots'
-          artifactName: 'FailedTests'
-        displayName: "Publish Failed Tests Artifacts"
-        condition: failed()
+  # - job: E2E_Tests_Group_2
+  #   timeoutInMinutes: 60
+  #   pool: pins-odt-agent-pool-tests
+  #   steps:
+  #     - task: NodeTool@0
+  #       inputs:
+  #         versionSpec: "20.x"
+  #       displayName: "Install Node.js"
+
+  #     - task: Npm@1
+  #       inputs:
+  #         command: "install"
+  #         workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
+  #       displayName: "Install Dependencies"
+
+  #     - task: Bash@3
+  #       inputs:
+  #         targetType: 'inline'
+  #         script: npx cypress run --spec "cypress/e2e/back-office-applications/documentVersioning.spec.js,cypress/e2e/back-office-applications/editCase.spec.js,cypress/e2e/back-office-applications/examTimetable.spec.js"
+  #         workingDirectory: 'apps/e2e'
+
+  #       env:
+  #         BASE_URL: $(BASE_URL)
+  #         CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
+  #         CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
+  #         INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
+  #         USER_PASSWORD: $(USER_PASSWORD)
+  #         FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
+  #       displayName: "Run Cypress Tests Group 2"
+
+  #     - task: PublishBuildArtifacts@1
+  #       inputs:
+  #         pathToPublish: 'apps/e2e/cypress/screenshots'
+  #         artifactName: 'FailedTests'
+  #       displayName: "Publish Failed Tests Artifacts"
+  #       condition: failed()
+
+  # - job: E2E_Tests_Group_3
+  #   timeoutInMinutes: 60
+  #   pool: pins-odt-agent-pool-tests
+  #   steps:
+  #     - task: NodeTool@0
+  #       inputs:
+  #         versionSpec: "20.x"
+  #       displayName: "Install Node.js"
+
+  #     - task: Npm@1
+  #       inputs:
+  #         command: "install"
+  #         workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
+  #       displayName: "Install Dependencies"
+
+  #     - task: Bash@3
+  #       inputs:
+  #         targetType: 'inline'
+  #         script: npx cypress run --spec "cypress/e2e/back-office-applications/publishDocuments.spec.js,cypress/e2e/back-office-applications/s51Advice.spec.js,cypress/e2e/back-office-applications/search.spec.js,cypress/e2e/back-office-applications/searchDocuments.spec.js,cypress/e2e/back-office-applications/sectorAsTraing.spec.js,cypress/e2e/back-office-applications/smokeTests.spec.js"
+  #         workingDirectory: 'apps/e2e'
+
+  #       env:
+  #         BASE_URL: $(BASE_URL)
+  #         CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
+  #         CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
+  #         INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
+  #         USER_PASSWORD: $(USER_PASSWORD)
+  #         FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
+  #       displayName: "Run Cypress Tests Group 3"
+
+  #     - task: PublishBuildArtifacts@1
+  #       inputs:
+  #         pathToPublish: 'apps/e2e/cypress/screenshots'
+  #         artifactName: 'FailedTests'
+  #       displayName: "Publish Failed Tests Artifacts"
+  #       condition: failed()
+
+  # - job: E2E_Tests_Group_4
+  #   timeoutInMinutes: 60
+  #   pool: pins-odt-agent-pool-tests
+  #   steps:
+  #     - task: NodeTool@0
+  #       inputs:
+  #         versionSpec: "20.x"
+  #       displayName: "Install Node.js"
+
+  #     - task: Npm@1
+  #       inputs:
+  #         command: "install"
+  #         workingDir: $(System.DefaultWorkingDirectory)/apps/e2e
+  #       displayName: "Install Dependencies"
+
+  #     - task: Bash@3
+  #       inputs:
+  #         targetType: 'inline'
+  #         script: DEBUG=cypress:* npx cypress run --headed --browser chrome --spec "cypress/e2e/back-office-applications/publishDocuments.spec.js,cypress/e2e/back-office-applications/s51Advice.spec.js,cypress/e2e/back-office-applications/search.spec.js,cypress/e2e/back-office-applications/searchDocuments.spec.js,cypress/e2e/back-office-applications/sectorAsTraing.spec.js,cypress/e2e/back-office-applications/smokeTests.spec.js"
+  #         workingDirectory: 'apps/e2e'
+
+      #   env:
+      #     BASE_URL: $(BASE_URL)
+      #     CASE_TEAM_EMAIL: $(CASE_TEAM_EMAIL)
+      #     CASE_ADMIN_EMAIL: $(CASE_ADMIN_EMAIL)
+      #     INSPECTOR_EMAIL: $(INSPECTOR_EMAIL)
+      #     USER_PASSWORD: $(USER_PASSWORD)
+      #     FEATURE_FLAG_CONNECTION_STRING: $(FEATURE_FLAG_CONNECTION_STRING)
+      #   displayName: "Run Cypress Tests Group 4"
+
+      # - task: PublishBuildArtifacts@1
+      #   inputs:
+      #     pathToPublish: 'apps/e2e/cypress/screenshots'
+      #     artifactName: 'FailedTests'
+      #   displayName: "Publish Failed Tests Artifacts"
+      #   condition: failed()