diff --git a/gen3/bin/kube-setup-audit-service.sh b/gen3/bin/kube-setup-audit-service.sh
index b7565194c..92c70f352 100644
--- a/gen3/bin/kube-setup-audit-service.sh
+++ b/gen3/bin/kube-setup-audit-service.sh
@@ -65,7 +65,7 @@ EOM
 }
 
 setup_audit_sqs() {
-  local sqsName="$(gen3 api safe-name audit-sqs)"
+  local sqsName="audit-sqs"
   sqsInfo="$(gen3 sqs create-queue-if-not-exist $sqsName)" || exit 1
   sqsUrl="$(jq -e -r '.["url"]' <<< "$sqsInfo")" || { echo "Cannot get 'sqs-url' from output: $sqsInfo"; exit 1; }
   sqsArn="$(jq -e -r '.["arn"]' <<< "$sqsInfo")" || { echo "Cannot get 'sqs-arn' from output: $sqsInfo"; exit 1; }
diff --git a/gen3/bin/kube-setup-fence.sh b/gen3/bin/kube-setup-fence.sh
index 03edabbf4..cc0516c93 100644
--- a/gen3/bin/kube-setup-fence.sh
+++ b/gen3/bin/kube-setup-fence.sh
@@ -9,7 +9,7 @@ source "${GEN3_HOME}/gen3/lib/utils.sh"
 gen3_load "gen3/lib/kube-setup-init"
 
 setup_audit_sqs() {
-  local sqsName="$(gen3 api safe-name audit-sqs)"
+  local sqsName="audit-sqs"
   sqsInfo="$(gen3 sqs create-queue-if-not-exist $sqsName)" || exit 1
   sqsUrl="$(jq -e -r '.["url"]' <<< "$sqsInfo")" || { echo "Cannot get 'sqs-url' from output: $sqsInfo"; exit 1; }
   sqsArn="$(jq -e -r '.["arn"]' <<< "$sqsInfo")" || { echo "Cannot get 'sqs-arn' from output: $sqsInfo"; exit 1; }
diff --git a/gen3/bin/kube-setup-karpenter.sh b/gen3/bin/kube-setup-karpenter.sh
index 6a8b21949..bada6e69e 100644
--- a/gen3/bin/kube-setup-karpenter.sh
+++ b/gen3/bin/kube-setup-karpenter.sh
@@ -29,7 +29,7 @@ gen3_deploy_karpenter() {
       else
         karpenter=${karpenter:-v0.22.0}
       fi    
-      local queue_name="karpenter-sqs-${vpc_name}"
+      local queue_name="$(gen3 api safe-name karpenter-sqs)"
       echo '{
           "Statement": [
               {
@@ -188,9 +188,9 @@ gen3_update_karpenter_configs() {
 }
 
 gen3_create_karpenter_sqs_eventbridge() {
-  local queue_name="karpenter-sqs-${vpc_name}"
+  local queue_name="$(gen3 api safe-name karpenter-sqs)"
   local eventbridge_rule_name="karpenter-eventbridge-${vpc_name}"
-  #gen3 sqs create-queue-if-not-exist $queue_name >> "$XDG_RUNTIME_DIR/sqs-${vpc_name}.json"
+  gen3 sqs create-queue-if-not-exist karpenter-sqs >> "$XDG_RUNTIME_DIR/sqs-${vpc_name}.json"
   local queue_url=$(cat "$XDG_RUNTIME_DIR/sqs-${vpc_name}.json" | jq -r '.url')
   local queue_arn=$(cat "$XDG_RUNTIME_DIR/sqs-${vpc_name}.json" | jq -r '.arn')
   # Create eventbridge rules