diff --git a/lambda/Dockerfile b/lambda/Dockerfile
index ae90a5ee..55a3296f 100644
--- a/lambda/Dockerfile
+++ b/lambda/Dockerfile
@@ -35,6 +35,6 @@ RUN go env
 COPY . /ws
 
 RUN mkdir -p /asset/ && \
-    make OUTPUT=/asset/main && \
-    file /asset/main && \
-    ls -lh /asset/main
+    make OUTPUT=/asset/bootstrap && \
+    file /asset/bootstrap && \
+    ls -lh /asset/bootstrap
diff --git a/lambda/Makefile b/lambda/Makefile
index b9c62116..2b4f2314 100644
--- a/lambda/Makefile
+++ b/lambda/Makefile
@@ -18,7 +18,7 @@ ifeq ($(GOOS), linux)
   endif
 endif
 
-BUILDTAGS := exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp
+BUILDTAGS := exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_openpgp lambda.norpc
 OUTPUT ?= cdk-ecr-deployment-handler
 
 all: test lambda
diff --git a/src/index.ts b/src/index.ts
index 08a9b21e..91d62741 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -129,8 +129,8 @@ export class ECRDeployment extends Construct {
     this.handler = new lambda.SingletonFunction(this, 'CustomResourceHandler', {
       uuid: this.renderSingletonUuid(memoryLimit),
       code: getCode(props.buildImage ?? 'public.ecr.aws/sam/build-go1.x:latest'),
-      runtime: lambda.Runtime.GO_1_X,
-      handler: 'main',
+      runtime: lambda.Runtime.PROVIDED_AL2,
+      handler: 'bootstrap',
       environment: props.environment,
       lambdaPurpose: 'Custom::CDKECRDeployment',
       timeout: Duration.minutes(15),