diff --git a/Dockerfile.dapper b/Dockerfile.dapper
index 8d06ff45b32..e9236159967 100644
--- a/Dockerfile.dapper
+++ b/Dockerfile.dapper
@@ -4,7 +4,7 @@ FROM ubuntu:18.04
 ARG DAPPER_HOST_ARCH
 ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH}
 ENV CATTLE_HELM_VERSION v2.14.3-rancher1
-ENV CATTLE_MACHINE_VERSION v0.15.0-rancher29
+ENV CATTLE_MACHINE_VERSION v0.15.0-rancher31
 ENV CATTLE_K3S_VERSION v1.17.2+k3s1
 ENV CATTLE_ETCD_VERSION v3.4.3
 ENV GO111MODULE off
diff --git a/package/Dockerfile b/package/Dockerfile
index 63aa4b09fe8..12f7166e51a 100644
--- a/package/Dockerfile
+++ b/package/Dockerfile
@@ -20,7 +20,7 @@ ARG RANCHER_METADATA_BRANCH=
 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
 ENV CATTLE_HELM_VERSION v2.14.3-rancher1
 ENV CATTLE_K3S_VERSION v1.17.2+k3s1
-ENV CATTLE_MACHINE_VERSION v0.15.0-rancher29
+ENV CATTLE_MACHINE_VERSION v0.15.0-rancher31
 ENV CATTLE_ETCD_VERSION v3.4.3
 ENV LOGLEVEL_VERSION v0.1.2
 ENV TINI_VERSION v0.18.0
diff --git a/tests/integration/suite/test_node.py b/tests/integration/suite/test_node.py
index 19268d568c9..72a442a8634 100644
--- a/tests/integration/suite/test_node.py
+++ b/tests/integration/suite/test_node.py
@@ -191,6 +191,16 @@ def test_node_driver_schema(admin_mc):
                 'Driver {} has field {}'.format(driver, field)
 
 
+def test_amazon_node_driver_schema(admin_mc):
+    """Test amazon node driver schema supports AWS-specific resource fields"""
+    required_fields = ['encryptEbsVolume']
+    client = admin_mc.client
+    schema = client.schema.types['amazonec2config']
+    for field in required_fields:
+        assert field in schema.resourceFields, \
+            'amazonec2config missing support for field {}'.format(field)
+
+
 def create_node_template(client):
     cloud_credential = client.create_cloud_credential(
         azurecredentialConfig={"clientId": "test",