diff --git a/hack/e2e/metrics/metrics.sh b/hack/e2e/metrics/metrics.sh
index 2bc057d7ad..a01ac8a284 100644
--- a/hack/e2e/metrics/metrics.sh
+++ b/hack/e2e/metrics/metrics.sh
@@ -198,7 +198,7 @@ upload_metrics() {
   aws s3api put-bucket-notification-configuration \
     --bucket "$SOURCE_BUCKET" \
     --notification-configuration "$notification_config" \
-    --region "$AWS_REGION"
+    --region "$AWS_REGION" || (echo -e "\nERROR: Skipping uploading metrics ...\n" && return)
 
   log "Uploading metrics to S3 bucket $SOURCE_BUCKET"
   aws s3 sync "$METRICS_DIR_PATH" "s3://$SOURCE_BUCKET/$METRICS_DIR_NAME" --region "$AWS_REGION"
diff --git a/hack/e2e/run.sh b/hack/e2e/run.sh
index 6d3034e8b1..35a46b0956 100755
--- a/hack/e2e/run.sh
+++ b/hack/e2e/run.sh
@@ -53,7 +53,7 @@ K8S_VERSION_KOPS=${K8S_VERSION_KOPS:-${K8S_VERSION:-1.27.4}}
 K8S_VERSION_EKSCTL=${K8S_VERSION_EKSCTL:-${K8S_VERSION:-1.27}}
 
 KOPS_VERSION=${KOPS_VERSION:-1.27.1}
-KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-e2e}
+KOPS_STATE_FILE=${KOPS_STATE_FILE:-s3://k8s-kops-csi-shared-e2e}
 KOPS_PATCH_FILE=${KOPS_PATCH_FILE:-./hack/kops-patch.yaml}
 KOPS_PATCH_NODE_FILE=${KOPS_PATCH_NODE_FILE:-./hack/kops-patch-node.yaml}
 AMI_ID=$(aws ssm get-parameters --names /aws/service/ami-amazon-linux-latest/al2023-ami-kernel-default-x86_64 --region ${REGION} --query 'Parameters[0].Value' --output text)