diff --git a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
index fe94dde2..83c7e37b 100644
--- a/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
+++ b/azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
@@ -4,53 +4,44 @@
 variables:
 - name: imageVersion
   value: 0.8.0
+- name: containerImageVersion
+  value: 0.9.0
 
 trigger:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/doclient-lite-native-steps.yml
-      - client-lite/*
-      - common/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - azure-pipelines/*
+- none
 
 pr:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/doclient-lite-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/doclient-lite-native-steps.yml
-      - client-lite/*
-      - common/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - azure-pipelines/*
+- none
 
-pool:
-  name: 1es_hosted_pool_ubuntu_1804
-  demands: ImageOverride -equals do-adu-build-$(imageVersion)
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
 
-jobs:
-- job: Debug
-  steps:
-  - template: ../templates/doclient-lite-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: debug
-
-- job: Release
-  steps:
-  - template: ../templates/doclient-lite-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: minsizerel
-      skipTests: true
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: ubuntu-latest
+      os: linux
+    sdl:
+      sourceAnalysisPool:
+        name: Azure-Pipelines-1ESPT-ExDShared
+        image: windows-latest
+        os: windows
+      suppression:
+        suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
+    customBuildTags:
+    - ES365AIMigrationTooling
+      
+    stages:
+    - stage: build
+      jobs:
+      - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
+        parameters:
+          targetOsArch: 'ubuntu1804_x64'
+          imageVersion: ${{variables.containerImageVersion}}
+          stepsTemplate: '/azure-pipelines/build/linux/du/templates/doclient-lite-docker-steps.yml'
\ No newline at end of file
diff --git a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
index bd7aed87..684ab7de 100644
--- a/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
+++ b/azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
@@ -4,54 +4,43 @@
 variables:
 - name: imageVersion
   value: 0.8.0
+- name: containerImageVersion
+  value: 0.9.0
 
 trigger:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/dopapt-native-steps.yml
-      - common/*
-      - plugins/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - 'azure-pipelines/*'
-      - 'plugins/linux-apt/scripts/configure-apt-method.sh'
-
+- none
 pr:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/dopapt-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/dopapt-native-steps.yml
-      - common/*
-      - plugins/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - 'azure-pipelines/*'
-      - 'plugins/linux-apt/scripts/configure-apt-method.sh'
-
-pool:
-  name: 1es_hosted_pool_ubuntu_1804
-  demands: ImageOverride -equals do-adu-build-$(imageVersion)
+- none
 
-jobs:
-- job: Debug
-  steps:
-  - template: ../templates/dopapt-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: debug
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
 
-- job: Release
-  steps:
-  - template: ../templates/dopapt-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: minsizerel
\ No newline at end of file
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: ubuntu-latest
+      os: linux
+    sdl:
+      sourceAnalysisPool:
+        name: Azure-Pipelines-1ESPT-ExDShared
+        image: windows-latest
+        os: windows
+      suppression:
+        suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
+    customBuildTags:
+    - ES365AIMigrationTooling
+      
+    stages:
+    - stage: build
+      jobs:
+      - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
+        parameters:
+          targetOsArch: 'ubuntu1804_x64'
+          imageVersion: ${{variables.containerImageVersion}}
+          stepsTemplate: 'dopapt-docker-steps.yml'
\ No newline at end of file
diff --git a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
index c7722ade..6475feca 100644
--- a/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
+++ b/azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
@@ -5,55 +5,44 @@
 variables:
 - name: imageVersion
   value: 0.8.0
+- name: containerImageVersion
+  value: 0.9.0
 
 trigger:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/dosdkcpp-native-steps.yml
-      - common/*
-      - sdk-cpp/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - azure-pipelines/*
-      - sdk-cpp/build/cleanup-install.sh
+- none
 
 pr:
-  branches:
-    include:
-      - develop
-  paths:
-    include:
-      - azure-pipelines/build/linux/du/native/dosdkcpp-ubuntu1804.yml
-      - azure-pipelines/build/linux/du/templates/dosdkcpp-native-steps.yml
-      - common/*
-      - sdk-cpp/*
-      - build/build.py
-      - CMakeLists.txt
-    exclude:
-      - azure-pipelines/*
-      - sdk-cpp/build/cleanup-install.sh
+- none
 
-pool:
-  name: 1es_hosted_pool_ubuntu_1804
-  demands: ImageOverride -equals do-adu-build-$(imageVersion)
+resources:
+  repositories:
+  - repository: 1ESPipelineTemplates
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
 
-jobs:
-- job: Debug
-  steps:
-  - template: ../templates/dosdkcpp-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: debug
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
+  parameters:
+    pool:
+      name: Azure-Pipelines-1ESPT-ExDShared
+      image: ubuntu-latest
+      os: linux
+    sdl:
+      sourceAnalysisPool:
+        name: Azure-Pipelines-1ESPT-ExDShared
+        image: windows-latest
+        os: windows
+      suppression:
+        suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
+    customBuildTags:
+    - ES365AIMigrationTooling
 
-- job: Release
-  steps:
-  - template: ../templates/dosdkcpp-native-steps.yml
-    parameters:
-      targetOsArch: 'ubuntu1804_x64'
-      config: minsizerel
-      skipTests: true
+    stages:
+    - stage: build
+      jobs:
+      - template: /azure-pipelines/build/linux/du/templates/do-docker-jobs.yml@self
+        parameters:
+          targetOsArch: 'ubuntu1804_x64'
+          imageVersion: ${{variables.containerImageVersion}}
+          stepsTemplate: 'dosdkcpp-docker-steps.yml'
diff --git a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml
index 8af63e52..b5fe7af7 100644
--- a/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml
+++ b/azure-pipelines/build/linux/du/templates/do-docker-jobs.yml
@@ -10,22 +10,30 @@ parameters:
   type: string
 
 jobs:
+- job: ${{parameters.targetOsArch}}
+  steps:
+  - checkout: self
+    path: 's' # Copy to sources directory (templates do not do this automatically)
+
 - job: ${{parameters.targetOsArch}}_debug
   steps:
-  - template: ${{parameters.stepsTemplate}}
+  - template: ${{parameters.stepsTemplate}}@self
     parameters:
       targetOsArch: ${{parameters.targetOsArch}}
       imageVersion: ${{parameters.imageVersion}}
       config: debug
-  - publish: $(Build.ArtifactStagingDirectory)
-    artifact: 'doclient-drop-${{parameters.targetOsArch}}-debug'
 
 - job: ${{parameters.targetOsArch}}_release
   steps:
-  - template: ${{parameters.stepsTemplate}}
+  - template: ${{parameters.stepsTemplate}}@self
     parameters:
       targetOsArch: ${{parameters.targetOsArch}}
       imageVersion: ${{parameters.imageVersion}}
       config: minsizerel
-  - publish: $(Build.ArtifactStagingDirectory)
-    artifact: 'doclient-drop-${{parameters.targetOsArch}}-minsizerel'
+
+  templateContext:
+    outputs:
+    - output: pipelineArtifact
+      displayName: 'Publish artifacts'
+      targetPath: '$(Build.ArtifactStagingDirectory)'
+      artifact: 'doclient-drop-${{parameters.targetOsArch}}'