diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 54cd3cb73..864d895ee 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -43,6 +43,7 @@ jobs:
           tags: |
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.release.tag_name }},
             ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
           platforms: linux/amd64
           cache-from: type=gha
           cache-to: type=gha,mode=max
diff --git a/deploy/e2e/iris-mpc-0.yaml.tpl b/deploy/e2e/iris-mpc-0.yaml.tpl
index 72e38feb1..2f98c25b0 100644
--- a/deploy/e2e/iris-mpc-0.yaml.tpl
+++ b/deploy/e2e/iris-mpc-0.yaml.tpl
@@ -93,6 +93,12 @@ iris-mpc-0:
     - name: AWS_REGION
       value: "$AWS_REGION"
 
+    - name: AWS_ACCESS_KEY_ID
+      value: "access_key"
+
+    - name: AWS_SECRET_ACCESS_KEY
+      value: "secret_key"
+
     - name: AWS_ENDPOINT_URL
       value: "http://localstack:4566"
 
@@ -103,7 +109,7 @@ iris-mpc-0:
       value: "eth0"
 
     - name: NCCL_COMM_ID
-      value: "iris-mpc-0.svc.cluster.local:4000"
+      value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"
 
     - name: SMPC__ENVIRONMENT
       value: "$ENV"
@@ -189,14 +195,17 @@ iris-mpc-0:
       value: "true"
 
     - name: SMPC__NODE_HOSTNAMES
-      value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
+      value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'
 
     - name: SMPC__IMAGE_NAME
       value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"
 
+    - name: SMPC__HEARTBEAT_INITIAL_RETRIES
+      value: "1000"
+
   initContainer:
     enabled: true
-    image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
+    image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
     name: "iris-mpc-0-copy-cuda-libs"
     env:
       - name: AWS_REGION
@@ -218,4 +227,5 @@ iris-mpc-0:
         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 .
 
-        key-manager --node-id 0 --env $ENV --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-stage-public-keys --region $AWS_REGION
+        key-manager --node-id 0 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
+        key-manager --node-id 0 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
diff --git a/deploy/e2e/iris-mpc-1.yaml.tpl b/deploy/e2e/iris-mpc-1.yaml.tpl
index 15b3cd127..5f52de2bd 100644
--- a/deploy/e2e/iris-mpc-1.yaml.tpl
+++ b/deploy/e2e/iris-mpc-1.yaml.tpl
@@ -93,6 +93,12 @@ iris-mpc-1:
     - name: AWS_REGION
       value: "$AWS_REGION"
 
+    - name: AWS_ACCESS_KEY_ID
+      value: "access_key"
+
+    - name: AWS_SECRET_ACCESS_KEY
+      value: "secret_key"
+
     - name: AWS_ENDPOINT_URL
       value: "http://localstack:4566"
 
@@ -103,7 +109,7 @@ iris-mpc-1:
       value: "eth0"
 
     - name: NCCL_COMM_ID
-      value: "iris-mpc-1.svc.cluster.local:4000"
+      value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"
 
     - name: SMPC__ENVIRONMENT
       value: "$ENV"
@@ -189,14 +195,17 @@ iris-mpc-1:
       value: "true"
 
     - name: SMPC__NODE_HOSTNAMES
-      value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
+      value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'
 
     - name: SMPC__IMAGE_NAME
       value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"
 
+    - name: SMPC__HEARTBEAT_INITIAL_RETRIES
+      value: "1000"
+
   initContainer:
     enabled: true
-    image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
+    image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
     name: "iris-mpc-1-copy-cuda-libs"
     env:
       - name: AWS_REGION
@@ -219,3 +228,4 @@ iris-mpc-1:
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
 
         key-manager --node-id 1 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
+        key-manager --node-id 1 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
diff --git a/deploy/e2e/iris-mpc-2.yaml.tpl b/deploy/e2e/iris-mpc-2.yaml.tpl
index 485734c90..3d1f20250 100644
--- a/deploy/e2e/iris-mpc-2.yaml.tpl
+++ b/deploy/e2e/iris-mpc-2.yaml.tpl
@@ -93,6 +93,12 @@ iris-mpc-2:
     - name: AWS_REGION
       value: "$AWS_REGION"
 
+    - name: AWS_ACCESS_KEY_ID
+      value: "access_key"
+
+    - name: AWS_SECRET_ACCESS_KEY
+      value: "secret_key"
+
     - name: AWS_ENDPOINT_URL
       value: "http://localstack:4566"
 
@@ -103,7 +109,7 @@ iris-mpc-2:
       value: "eth0"
 
     - name: NCCL_COMM_ID
-      value: "iris-mpc-2.svc.cluster.local:4000"
+      value: "iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local:4000"
 
     - name: SMPC__ENVIRONMENT
       value: "$ENV"
@@ -189,14 +195,17 @@ iris-mpc-2:
       value: "true"
 
     - name: SMPC__NODE_HOSTNAMES
-      value: '["iris-mpc-0.svc.cluster.local","iris-mpc-1.svc.cluster.local","iris-mpc-2.svc.cluster.local"]'
+      value: '["iris-mpc-0.iris-mpc-0.$ENV.svc.cluster.local","iris-mpc-1.iris-mpc-1.$ENV.svc.cluster.local","iris-mpc-2.iris-mpc-2.$ENV.svc.cluster.local"]'
 
     - name: SMPC__IMAGE_NAME
       value: "ghcr.io/worldcoin/iris-mpc:$IRIS_MPC_IMAGE_TAG"
 
+    - name: SMPC__HEARTBEAT_INITIAL_RETRIES
+      value: "1000"
+
   initContainer:
     enabled: true
-    image: "ghcr.io/worldcoin/iris-mpc:2694d8cbb37c278ed84951ef9aac3af47b21f146" # no-cuda image
+    image: "ghcr.io/worldcoin/iris-mpc:4913ef30024615c5dca0132a22c2971158e1cc0e" # no-cuda image
     name: "iris-mpc-2-copy-cuda-libs"
     env:
       - name: AWS_REGION
@@ -219,3 +228,4 @@ iris-mpc-2:
         aws s3 cp s3://wf-smpcv2-stage-libs/libcublasLt.so.12.2.5.6 .
 
         key-manager --node-id 2 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
+        key-manager --node-id 2 --env $ENV --region $AWS_REGION --endpoint-url "http://localstack:4566" rotate --public-key-bucket-name wf-$ENV-public-keys
diff --git a/iris-mpc-common/src/bin/key_manager.rs b/iris-mpc-common/src/bin/key_manager.rs
index bc8346f1b..520a7e62e 100644
--- a/iris-mpc-common/src/bin/key_manager.rs
+++ b/iris-mpc-common/src/bin/key_manager.rs
@@ -28,7 +28,7 @@ struct KeyManagerCli {
     )]
     node_id: String,
 
-    #[arg(short, long, env, default_value = "stage")]
+    #[arg(long, env, default_value = "stage")]
     env: String,
 
     #[arg(short, long, env, default_value = "eu-north-1")]