diff --git a/prepare-vms/scripts/trainer-cli b/prepare-vms/scripts/trainer-cli
index 763cffc8..e06c204d 100755
--- a/prepare-vms/scripts/trainer-cli
+++ b/prepare-vms/scripts/trainer-cli
@@ -210,19 +210,19 @@ get_ami() {
     #AMI=$(suggest_amis | grep -v ^REGION | head -1 | awk '{print $7}')
     case $AWS_DEFAULT_REGION in
     eu-central-1)
-      AMI=ami-f0eb089f
+      AMI=ami-4d2bc622
       ;;
     eu-west-1)
-      AMI=ami-3079f543
+      AMI=ami-bdb13bce
       ;;
     us-east-1)
-      AMI=ami-840910ee
+      AMI=ami-3ffc1052
       ;;
     us-west-1)
-      AMI=ami-d8e996b8
+      AMI=ami-bdb13bce
       ;;
     us-west-2)
-      AMI=ami-fa82739a
+      AMI=ami-b33dc0d3
       ;;
     esac
     echo $AMI
diff --git a/prepare-vms/settings/fundamentals.yaml b/prepare-vms/settings/fundamentals.yaml
index 5845f34d..ff0a6470 100644
--- a/prepare-vms/settings/fundamentals.yaml
+++ b/prepare-vms/settings/fundamentals.yaml
@@ -30,6 +30,6 @@ footer: >
 url: http://container.training/
 
 engine_version: get.docker.com
-compose_version: 1.7.0
+compose_version: 1.7.1
 machine_version: 0.6.0
-swarm_version: 1.2.0
+swarm_version: 1.2.2