diff --git a/scripts/aws/eks-pod/entrypoint.sh b/scripts/aws/eks-pod/entrypoint.sh
index 6412947f0..9d57c85af 100644
--- a/scripts/aws/eks-pod/entrypoint.sh
+++ b/scripts/aws/eks-pod/entrypoint.sh
@@ -78,12 +78,12 @@ function update_config() {
     fi
 
     shopt -s nocasematch
-    USER_CUSTOMIZED=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.customize_enclave')
+    { set +x 2>/dev/null; USER_CUSTOMIZED=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.customize_enclave'); set -x; }
 
     if [ "$USER_CUSTOMIZED" = "true" ]; then
         echo "Applying user customized CPU/Mem allocation..."
-        CPU_COUNT=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.enclave_cpu_count')
-        MEMORY_MB=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.enclave_memory_mb')
+        { set +x 2>/dev/null; CPU_COUNT=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.enclave_cpu_count'); set -x; }
+        { set +x 2>/dev/null; MEMORY_MB=$(echo $IDENTITY_SERVICE_CONFIG | jq -r '.enclave_memory_mb'); set -x; }
     fi
     shopt -u nocasematch
 }
diff --git a/scripts/aws/entrypoint.sh b/scripts/aws/entrypoint.sh
index 1dba7d1a4..2e53ca3c3 100755
--- a/scripts/aws/entrypoint.sh
+++ b/scripts/aws/entrypoint.sh
@@ -21,7 +21,7 @@ echo "Starting syslog-ng..."
 
 # -- load config from identity service
 echo "Loading config from identity service via proxy..."
-IDENTITY_SERVICE_CONFIG=$(curl -s -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig) &> /dev/null 2>&1
+{ set +x 2>/dev/null; IDENTITY_SERVICE_CONFIG=$(curl -s -x socks5h://127.0.0.1:3305 http://127.0.0.1:27015/getConfig); set -x; }
 if jq -e . >/dev/null 2>&1 <<<"${IDENTITY_SERVICE_CONFIG}"; then
     echo "Identity service returned valid config"
 else
@@ -30,7 +30,7 @@ else
 fi
 
 export OVERRIDES_CONFIG="/app/conf/config-overrides.json"
-echo "${IDENTITY_SERVICE_CONFIG}" > "${OVERRIDES_CONFIG}"
+{ set +x 2>/dev/null; echo "${IDENTITY_SERVICE_CONFIG}" > "${OVERRIDES_CONFIG}"; set -x; }
 
 export DEPLOYMENT_ENVIRONMENT=$(jq -r ".environment" < "${OVERRIDES_CONFIG}")
 export CORE_BASE_URL=$(jq -r ".core_base_url" < "${OVERRIDES_CONFIG}")