diff --git a/scripts/setup/install_viewer.sh b/scripts/setup/install_viewer.sh
index add257019eda..1664e5937798 100755
--- a/scripts/setup/install_viewer.sh
+++ b/scripts/setup/install_viewer.sh
@@ -2,13 +2,19 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
-set -eux
+set -eu
 
 # Install cbmc-viewer
-if [[ $# -eq 1 ]] ; then
-wget https://github.com/awslabs/aws-viewer-for-cbmc/releases/download/viewer-$1/cbmc_viewer-$1-py3-none-any.whl \
-  && sudo python3 -m pip install --upgrade cbmc_viewer-$1-py3-none-any.whl
-else
-  echo "Error: Specify the version to install"
+
+if [[ $# -ne 1 ]]; then
+  echo "$0: Error: Specify the version to install"
   exit 1
 fi
+
+FILE="cbmc_viewer-$1-py3-none-any.whl"
+URL="https://github.com/awslabs/aws-viewer-for-cbmc/releases/download/viewer-$1/$FILE"
+
+set -x
+
+wget -O "$FILE" "$URL"
+sudo python3 -m pip install --upgrade "$FILE"
diff --git a/scripts/setup/ubuntu-20.04/install_cbmc.sh b/scripts/setup/ubuntu-20.04/install_cbmc.sh
index 1f90ea50a36a..13649e4d613c 100755
--- a/scripts/setup/ubuntu-20.04/install_cbmc.sh
+++ b/scripts/setup/ubuntu-20.04/install_cbmc.sh
@@ -2,9 +2,16 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
-set -eux
+set -eu
 
 # Install CBMC 5.30.1 for Ubuntu 20.04
-wget https://github.com/diffblue/cbmc/releases/download/cbmc-5.30.1/ubuntu-20.04-cbmc-5.30.1-Linux.deb \
-  && sudo dpkg -i ubuntu-20.04-cbmc-5.30.1-Linux.deb \
-  && cbmc --version
+
+FILE="ubuntu-20.04-cbmc-5.30.1-Linux.deb"
+URL="https://github.com/diffblue/cbmc/releases/download/cbmc-5.30.1/$FILE"
+
+set -x
+
+wget -O "$FILE" "$URL"
+sudo dpkg -i "$FILE"
+
+cbmc --version
diff --git a/scripts/setup/ubuntu-20.04/install_deps.sh b/scripts/setup/ubuntu-20.04/install_deps.sh
index b7f38342fabc..f3f65ae9dd5e 100755
--- a/scripts/setup/ubuntu-20.04/install_deps.sh
+++ b/scripts/setup/ubuntu-20.04/install_deps.sh
@@ -2,28 +2,33 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 
-set -eux
+set -eu
 
-# Install tools in Ubuntu 20.04 via `apt-get`
-sudo apt-get --yes update \
-  && sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes \
-  bison \
-  cmake \
-  ctags \
-  curl \
-  flex \
-  g++ \
-  gcc \
-  git \
-  gpg-agent \
-  libssl-dev \
-  lsb-release \
-  make \
-  ninja-build \
-  patch \
-  pkg-config \
-  python-is-python3 \
-  software-properties-common \
-  wget \
-  zlib1g \
+DEPS=(
+  bison
+  cmake
+  ctags
+  curl
+  flex
+  g++
+  gcc
+  git
+  gpg-agent
+  libssl-dev
+  lsb-release
+  make
+  ninja-build
+  patch
+  pkg-config
+  python-is-python3
+  python3-pip # Default in CI, but missing in AWS AMI
+  software-properties-common
+  wget
+  zlib1g
   zlib1g-dev
+)
+
+set -x
+
+sudo apt-get --yes update
+sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends --yes "${DEPS[@]}"