diff --git a/ci/partials/cancel-deployment.yml b/ci/partials/cancel-deployment.yml
deleted file mode 100644
index 6356691..0000000
--- a/ci/partials/cancel-deployment.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-platform: linux
-inputs: [name: src]
-run:
-  dir: src
-  path: ci/tasks/cancel-deployment.sh
diff --git a/ci/partials/restage.yml b/ci/partials/restage.yml
deleted file mode 100644
index 7746b0b..0000000
--- a/ci/partials/restage.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-platform: linux
-inputs: [name: src]
-run:
-  path: src/ci/tasks/restage.sh
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f8d8ea0..f375680 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -46,7 +46,7 @@ jobs:
       context: test
 
   - get: node
-  - get: cf-image
+  - get: general-task
 
   - do: *test
 
@@ -77,12 +77,13 @@ jobs:
     params: {depth: 1}
 
   - get: node
-  - get: cf-image
+  - get: general-task
+  - get: pipeline-tasks
 
   - do: *test
 
   - task: deploy
-    image: cf-image
+    image: general-task
     file: src/ci/partials/deploy.yml
     params:
       <<: *email-cf
@@ -90,8 +91,8 @@ jobs:
     on_failure:
       try:
         task: cancel-deployment
-        image: cf-image
-        file: src/ci/partials/cancel-deployment.yml
+        image: general-task
+        file: pipeline-tasks/tasks/cancel-deployment.yml
         params:
           <<: *email-cf
 
@@ -121,13 +122,14 @@ jobs:
     resource: src
     passed: [set-pipeline]
     params: {depth: 1}
-  - get: cf-image
+  - get: general-task
+  - get: pipeline-tasks
   - get: nightly
     trigger: true
 
   - task: restage
-    image: cf-image
-    file: src/ci/partials/restage.yml
+    image: general-task
+    file: pipeline-tasks/tasks/restage.yml
     params:
       <<: *email-cf
 
@@ -165,6 +167,12 @@ resources:
       branch: main
       commit_verification_keys: ((cloud-gov-pages-gpg-keys))
 
+  - name: pipeline-tasks
+    type: git
+    source:
+      uri: ((pipeline-tasks-git-url))
+      branch: main
+
   - name: nightly
     type: time
     source:
@@ -186,7 +194,7 @@ resources:
       aws_region: us-gov-west-1
       tag: latest
 
-  - name: cf-image
+  - name: general-task
     type: registry-image
     source:
       aws_access_key_id: ((ecr-aws-key))
@@ -200,6 +208,14 @@ resources:
 #  RESOURCE TYPES
 
 resource_types:
+  - name: git
+    type: registry-image
+    source:
+      aws_access_key_id: ((ecr_aws_key))
+      aws_secret_access_key: ((ecr_aws_secret))
+      repository: git-resource
+      aws_region: us-gov-west-1
+      tag: latest
 
   - name: pull-request
     type: registry-image
diff --git a/ci/tasks/cancel-deployment.sh b/ci/tasks/cancel-deployment.sh
deleted file mode 100755
index 09fcad9..0000000
--- a/ci/tasks/cancel-deployment.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cf api $CF_API
-cf auth
-
-cf t -o $CF_ORG -s $CF_SPACE
-
-cf cancel-deployment $CF_APP_NAME
\ No newline at end of file
diff --git a/ci/tasks/restage.sh b/ci/tasks/restage.sh
deleted file mode 100755
index c1479c6..0000000
--- a/ci/tasks/restage.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-cf api $CF_API
-cf auth
-
-cf t -o $CF_ORG -s $CF_SPACE
-
-cf restage $CF_APP_NAME --strategy rolling
\ No newline at end of file