diff --git a/website/packer.json b/website/packer.json
index b230c7e51..5732112c3 100644
--- a/website/packer.json
+++ b/website/packer.json
@@ -27,8 +27,10 @@
         "FASTLY_API_KEY={{ user `fastly_api_key` }}"
       ],
       "inline": [
-        "apt-get update",
-        "apt-get install -y build-essential curl git libffi-dev s3cmd wget",
+        "apt-get -qq update",
+        "apt-get -yqq install build-essential curl git libffi-dev wget",
+        "apt-get -yqq install python-pip",
+        "pip install s3cmd",
         "cd /app",
 
         "bundle check || bundle install --jobs 7",
diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh
index 06d84265d..9b67c5437 100755
--- a/website/scripts/deploy.sh
+++ b/website/scripts/deploy.sh
@@ -64,15 +64,29 @@ if [ -z "$NO_UPLOAD" ]; then
 
   # The s3cmd guessed mime type for text files is often wrong. This is
   # problematic for some assets, so force their mime types to be correct.
+  echo "Overriding javascript mime-types..."
   s3cmd \
     --mime-type="application/javascript" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.js"
+    --exclude "*" \
+    --include "*.js" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
+
+  echo "Overriding css mime-types..."
   s3cmd \
     --mime-type="text/css" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.css"
+    --exclude "*" \
+    --include "*.css" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
+
+  echo "Overriding svg mime-types..."
   s3cmd \
     --mime-type="image/svg+xml" \
-    modify "s3://hc-sites/$PROJECT/latest/**/*.svg"
+    --exclude "*" \
+    --include "*.svg" \
+    --recursive \
+    modify "s3://hc-sites/$PROJECT/latest/"
 fi
 
 # Perform a soft-purge of the surrogate key.