diff --git a/prepare-vms/scripts/postprep.rc b/prepare-vms/scripts/postprep.rc
index 57b697f4..ab878b67 100755
--- a/prepare-vms/scripts/postprep.rc
+++ b/prepare-vms/scripts/postprep.rc
@@ -1,5 +1,7 @@
 pssh -I tee /tmp/settings.yaml < $SETTINGS
 
+pssh sudo apt-get install -y python-setuptools
+
 pssh sudo easy_install pyyaml
 
 pssh -I tee /tmp/postprep.py <<EOF
diff --git a/prepare-vms/scripts/trainer-cli b/prepare-vms/scripts/trainer-cli
index 1583f49f..0faa2ab7 100755
--- a/prepare-vms/scripts/trainer-cli
+++ b/prepare-vms/scripts/trainer-cli
@@ -208,19 +208,19 @@ get_ami() {
     #AMI=$(suggest_amis | grep -v ^REGION | head -1 | awk '{print $7}')
     case $AWS_DEFAULT_REGION in
     eu-central-1)
-      AMI=ami-4d2bc622
+      AMI=ami-6f7c8200
       ;;
     eu-west-1)
-      AMI=ami-bdb13bce
+      AMI=ami-bf83cecc
       ;;
     us-east-1)
-      AMI=ami-3ffc1052
+      AMI=ami-34663323
       ;;
     us-west-1)
-      AMI=ami-bdb13bce
+      AMI=ami-5d551d3d
       ;;
     us-west-2)
-      AMI=ami-b33dc0d3
+      AMI=ami-43d40e23
       ;;
     esac
     echo $AMI