diff --git a/smithy b/smithy
index d85fb7c2..b5274e7b 100755
--- a/smithy
+++ b/smithy
@@ -9,6 +9,7 @@ cd "$(dirname "$0")"
 
 VERBOSE="${VERBOSE:-0}"
 YUM_OPTS="--assumeyes --nogpgcheck"
+YUM_CONFIG_MANAGER_OPTS=""
 CURL_OPTS=""
 
 # Give access to the system packages so that when clients get installed
@@ -94,6 +95,15 @@ bootstrap_rpm_packages()
     return 0
 }
 
+clean_anvil_deps()
+{
+    # A previously failed anvil build which is not fully cleaned
+    # up has the potential for leaving broken packages.  We disable
+    # the anvil-deps repo on bootstrap to avoid subsequent yum failures
+    # when pulling packages from this repo during bootstrap.
+    yum-config-manager $YUM_CONFIG_MANAGER_OPTS --disable anvil-deps
+}
+
 clean_pip()
 {
     # See: https://github.com/pypa/pip/issues/982
@@ -307,6 +317,8 @@ fi
 if ! needs_bootstrap; then
     clean_pip
     run_smithy
+else
+    clean_anvil_deps
 fi
 
 if [ "$BOOTSTRAP" == "false" ]; then