diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 87033e9..af1f24d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,15 +5,16 @@
   "remoteUser": "vscode",
   "workspaceFolder": "/workspaces/survey-extractor",
   "postStartCommand": "bash .devcontainer/post-install.sh",
-  "remoteEnv": {
-    "SSH_AUTH_SOCK": "/ssh-agent"
-  },
-  "mounts": [
-    // Optional, just makes getting from Downloads (local env) easier
-    "source=${localEnv:HOME},target=/workspaces/home,type=bind",
-    "source=${localEnv:SSH_AUTH_SOCK},target=/ssh-agent,type=bind"
 
+  "features": {
+    "ghcr.io/devcontainers/features/ssh-agent:1": {}
+  },
+
+  "mounts": [
+    // Optional convenience mount
+    "source=${localEnv:HOME},target=/workspaces/home,type=bind"
   ],
+
   "customizations": {
     "vscode": {
       "settings": {
diff --git a/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf b/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
index 73f6da9..6e3ecbf 100644
--- a/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
+++ b/deployment/lambda/extractor_and_loader/extractor_and_loader_lambda.tf
@@ -59,7 +59,7 @@ resource "aws_iam_role_policy_attachment" "extractor_loader_policy_attach" {
 
 # Lambda function
 resource "aws_lambda_function" "extractor_and_loader" {
-  function_name = "extractor-and-loader"
+  function_name = "extractor-and-loader-lambda"
   role          = data.aws_iam_role.lambda_exec_role.arn
   package_type  = "Image"
   image_uri     = "${data.aws_ecr_repository.extractor_and_loader.repository_url}:${var.lambda_image_tag}"
diff --git a/deployment/lambda/walthamforest_etl/provider.tf b/deployment/lambda/walthamforest_etl/provider.tf
index 51eca0c..7100c0d 100644
--- a/deployment/lambda/walthamforest_etl/provider.tf
+++ b/deployment/lambda/walthamforest_etl/provider.tf
@@ -8,7 +8,7 @@ terraform {
   backend "s3" {
     bucket  = "survey-extractor-tf-state"
     region  = "eu-west-2"
-    key     = "env:/dev/lambda/eachlambda/extractor_and_loader_lambda.tfstate"
+    key     = "env:/dev/lambda/eachlambda/walthamforest_etl_lambda.tfstate"
   }
 
   required_version = ">= 1.2.0"
diff --git a/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf b/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
index 88a9198..a4eedc8 100644
--- a/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
+++ b/deployment/lambda/walthamforest_etl/walthamforest_etl_lambda.tf
@@ -17,7 +17,7 @@ resource "aws_sqs_queue" "walthamforest_etl_adhoc_queue" {
 
 # Custom IAM policy specific to lambda_example
 resource "aws_iam_policy" "walthamforest_etl_adhoc_policy" {
-  name = "lambda-example-policy"
+  name = "walthamforest_adhoc_policy_lambda"
 
   policy = jsonencode({
     Version = "2012-10-17",