diff --git a/README.md b/README.md
index ec08785..0de100c 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,27 @@ All of the Templates in this directory are set up to work with [AWS Proton Templ
 ### Running Terraform Using AWS Proton Self-managed Provisioning
 If you need an example of how to run your Terraform code, head on over to [this repo](https://github.com/aws-samples/aws-proton-terraform-github-actions-sample) where we offer an example of running Terraform using GitHub Actions.
 
+###Local Development
+
+For local development, the `<template>/dev-resources/` directory contains variable definitions/values which are normally generated
+by Proton at provision time:
+
+- `proton.variables.tf`: variable type definitions
+- `proton.auto.tfvars.json`: variable value assignments (contains provisioning inputs, environment outputs etc)
+
+To test a template locally, you can create symbolic links to these files in the infrastructure directory. E.g.:
+
+```
+cd <template>/vx/<infrastructure>/
+ln -s ../../dev-resources/proton.variables.tf .
+ln -s ../../dev-resources/proton.auto.tfvars.json .
+terraform init
+terraform plan
+```
+
+Note that you will need to populate `proton.auto.tfvars.json` with the required values according to the template. For
+environments, this will typically be the `environment.name` and `environment.inputs` fields.
+
 ## Security
 
 See [CONTRIBUTING](CONTRIBUTING.md#security-issue-notifications) for more information.
diff --git a/service-templates/README.md b/service-templates/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/service-templates/apigw-lambda-svc/dev-resources/proton.auto.tfvars.json b/service-templates/apigw-lambda-svc/dev-resources/proton.auto.tfvars.json
index bff4489..6753b94 100644
--- a/service-templates/apigw-lambda-svc/dev-resources/proton.auto.tfvars.json
+++ b/service-templates/apigw-lambda-svc/dev-resources/proton.auto.tfvars.json
@@ -3,9 +3,9 @@
     "name": "apigw-lambda-svc",
     "inputs": {
     },
-    "repository_connection_arn": "arn:aws:codestar-connections:us-east-1:259837135622:connection/2ffbd155-98c8-473d-9bae-c15bfbc2d53d",
-    "repository_id": "mikewrighton/aws-proton-sample-services",
-    "branch_name": "main"
+    "repository_connection_arn": "REPLACE_ME",
+    "repository_id": "REPLACE_ME",
+    "branch_name": "REPLACE_ME"
   },
   "service_instances": [
     {
@@ -20,23 +20,11 @@
         "name": "",
         "outputs": {}
       }
-    },
-    {
-      "name": "instance2",
-      "inputs": {
-      },
-      "outputs": {
-      },
-      "environment": {
-        "account_id": "",
-        "name": "",
-        "outputs": {}
-      }
     }
   ],
   "pipeline": {
     "inputs": {
-      "environment_account_ids": "259837135622",
+      "environment_account_ids": "",
       "code_dir": "lambda-ping-sns",
       "unit_test_command": "echo 'add your unit test command here'",
       "packaging_command": "zip function.zip app.js"
@@ -44,8 +32,8 @@
   },
   "environment": {
     "outputs": {
-      "SnsTopicArn": "arn:aws:sns:us-east-1:259837135622:terraform-20220330152010863700000002",
-      "SnsTopicName": "terraform-20220330152010863700000002"
+      "SnsTopicArn": "REPLACE_ME",
+      "SnsTopicName": "REPLACE_ME"
     }
   },
   "service_instance": {
@@ -53,8 +41,8 @@
     "inputs": {
       "lambda_runtime": "nodejs12.x",
       "lambda_handler": "app.handler",
-      "lambda_bucket": "function-bucket20220407174707897600000008",
-      "lambda_key": "4/function.zip"
+      "lambda_bucket": "REPLACE_ME",
+      "lambda_key": "REPLACE_ME"
     }
   }
 }
diff --git a/service-templates/apigw-lambda-svc/v1/.compatible-envs b/service-templates/apigw-lambda-svc/v1/.compatible-envs
index 8509820..19cb681 100644
--- a/service-templates/apigw-lambda-svc/v1/.compatible-envs
+++ b/service-templates/apigw-lambda-svc/v1/.compatible-envs
@@ -1 +1 @@
-vpc-ecs-environment:1
+vpc-env:1
diff --git a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/config.tf b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/config.tf
index f7f28c3..68e3646 100644
--- a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/config.tf
+++ b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/config.tf
@@ -6,16 +6,12 @@ terraform {
     }
   }
 
-  backend "s3" {
-    region = "us-east-1"
-    bucket = "terraform-samples-259837135622-apigw-lambda-svc"
-    key    = "instance.tfstate"
-  }
+  backend "s3" {}
 }
 
 # Configure the AWS Provider
 provider "aws" {
-  region = data.aws_region.current.id
+  region = var.aws_region
   alias  = "default"
 
   default_tags {
diff --git a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/data.tf b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/data.tf
index fd375a7..454de88 100644
--- a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/data.tf
+++ b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/data.tf
@@ -2,4 +2,46 @@ data "aws_region" "current" {}
 
 data "aws_caller_identity" "current" {}
 
-data "aws_partition" "current" {}
\ No newline at end of file
+data "aws_partition" "current" {}
+
+data "aws_iam_policy_document" "sns_publish_policy_document" {
+  statement {
+    actions = [
+      "sns:Publish"
+    ]
+    resources = [
+      var.environment.outputs.SnsTopicArn
+    ]
+  }
+}
+
+data "archive_file" "lambda_zip_inline" {
+  type        = "zip"
+  output_path = "lambda_zip_inline.zip"
+
+  source {
+    filename = "index.js"
+    content  = <<EOF
+        exports.handler = async (event, context) => {
+          try {
+            // Log event and context object to CloudWatch Logs
+            console.log("Event: ", JSON.stringify(event, null, 2));
+            console.log("Context: ", JSON.stringify(context, null, 2));
+            // Create event object to return to caller
+            const eventObj = {
+              functionName: context.functionName,
+              rawPath: event.rawPath,
+            };
+            const response = {
+              statusCode: 200,
+              body: JSON.stringify(eventObj, null, 2),
+            };
+            return response;
+          } catch (error) {
+            console.error(error);
+            throw new Error(error);
+          }
+        };
+EOF
+  }
+}
\ No newline at end of file
diff --git a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/main.tf b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/main.tf
index db8894b..8d3093e 100644
--- a/service-templates/apigw-lambda-svc/v1/instance_infrastructure/main.tf
+++ b/service-templates/apigw-lambda-svc/v1/instance_infrastructure/main.tf
@@ -10,14 +10,11 @@ resource "aws_apigatewayv2_api" "lambda" {
       "POST",
     ]
   }
-
-  #  target = aws_lambda_function.lambda_function.arn
 }
 
 resource "aws_apigatewayv2_stage" "lambda" {
   api_id = aws_apigatewayv2_api.lambda.id
-
-  name        = "serverless_lambda_stage"
+  name        = "${var.service.name}-${var.service_instance.name}-stage"
   auto_deploy = true
 
   access_log_settings {
@@ -45,7 +42,7 @@ resource "aws_cloudwatch_log_group" "api_gw" {
 }
 
 resource "aws_lambda_function" "lambda_function" {
-  function_name = "${var.service_instance.name}-function"
+  function_name = "${var.service.name}-${var.service_instance.name}-function"
   runtime       = var.service_instance.inputs.lambda_runtime
   role          = aws_iam_role.lambda_exec.arn
 
@@ -86,7 +83,7 @@ resource "aws_lambda_permission" "api_gw" {
 }
 
 resource "aws_iam_role" "lambda_exec" {
-  name = "serverless_lambda"
+  name_prefix = "serverless_lambda"
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -115,45 +112,3 @@ resource "aws_iam_role_policy_attachment" "ssn_publish_policy" {
 resource "aws_iam_policy" "sns_publish_policy" {
   policy = data.aws_iam_policy_document.sns_publish_policy_document.json
 }
-
-data "aws_iam_policy_document" "sns_publish_policy_document" {
-  statement {
-    actions = [
-      "sns:Publish"
-    ]
-    resources = [
-      var.environment.outputs.SnsTopicArn
-    ]
-  }
-}
-
-data "archive_file" "lambda_zip_inline" {
-  type        = "zip"
-  output_path = "lambda_zip_inline.zip"
-
-  source {
-    filename = "index.js"
-    content  = <<EOF
-        exports.handler = async (event, context) => {
-          try {
-            // Log event and context object to CloudWatch Logs
-            console.log("Event: ", JSON.stringify(event, null, 2));
-            console.log("Context: ", JSON.stringify(context, null, 2));
-            // Create event object to return to caller
-            const eventObj = {
-              functionName: context.functionName,
-              rawPath: event.rawPath,
-            };
-            const response = {
-              statusCode: 200,
-              body: JSON.stringify(eventObj, null, 2),
-            };
-            return response;
-          } catch (error) {
-            console.error(error);
-            throw new Error(error);
-          }
-        };
-EOF
-  }
-}
\ No newline at end of file
diff --git a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/config.tf b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/config.tf
index 032c6f9..903d3db 100644
--- a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/config.tf
+++ b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/config.tf
@@ -6,16 +6,12 @@ terraform {
     }
   }
 
-  backend "s3" {
-    region = "us-east-1"
-    bucket = "terraform-samples-259837135622-apigw-lambda-svc"
-    key    = "pipeline.tfstate"
-  }
+  backend "s3" {}
 }
 
 # Configure the AWS Provider
 provider "aws" {
-  region = data.aws_region.current.id
+  region = var.aws_region
   alias  = "default"
 
   default_tags {
@@ -28,4 +24,4 @@ provider "aws" {
 variable "aws_region" {
   type    = string
   default = "us-east-1"
-}
\ No newline at end of file
+}
diff --git a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/data.tf b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/data.tf
index 4347723..42c04f0 100644
--- a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/data.tf
+++ b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/data.tf
@@ -81,14 +81,25 @@ data "aws_iam_policy_document" "publish_role_policy_document" {
       "s3:Abort*"
     ]
   }
+  statement {
+    effect    = "Allow"
+    resources = [aws_kms_key.pipeline_artifacts_bucket_key.arn]
+    actions = [
+      "kms:Decrypt",
+      "kms:DescribeKey",
+      "kms:Encrypt",
+      "kms:ReEncrypt*",
+      "kms:GenerateDataKey*"
+    ]
+  }
 }
 
 data "aws_iam_policy_document" "deployment_role_policy" {
   statement {
     effect = "Allow"
     resources = [
-      "arn:aws:logs:${local.region}:${local.account_id}:log-group:/aws/codebuild/Deploy*Project*",
-      "arn:aws:logs:${local.region}:${local.account_id}:log-group:/aws/codebuild/Deploy*Project:*",
+      "arn:aws:logs:${local.region}:${local.account_id}:log-group:/aws/codebuild/deploy-*",
+      "arn:aws:logs:${local.region}:${local.account_id}:log-group:/aws/codebuild/deploy-:*",
     ]
     actions = [
       "logs:CreateLogGroup",
@@ -99,7 +110,7 @@ data "aws_iam_policy_document" "deployment_role_policy" {
   statement {
     effect = "Allow"
     resources = [
-      "arn:aws:codebuild:${local.region}:${local.account_id}:report-group:/Deploy*Project-*",
+      "arn:aws:codebuild:${local.region}:${local.account_id}:report-group:/deploy-*",
     ]
     actions = [
       "codebuild:CreateReportGroup",
@@ -204,7 +215,6 @@ data "aws_iam_policy_document" "pipeline_artifacts_bucket_key_policy" {
     effect    = "Allow"
     resources = ["*"]
     principals {
-      #todo -
       identifiers = [aws_iam_role.deployment_role.arn]
       type        = "AWS"
     }
@@ -287,7 +297,7 @@ data "aws_iam_policy_document" "pipeline_build_codepipeline_action_role_policy"
 data "aws_iam_policy_document" "pipeline_deploy_codepipeline_action_role_policy" {
   statement {
     effect    = "Allow"
-    resources = ["arn:aws:codebuild:${local.region}:${local.account_id}:project/Deploy*", ]
+    resources = ["arn:aws:codebuild:${local.region}:${local.account_id}:project/deploy-*"]
     actions = [
       "codebuild:BatchGetBuilds",
       "codebuild:StartBuild",
diff --git a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/main.tf b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/main.tf
index 6975f45..4ea42ab 100644
--- a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/main.tf
+++ b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/main.tf
@@ -13,6 +13,7 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "aes256" {
 }
 
 resource "aws_s3_bucket_policy" "function_bucket_policy" {
+  count  = var.pipeline.inputs.environment_account_ids != "" ? 1 : 0
   policy = data.aws_iam_policy_document.function_bucket_policy_document.json
   bucket = aws_s3_bucket.function_bucket.id
 }
@@ -81,8 +82,8 @@ resource "aws_codebuild_project" "build_project" {
                     "post_build": {
                       "commands": [
                         "aws proton --region $AWS_DEFAULT_REGION get-service --name $service_name | jq -r .service.spec > service.yaml",
-                        "yq w service.yaml 'instances[*].spec.lambda_bucket' \"$bucket_name\" > rendered_service.yaml",
-                        "yq w service.yaml 'instances[*].spec.lambda_key' \"$FUNCTION_KEY\" > rendered_service.yaml"
+                        "yq w service.yaml 'instances[*].spec.lambda_bucket' \"$bucket_name\" > rendered_service_tmp.yaml",
+                        "yq w rendered_service_tmp.yaml 'instances[*].spec.lambda_key' \"$FUNCTION_KEY\" > rendered_service.yaml"
                       ]
                     }
                   },
@@ -103,8 +104,7 @@ encryption_key = aws_kms_key.pipeline_artifacts_bucket_key.arn
 
 resource "aws_codebuild_project" "deploy_project" {
   for_each = { for instance in var.service_instances : instance.name => instance }
-
-  name         = "Deploy${index(var.service_instances, each.value)}Project"
+  name         = "deploy-${var.service.name}-${index(var.service_instances, each.value)}"
   service_role = aws_iam_role.deployment_role.arn
 
   artifacts {
@@ -138,6 +138,8 @@ resource "aws_codebuild_project" "deploy_project" {
               "build": {
                 "commands": [
                   "pip3 install --upgrade --user awscli",
+                  "echo 'rendered_service.yaml':",
+                  "cat ${var.pipeline.inputs.code_dir}/rendered_service.yaml",
                   "aws proton --region $AWS_DEFAULT_REGION update-service-instance --deployment-type CURRENT_VERSION --name $service_instance_name --service-name $service_name --spec file://${var.pipeline.inputs.code_dir}/rendered_service.yaml",
                   "aws proton --region $AWS_DEFAULT_REGION wait service-instance-deployed --name $service_instance_name --service-name $service_name"
                 ]
@@ -268,7 +270,7 @@ resource "aws_codepipeline" "pipeline" {
     name = "Source"
     action {
       category  = "Source"
-      name      = "Source"
+      name      = "Checkout"
       owner     = "AWS"
       provider  = "CodeStarSourceConnection"
       version   = "1"
@@ -306,18 +308,18 @@ resource "aws_codepipeline" "pipeline" {
     for_each = toset(var.service_instances)
 
     content {
-      name = "Deploy${index(var.service_instances, stage.value)}Project"
+      name = "deploy-${var.service.name}-${index(var.service_instances, stage.value)}"
 
       action {
         category  = "Build"
-        name      = "Deploy${index(var.service_instances, stage.value)}"
+        name      = "deploy-${var.service.name}-${index(var.service_instances, stage.value)}"
         owner     = "AWS"
         provider  = "CodeBuild"
         version   = "1"
         run_order = 1
 
         configuration = {
-          ProjectName = "Deploy${index(var.service_instances, stage.value)}Project"
+          ProjectName = "deploy-${var.service.name}-${index(var.service_instances, stage.value)}"
         }
         input_artifacts = ["BuildOutput"]
         role_arn        = aws_iam_role.pipeline_deploy_codepipeline_action_role.arn
diff --git a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/outputs.tf b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/outputs.tf
index 3b30e32..aa6bf00 100644
--- a/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/outputs.tf
+++ b/service-templates/apigw-lambda-svc/v1/pipeline_infrastructure/outputs.tf
@@ -1,3 +1,3 @@
-output "pipeline_endpoint" {
+output "PipelineEndpoint" {
   value = "https://${local.region}.console.aws.amazon.com/codesuite/codepipeline/pipelines/${aws_codepipeline.pipeline.id}/view?region=${local.region}"
 }
\ No newline at end of file