diff --git a/Tasks/DownloadBuildArtifacts/package-lock.json b/Tasks/DownloadBuildArtifacts/package-lock.json
index cfc58caf228e..1ab78d92a752 100644
--- a/Tasks/DownloadBuildArtifacts/package-lock.json
+++ b/Tasks/DownloadBuildArtifacts/package-lock.json
@@ -20,9 +20,9 @@
       "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "artifact-engine": {
-      "version": "0.1.22",
-      "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.22.tgz",
-      "integrity": "sha512-OrPpth5RRpZ/r2/UGS8avEEfX2fY4aOKoV1/1LosaBwh/EzahgH4OHAR5qVxdP3xSRwIc2RoFMQJ6KyAPdoIkw==",
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.23.tgz",
+      "integrity": "sha512-JYtJsBVBqK2pl2b7CLrdyGCsPbTVSVYStnr4g65z3xXiwk2P9nVxq2vHYBTFeEm86oCm//W2syi6cGWnx8NrvQ==",
       "requires": {
         "handlebars": "4.0.10",
         "minimatch": "3.0.2",
diff --git a/Tasks/DownloadBuildArtifacts/package.json b/Tasks/DownloadBuildArtifacts/package.json
index b8ae45c58159..2e891973c2cf 100644
--- a/Tasks/DownloadBuildArtifacts/package.json
+++ b/Tasks/DownloadBuildArtifacts/package.json
@@ -19,6 +19,6 @@
   "dependencies": {
     "vsts-task-lib": "2.1.0",
     "vso-node-api": "^6.2.8-preview",
-    "artifact-engine": "0.1.22"
+    "artifact-engine": "0.1.23"
   }
 }
diff --git a/Tasks/DownloadBuildArtifacts/task.json b/Tasks/DownloadBuildArtifacts/task.json
index 0ba279de4ea0..16da7537b0b1 100644
--- a/Tasks/DownloadBuildArtifacts/task.json
+++ b/Tasks/DownloadBuildArtifacts/task.json
@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 136,
-    "Patch": 0
+    "Patch": 1
   },
   "groups": [
     {
diff --git a/Tasks/DownloadBuildArtifacts/task.loc.json b/Tasks/DownloadBuildArtifacts/task.loc.json
index 29dd09bc661b..d6d603439889 100644
--- a/Tasks/DownloadBuildArtifacts/task.loc.json
+++ b/Tasks/DownloadBuildArtifacts/task.loc.json
@@ -9,7 +9,7 @@
   "version": {
     "Major": 0,
     "Minor": 136,
-    "Patch": 0
+    "Patch": 1
   },
   "groups": [
     {
@@ -162,19 +162,25 @@
     {
       "endpointId": "tfs:teamfoundation",
       "target": "project",
-      "endpointUrl": "{{endpoint.url}}/_apis/projects",
+      "endpointUrl": "{{endpoint.url}}/_apis/projects?$skip={{skip}}&$top=1000",
       "resultSelector": "jsonpath:$.value[?(@.state=='wellFormed')]",
-      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
+      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }",
+      "callbackContextTemplate": "{\"skip\": \"{{add skip 1000}}\"}",
+      "callbackRequiredTemplate": "{{isEqualNumber result.count 1000}}",
+      "initialContextTemplate": "{\"skip\": \"0\"}"
     },
     {
       "endpointId": "tfs:teamfoundation",
       "target": "definition",
-      "endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/definitions?$top=1000",
+      "endpointUrl": "{{endpoint.url}}/{{project}}/_apis/build/definitions?api-version=3.0-preview&$top=1000&continuationToken={{{continuationToken}}}&queryOrder=2",
       "resultSelector": "jsonpath:$.value[?(@.quality=='definition')]",
       "parameters": {
         "project": "$(project)"
       },
-      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }"
+      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{name}}}\" }",
+      "callbackContextTemplate": "{\"continuationToken\" : \"{{{headers.x-ms-continuationtoken}}}\"}",
+      "callbackRequiredTemplate": "{{{#headers.x-ms-continuationtoken}}}true{{{/headers.x-ms-continuationtoken}}}",
+      "initialContextTemplate": "{\"continuationToken\" : \"{{{system.utcNow}}}\"}"
     },
     {
       "endpointId": "tfs:teamfoundation",
@@ -224,4 +230,4 @@
     "LatestBuildNotFound": "ms-resource:loc.messages.LatestBuildNotFound",
     "LatestBuildFromBranchNotFound": "ms-resource:loc.messages.LatestBuildFromBranchNotFound"
   }
-}
+}
\ No newline at end of file
diff --git a/Tasks/JenkinsDownloadArtifacts/package-lock.json b/Tasks/JenkinsDownloadArtifacts/package-lock.json
index e77c68e977ca..15ce6318961c 100644
--- a/Tasks/JenkinsDownloadArtifacts/package-lock.json
+++ b/Tasks/JenkinsDownloadArtifacts/package-lock.json
@@ -34,9 +34,9 @@
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "artifact-engine": {
-      "version": "0.1.22",
-      "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.22.tgz",
-      "integrity": "sha512-OrPpth5RRpZ/r2/UGS8avEEfX2fY4aOKoV1/1LosaBwh/EzahgH4OHAR5qVxdP3xSRwIc2RoFMQJ6KyAPdoIkw==",
+      "version": "0.1.23",
+      "resolved": "https://registry.npmjs.org/artifact-engine/-/artifact-engine-0.1.23.tgz",
+      "integrity": "sha512-JYtJsBVBqK2pl2b7CLrdyGCsPbTVSVYStnr4g65z3xXiwk2P9nVxq2vHYBTFeEm86oCm//W2syi6cGWnx8NrvQ==",
       "requires": {
         "handlebars": "4.0.10",
         "minimatch": "3.0.2",
diff --git a/Tasks/JenkinsDownloadArtifacts/package.json b/Tasks/JenkinsDownloadArtifacts/package.json
index 5c45d9a329e5..f1bff2217231 100644
--- a/Tasks/JenkinsDownloadArtifacts/package.json
+++ b/Tasks/JenkinsDownloadArtifacts/package.json
@@ -8,7 +8,7 @@
   "author": "Microsoft Corporation",
   "license": "MIT",
   "dependencies": {
-    "artifact-engine": "0.1.22",
+    "artifact-engine": "0.1.23",
     "azure-arm-rest": "file:../../_build/Tasks/Common/azure-arm-rest-1.0.2.tgz",
     "azure-blobstorage-artifactProvider": "file:../../_build/Tasks/Common/azure-blobstorage-artifactProvider-1.0.0.tgz",
     "decompress-zip": "0.3.0",
diff --git a/Tasks/JenkinsDownloadArtifacts/task.json b/Tasks/JenkinsDownloadArtifacts/task.json
index 66334128145b..069d52ffe16b 100644
--- a/Tasks/JenkinsDownloadArtifacts/task.json
+++ b/Tasks/JenkinsDownloadArtifacts/task.json
@@ -17,7 +17,7 @@
     "demands": [],
     "version": {
         "Major": 1,
-        "Minor": 135,
+        "Minor": 136,
         "Patch": 0
     },
     "groups": [
diff --git a/Tasks/JenkinsDownloadArtifacts/task.loc.json b/Tasks/JenkinsDownloadArtifacts/task.loc.json
index 40433512e0b1..f3f40320a141 100644
--- a/Tasks/JenkinsDownloadArtifacts/task.loc.json
+++ b/Tasks/JenkinsDownloadArtifacts/task.loc.json
@@ -17,7 +17,7 @@
   "demands": [],
   "version": {
     "Major": 1,
-    "Minor": 135,
+    "Minor": 136,
     "Patch": 0
   },
   "groups": [