diff --git a/crates/embucket-lambda/Cargo.toml b/crates/embucket-lambda/Cargo.toml
index 72f1d4dc..861856c2 100644
--- a/crates/embucket-lambda/Cargo.toml
+++ b/crates/embucket-lambda/Cargo.toml
@@ -60,7 +60,3 @@ tracing = "Active"
 # Note: include path is relative to workspace root
 # Must run deploy from workspace root: cargo lambda deploy --binary-name bootstrap
 include = ["config"]
-
-[package.metadata.lambda.deploy.env]
-LOG_FORMAT = "json"
-METASTORE_CONFIG = "config/metastore.yaml"
diff --git a/crates/embucket-lambda/Makefile b/crates/embucket-lambda/Makefile
index c164bdeb..15491a28 100644
--- a/crates/embucket-lambda/Makefile
+++ b/crates/embucket-lambda/Makefile
@@ -3,8 +3,8 @@
 # Function name (override with: make deploy FUNCTION_NAME=your-function)
 FUNCTION_NAME ?= embucket-lambda
 ENV_FILE ?= config/.env
-IAM_ROLE ?=
-OTEL_COLLECTOR_LAYERS ?=
+AWS_LAMBDA_ROLE_ARN := $(if $(AWS_LAMBDA_ROLE_ARN),--iam-role $(AWS_LAMBDA_ROLE_ARN))
+OTEL_COLLECTOR_LAYERS ?= $(if $(OTEL_COLLECTOR_LAYERS),--layer-arn $(OTEL_COLLECTOR_LAYERS))
 # supported features: "streaming"
 FEATURES_PARAM := $(if $(FEATURES),--features $(FEATURES))
 
@@ -17,7 +17,7 @@ deploy: build deploy-only public-url
 
 # Quick deploy without rebuild
 deploy-only:
-	cd ../.. && cargo lambda deploy $(OTEL_COLLECTOR_LAYERS) --iam-role $(IAM_ROLE) --env-file $(ENV_FILE) --binary-name bootstrap $(FUNCTION_NAME)
+	cd ../.. && cargo lambda deploy $(OTEL_COLLECTOR_LAYERS) $(IAM_ROLE) --env-file $(ENV_FILE) --binary-name bootstrap $(FUNCTION_NAME)
 	aws logs create-log-group --log-group-name "/aws/lambda/$(FUNCTION_NAME)" >/dev/null 2>&1 || true
 
 public-url: