diff --git a/pipelines/.cruft.json b/pipelines/.cruft.json
new file mode 100644
index 0000000..12eab21
--- /dev/null
+++ b/pipelines/.cruft.json
@@ -0,0 +1,21 @@
+{
+  "template": "https://github.com/CybercentreCanada/assemblyline-service-pipeline-generator.git",
+  "commit": "eb41868283c10b1a31746ebfd29b2c0e32c26025",
+  "checkout": null,
+  "context": {
+    "cookiecutter": {
+      "__directory_name": "pipelines",
+      "classification": "UNCLASSIFIED",
+      "is_public": true,
+      "test_in_container": true,
+      "test_versions": "default",
+      "timeout": "default",
+      "__setupscript": "setup.bash",
+      "_extensions": [
+        "local_extensions.extract_versions"
+      ],
+      "_template": "https://github.com/CybercentreCanada/assemblyline-service-pipeline-generator.git"
+    }
+  },
+  "directory": null
+}
diff --git a/pipelines/.gitignore b/pipelines/.gitignore
new file mode 100644
index 0000000..21a119d
--- /dev/null
+++ b/pipelines/.gitignore
@@ -0,0 +1 @@
+setup.bash
diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
old mode 100755
new mode 100644
index f04b4fa..a56c6eb
--- a/pipelines/azure-build.yaml
+++ b/pipelines/azure-build.yaml
@@ -1,81 +1,36 @@
-name: build
-
-variables:
-  - group: unittest-samples
-  - name: self_location
-    value: "self_location"
-  - name: full_self_location
-    value: "$(Agent.BuildDirectory)/$(self_location)"
-  - name: samples_location
-    value: "samples_location"
-  - name: full_samples_location
-    value: "$(Agent.BuildDirectory)/$(samples_location)"
-
-resources:
-  repositories:
-  - repository: unittest-samples
-    type: github
-    name: $(unittest_samples_repository)
-    ref: main
-    endpoint: github-repo-sa
-    trigger: none
-
-trigger:
-  tags:
-    include: ["v*"]
-pr: none
-
-pool:
-  vmImage: "ubuntu-20.04"
-
-stages:
-  - stage: deploy
-    jobs:
-      - job: deploy
-        displayName: Deploy containers to dockerhub
-        variables:
-          - group: deployment-information
-        steps:
-          - task: Docker@2
-            displayName: Login to docker hub
-            inputs:
-              command: login
-              containerRegistry: dockerhub
-          - task: Docker@2
-            displayName: Login to chimera
-            inputs:
-              command: login
-              containerRegistry: CHIMERA-U-ACR
-          - checkout: self
-            fetchDepth: 1
-            path: $(self_location)
-          - checkout: unittest-samples
-            fetchDepth: 1
-            path: $(samples_location)
-          - script: |
-              export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
-              if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
-              docker build --build-arg version=$TAG --build-arg branch=$BUILD_TYPE -t cccs/${BUILD_REPOSITORY_NAME##*/}:$TAG -t cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE -f ./Dockerfile .
-            workingDirectory: $(full_self_location)
-            displayName: Build containers
-          - script: |
-              [ ! -d "$(pwd)/tests" ] && echo "No tests found" && exit
-              export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
-              if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
-              [ -f "$(pwd)/tests/requirements.txt" ] && docker run -e FULL_SELF_LOCATION=/opt/al_service -e FULL_SAMPLES_LOCATION=/opt/samples -v /usr/share/ca-certificates/mozilla:/usr/share/ca-certificates/mozilla -v $(pwd)/tests/:/opt/al_service/tests/ -v ${FULL_SAMPLES_LOCATION}:/opt/samples cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE bash -c 'pip install -U -r tests/requirements.txt; pytest -p no:cacheprovider -xsvvv' && exit
-              docker run -e FULL_SELF_LOCATION=/opt/al_service -e FULL_SAMPLES_LOCATION=/opt/samples -v /usr/share/ca-certificates/mozilla:/usr/share/ca-certificates/mozilla -v $(pwd)/tests/:/opt/al_service/tests/ -v ${FULL_SAMPLES_LOCATION}:/opt/samples cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE bash -c 'pytest -p no:cacheprovider -xsvvv'
-            workingDirectory: $(full_self_location)
-            displayName: Test containers
-          - script: |
-              export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
-              if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
-              export SERIES="`expr $TAG : '\([0-9]\+\.[0-9]\+\.\)'`${BUILD_TYPE}"
-
-              for IMAGE in "cccs/" "uchimera.azurecr.io/cccs/"
-              do
-                docker tag cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE ${IMAGE}${BUILD_REPOSITORY_NAME##*/}:$TAG
-                docker tag cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE ${IMAGE}${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE
-                docker tag cccs/${BUILD_REPOSITORY_NAME##*/}:$BUILD_TYPE ${IMAGE}${BUILD_REPOSITORY_NAME##*/}:$SERIES
-                docker push ${IMAGE}${BUILD_REPOSITORY_NAME##*/} --all-tags
-              done
-            displayName: Deploy to container repositories
+name: build
+
+variables:
+  - group: unittest-samples
+
+trigger:
+  tags:
+    include: ["v*"]
+pr: none
+
+pool:
+  vmImage: "ubuntu-20.04"
+
+resources:
+  repositories:
+    - repository: PipelineTemplates
+      type: github
+      name: CybercentreCanada/assemblyline-pipeline-templates
+      ref: refs/heads/main
+      endpoint: github-repo-sa
+      trigger: none
+    - repository: unittest-samples
+      type: github
+      name: $(unittest_samples_repository)
+      ref: main
+      endpoint: github-repo-sa
+      trigger: none
+
+extends:
+  template: stages/deploy-service.yaml@PipelineTemplates
+  parameters:
+    is_public: "true"
+    samples_repo: unittest-samples
+    labels:
+      classification: "UNCLASSIFIED"
+    
\ No newline at end of file
diff --git a/pipelines/azure-tests.yaml b/pipelines/azure-tests.yaml
old mode 100755
new mode 100644
index 7fee0f7..d984083
--- a/pipelines/azure-tests.yaml
+++ b/pipelines/azure-tests.yaml
@@ -2,23 +2,6 @@ name: tests
 
 variables:
   - group: unittest-samples
-  - name: self_location
-    value: "self_location"
-  - name: full_self_location
-    value: "$(Agent.BuildDirectory)/$(self_location)"
-  - name: samples_location
-    value: "samples_location"
-  - name: full_samples_location
-    value: "$(Agent.BuildDirectory)/$(samples_location)"
-
-resources:
-  repositories:
-  - repository: unittest-samples
-    type: github
-    name: $(unittest_samples_repository)
-    ref: main
-    endpoint: github-repo-sa
-    trigger: none
 
 trigger: ["*"]
 pr: ["*"]
@@ -26,45 +9,24 @@ pr: ["*"]
 pool:
   vmImage: "ubuntu-20.04"
 
-jobs:
-  - job: run_test
-    strategy:
-      matrix:
-        Python3_11:
-         python.version: "3.11"
-        Python3_12:
-         python.version: "3.12"
-
-    timeoutInMinutes: 10
+resources:
+  repositories:
+    - repository: PipelineTemplates
+      type: github
+      name: CybercentreCanada/assemblyline-pipeline-templates
+      ref: refs/heads/main
+      endpoint: github-repo-sa
+      trigger: none
+    - repository: unittest-samples
+      type: github
+      name: $(unittest_samples_repository)
+      ref: main
+      endpoint: github-repo-sa
+      trigger: none
 
-    steps:
-      - task: UsePythonVersion@0
-        displayName: Set python version
-        inputs:
-          versionSpec: "$(python.version)"
-      - checkout: self
-        fetchDepth: 1
-        path: $(self_location)
-      - checkout: unittest-samples
-        fetchDepth: 1
-        path: $(samples_location)
-      - script: |
-          [ ! -d "$(pwd)/tests" ] && echo "No tests found" && exit
-          sudo apt-get update
-          sudo apt-get install -y libfuzzy-dev libfuzzy2
-          if [[ -f "$(pwd)/pkglist.txt" ]]; then
-            grep -vE '^#' "$(pwd)/pkglist.txt" | xargs sudo apt install -y
-          fi
-          sudo rm -rf /var/lib/apt/lists/*
-          sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir assemblyline assemblyline_v4_service
-          [ -f $(pwd)/requirements.txt ] && sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir -r $(pwd)/requirements.txt
-          [ -f $(pwd)/tests/requirements.txt ] && sudo env "PATH=$PATH" python -m pip install -U --no-cache-dir -r $(pwd)/tests/requirements.txt
-          sudo rm -rf /tmp/* /var/lib/apt/lists/* ~/.cache/pip
-        workingDirectory: $(full_self_location)
-        displayName: Setup environment
-      - script: |
-          [ ! -d "$(pwd)/tests" ] && echo "No tests found" && exit
-          export REPO_NAME=${BUILD_REPOSITORY_NAME##*/}
-          python -m pytest -p no:cacheprovider --durations=10 -rsx -xsvvv --disable-warnings
-        workingDirectory: $(full_self_location)
-        displayName: Test
+extends:
+  template: stages/test-service.yaml@PipelineTemplates
+  parameters:
+    samples_repo: unittest-samples
+    test_container: "true"
+    
\ No newline at end of file