diff --git a/package.json b/package.json
index b9fd14c..b2e24b3 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "chalk": "^1.1.1"
   },
   "devDependencies": {
-    "cfn-api-gateway-deployment": "^0.4.0",
+    "cfn-api-gateway-deployment": "cplee/cfn-api-gateway-deployment",
     "cfn-api-gateway-integration": "^0.2.0",
     "cfn-api-gateway-integration-response": "^0.2.2",
     "cfn-api-gateway-method": "^0.3.0",
diff --git a/pipeline/cfn/master.json b/pipeline/cfn/master.json
index 04841f3..d962358 100644
--- a/pipeline/cfn/master.json
+++ b/pipeline/cfn/master.json
@@ -281,6 +281,14 @@
     }
   },
   "Outputs":{
+    "TestSiteBucket" : {
+      "Value" : { "Fn::GetAtt" : [ "TestS3Stack", "Outputs.SiteBucket" ] } ,
+      "Description" : "Test Site Bucket - Empty before deleting stack"
+    },
+    "ProdSiteBucket" : {
+      "Value" : { "Fn::GetAtt" : [ "ProdS3Stack", "Outputs.SiteBucket" ] } ,
+      "Description" : "Prod Site Bucket - Empty before deleting stack"
+    },
     "TestSiteUrl" : {
       "Value" : { "Fn::GetAtt" : [ "TestS3Stack", "Outputs.SiteUrl" ] } ,
       "Description" : "Test Site Url"
@@ -289,6 +297,10 @@
       "Value" : { "Fn::GetAtt" : [ "ProdS3Stack", "Outputs.SiteUrl" ] } ,
       "Description" : "Production Site Url"
     },
+    "PipelineBucket" : {
+      "Value" : { "Fn::GetAtt" : [ "PipelineStack", "Outputs.ArtifactBucket" ] } ,
+      "Description" : "Pipeline Artifact Bucket - Empty before deleting stack"
+    },
     "PipelineUrl": {
       "Value": {
         "Fn::Join": [