diff --git a/comanage-appliance.json b/comanage-appliance.json
index 84f02c3..1fd14bd 100644
--- a/comanage-appliance.json
+++ b/comanage-appliance.json
@@ -4,8 +4,8 @@
   "variables": {
       "profile": "xfs",
       "disk_size": "20000",
-      "memory": "6122",
-      "cpus": "2",
+      "memory": "2048",
+      "cpus": "1",
       "ssh_username": "centos",
       "ssh_password": "centos",
       "region": "us-west-1",
diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
index b995cf0..abaabba 100755
--- a/scripts/cleanup.sh
+++ b/scripts/cleanup.sh
@@ -4,5 +4,8 @@
 dd if=/dev/zero of=/EMPTY bs=1M
 rm -f /EMPTY
 
+# Disable the centos user
+chsh -s /bin/false centos
+
 # Add `sync` so Packer doesn't quit too early, before the large file is deleted.
 sync
diff --git a/shibboleth-appliance.json b/shibboleth-appliance.json
index 22c2d8c..0489b7d 100644
--- a/shibboleth-appliance.json
+++ b/shibboleth-appliance.json
@@ -11,7 +11,8 @@
       "ssh_password": "centos",
       "region": "us-west-1",
       "timestamper": "{{timestamp}}",
-      "outputfile_name": "shibboleth-appliance-centos7"
+      "outputfile_name": "shibboleth-appliance-centos7",
+      "build_number": "{{env `BUILD_NUMBER`}}"
   },
   "provisioners": [
     {
@@ -70,9 +71,11 @@
       "access_key": "{{user `aws_access_key`}}",
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `region`}}",
+      "ami_name": "TIER-Shibb Build: {{user `build_number`}}",
       "s3_bucket_name": "internet2-tier-ami-import-us-west-1",
       "tags": {
-        "Description": "packer amazon-import-shibboleth-appliance {{user `timestamper`}}"
+        "Description": "packer amazon-import-shibboleth-appliance {{user `timestamper`}}",
+        "Name": "TIER-Shibb Build: {{user `build_number`}}"
       }
     }
   ]