diff --git a/Dockerfile.nocuda b/Dockerfile.nocuda
index 22585d42d..13326ab73 100644
--- a/Dockerfile.nocuda
+++ b/Dockerfile.nocuda
@@ -29,12 +29,12 @@ FROM --platform=linux/amd64 build-image as build-app
 WORKDIR /src/gpu-iris-mpc
 COPY . .
 
-RUN cargo build --release --target x86_64-unknown-linux-gnu --bin seed-v1-dbs --bin upgrade-server --bin upgrade-client --bin upgrade-checker --bin reshare-server
+RUN cargo build --release --target x86_64-unknown-linux-gnu --bin seed-v1-dbs --bin upgrade-server --bin upgrade-client --bin upgrade-checker --bin reshare-server --bin key-manager
 
 FROM --platform=linux/amd64 ubuntu:22.04
 ENV DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update && apt-get install -y ca-certificates
+RUN apt-get update && apt-get install -y ca-certificates awscli
 COPY certs /usr/local/share/ca-certificates/
 RUN update-ca-certificates
 
@@ -43,6 +43,7 @@ COPY --from=build-app /src/gpu-iris-mpc/target/x86_64-unknown-linux-gnu/release/
 COPY --from=build-app /src/gpu-iris-mpc/target/x86_64-unknown-linux-gnu/release/upgrade-client /bin/upgrade-client
 COPY --from=build-app /src/gpu-iris-mpc/target/x86_64-unknown-linux-gnu/release/upgrade-checker /bin/upgrade-checker
 COPY --from=build-app /src/gpu-iris-mpc/target/x86_64-unknown-linux-gnu/release/reshare-server /bin/reshare-server
+COPY --from=build-app /src/gpu-iris-mpc/target/x86_64-unknown-linux-gnu/release/key-manager /bin/key-manager
 
 USER 65534
 ENTRYPOINT ["/bin/upgrade-server"]
diff --git a/deploy/e2e/iris-mpc-0.yaml.tpl b/deploy/e2e/iris-mpc-0.yaml.tpl
index 5e1abb843..40c53bde5 100644
--- a/deploy/e2e/iris-mpc-0.yaml.tpl
+++ b/deploy/e2e/iris-mpc-0.yaml.tpl
@@ -141,7 +141,7 @@ iris-mpc-0:
       value: "0"
 
     - name: SMPC__PUBLIC_KEY_BASE_URL
-      value: "https://pki-smpcv2-stage.worldcoin.org"
+      value: "http://wf-$ENV-stage-public-keys.s3.localhost.localstack.cloud:4566"
 
     - name: SMPC__ENABLE_S3_IMPORTER
       value: "false"
@@ -202,7 +202,7 @@ iris-mpc-0:
       name: "iris-mpc-0-init"
       init.sh: |
         #!/usr/bin/env bash
-        apt-update && apt install -y awscli
+        apt update && apt install -y awscli
         cd /libs
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
diff --git a/deploy/e2e/iris-mpc-1.yaml.tpl b/deploy/e2e/iris-mpc-1.yaml.tpl
index a7f441059..ceeb86636 100644
--- a/deploy/e2e/iris-mpc-1.yaml.tpl
+++ b/deploy/e2e/iris-mpc-1.yaml.tpl
@@ -142,7 +142,7 @@ iris-mpc-1:
       value: "1"
 
     - name: SMPC__PUBLIC_KEY_BASE_URL
-      value: "https://pki-smpcv2-stage.worldcoin.org"
+      value: "http://wf-$ENV-stage-public-keys.s3.localhost.localstack.cloud:4566"
 
     - name: SMPC__ENABLE_S3_IMPORTER
       value: "false"
diff --git a/deploy/e2e/iris-mpc-2.yaml.tpl b/deploy/e2e/iris-mpc-2.yaml.tpl
index d06064df1..30f37b93c 100644
--- a/deploy/e2e/iris-mpc-2.yaml.tpl
+++ b/deploy/e2e/iris-mpc-2.yaml.tpl
@@ -142,7 +142,7 @@ iris-mpc-2:
       value: "2"
 
     - name: SMPC__PUBLIC_KEY_BASE_URL
-      value: "https://pki-smpcv2-stage.worldcoin.org"
+      value: "http://wf-$ENV-stage-public-keys.s3.localhost.localstack.cloud:4566"
 
     - name: SMPC__ENABLE_S3_IMPORTER
       value: "false"
@@ -203,7 +203,7 @@ iris-mpc-2:
       name: "iris-mpc-2-init"
       init.sh: |
         #!/usr/bin/env bash
-        apt-update && apt install -y awscli
+        apt update && apt install -y awscli
         cd /libs
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublas.so.12.2.5.6 .
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .