diff --git a/go.mod b/go.mod
index 1bfb6a1b..ee21336d 100644
--- a/go.mod
+++ b/go.mod
@@ -27,9 +27,9 @@ require (
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/opencontainers/image-spec v0.0.0-20170929214853-7c889fafd04a // indirect
 	github.com/pkg/errors v0.8.1
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20191002224336-80a609cf01ab
-	github.com/rancher/norman v0.0.0-20191002173122-b1eb20740eab
-	github.com/rancher/types v0.0.0-20191002181205-bbd00336fe89
+	github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2
+	github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
+	github.com/rancher/types v0.0.0-20191003184925-ab3403a2c8ca
 	github.com/sirupsen/logrus v1.4.2
 	github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
diff --git a/go.sum b/go.sum
index c2053a3d..716c2211 100644
--- a/go.sum
+++ b/go.sum
@@ -440,16 +440,16 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R
 github.com/prometheus/prometheus v2.9.2+incompatible/go.mod h1:vdLuLLM0uqhLSofrQ7Nev2b/rQUyZ+pkT3zF7LB/i1g=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/prometheus/tsdb v0.8.0/go.mod h1:fSI0j+IUQrDd7+ZtR9WKIGtoYAYAJUKcKhYLG25tN4g=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20191002224336-80a609cf01ab h1:wTy02yIoJJwAlxNpIdUQ8SvcGEoA4cUEf4WXX8H3kwk=
-github.com/rancher/kontainer-driver-metadata v0.0.0-20191002224336-80a609cf01ab/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2 h1:BjiVFYM513H2dwGDlQyqZ2fX/5Vu/cIUzb6M5+owe8E=
+github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2/go.mod h1:n9MKsJByqAqhVG61d9G5pbJuKcHUMXUw97YF8+98ar0=
 github.com/rancher/norman v0.0.0-20190930164704-e09204b63081 h1:t0Yq2Rm0PdPkhY5AfHjtoyKEbt0bhYk4Jya27EfJk5Q=
 github.com/rancher/norman v0.0.0-20190930164704-e09204b63081/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
-github.com/rancher/norman v0.0.0-20191002173122-b1eb20740eab h1:HtVMv6yfnH3t0ImfFAcb7LuIG7IQe+GTgzefLI9vYWA=
-github.com/rancher/norman v0.0.0-20191002173122-b1eb20740eab/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
+github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36 h1:N0ZUBJRq/ydy2ULiuqKhmiKShmEtpDOWXxKzVZxTzHk=
+github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36/go.mod h1:kVWc1OyHK9decIY90IYExSHedI5a5qze7IfLiEOTmXQ=
 github.com/rancher/types v0.0.0-20190930165650-6bbedae77a35 h1:8ocmE+9FUB0EuOZ7HiDWb5zBXdlQootMX9sMXFCOerk=
 github.com/rancher/types v0.0.0-20190930165650-6bbedae77a35/go.mod h1:I0hSpsw/ZvWuOOvhiExji5IIkeQtmn4IvFcn7nbjhrk=
-github.com/rancher/types v0.0.0-20191002181205-bbd00336fe89 h1:h+O9FPy8Fe4Fvsi38nFKXGgIf0+UITQ6bQX/1pLqOiE=
-github.com/rancher/types v0.0.0-20191002181205-bbd00336fe89/go.mod h1:+cdrbyCYLjA5/CZwGR8GmxPtx+DMWhBmYZg8AEtkn0Y=
+github.com/rancher/types v0.0.0-20191003184925-ab3403a2c8ca h1:nr7M7Gdk1mFnTiF5c6mXuKK5T+VFuxMO1AxoAK2bI7Y=
+github.com/rancher/types v0.0.0-20191003184925-ab3403a2c8ca/go.mod h1:3k1KigFfdRBJhiE8EXTpoM0aPXAFuYuGxKtU93oNxAY=
 github.com/rancher/wrangler v0.1.5 h1:HiXOeP6Kci2DK+e04D1g6INT77xAYpAr54zmTTe0Spk=
 github.com/rancher/wrangler v0.1.5/go.mod h1:EYP7cqpg42YqElaCm+U9ieSrGQKAXxUH5xsr+XGpWyE=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
index 5fed9c2b..51896099 100644
--- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
+++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/k8s_rke_system_images.go
@@ -1388,9 +1388,9 @@ func loadK8sRKESystemImages() map[string]v3.RKESystemImages {
 			WindowsPodInfraContainer:  m("rancher/kubelet-pause:v0.1.3"),
 		},
 		// Experimental in Rancher v2.3.0
-		"v1.16.0-rancher1-1": {
+		"v1.16.1-rancher1-1": {
 			Etcd:                      m("quay.io/coreos/etcd:v3.3.15-rancher1"),
-			Kubernetes:                m("rancher/hyperkube:v1.16.0-rancher1"),
+			Kubernetes:                m("rancher/hyperkube:v1.16.1-rancher1"),
 			Alpine:                    m("rancher/rke-tools:v0.1.50"),
 			NginxProxy:                m("rancher/rke-tools:v0.1.50"),
 			CertDownloader:            m("rancher/rke-tools:v0.1.50"),
diff --git a/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/templates.go b/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/templates.go
index d0c9758c..5e6a989f 100644
--- a/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/templates.go
+++ b/vendor/github.com/rancher/kontainer-driver-metadata/rke/templates/templates.go
@@ -74,7 +74,7 @@ func LoadK8sVersionedTemplates() map[string]map[string]string {
 			">=1.8.0-rancher0 <1.16.0-alpha": kubeDnsv18,
 		},
 		MetricsServer: {
-			">=1.8.0-rancher0 <1.16.0": metricsServerv18,
+			">=1.8.0-rancher0": metricsServerv18,
 		},
 		Weave: {
 			">=1.16.0-alpha":                 weavev116,
diff --git a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/tools_system_images.go b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/tools_system_images.go
index 04218361..ff13bcbf 100644
--- a/vendor/github.com/rancher/types/apis/management.cattle.io/v3/tools_system_images.go
+++ b/vendor/github.com/rancher/types/apis/management.cattle.io/v3/tools_system_images.go
@@ -15,12 +15,12 @@ var (
 		PipelineSystemImages: projectv3.PipelineSystemImages{
 			Jenkins:       m("rancher/pipeline-jenkins-server:v0.1.4"),
 			JenkinsJnlp:   m("jenkins/jnlp-slave:3.10-1-alpine"),
-			AlpineGit:     m("rancher/pipeline-tools:v0.1.13"),
+			AlpineGit:     m("rancher/pipeline-tools:v0.1.14"),
 			PluginsDocker: m("plugins/docker:17.12"),
 			Minio:         m("minio/minio:RELEASE.2018-05-25T19-49-13Z"),
 			Registry:      m("registry:2"),
-			RegistryProxy: m("rancher/pipeline-tools:v0.1.13"),
-			KubeApply:     m("rancher/pipeline-tools:v0.1.13"),
+			RegistryProxy: m("rancher/pipeline-tools:v0.1.14"),
+			KubeApply:     m("rancher/pipeline-tools:v0.1.14"),
 		},
 		AuthSystemImages: AuthSystemImages{
 			KubeAPIAuth: m("rancher/kube-api-auth:v0.1.3"),
diff --git a/vendor/modules.txt b/vendor/modules.txt
index fc716bd2..16132d47 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -113,10 +113,10 @@ github.com/prometheus/procfs
 github.com/prometheus/procfs/nfs
 github.com/prometheus/procfs/xfs
 github.com/prometheus/procfs/internal/util
-# github.com/rancher/kontainer-driver-metadata v0.0.0-20191002224336-80a609cf01ab
+# github.com/rancher/kontainer-driver-metadata v0.0.0-20191003190312-bd4630881fb2
 github.com/rancher/kontainer-driver-metadata/rke/templates
 github.com/rancher/kontainer-driver-metadata/rke
-# github.com/rancher/norman v0.0.0-20191002173122-b1eb20740eab
+# github.com/rancher/norman v0.0.0-20191003174345-0ac7dd6ccb36
 github.com/rancher/norman/types/convert
 github.com/rancher/norman/condition
 github.com/rancher/norman/controller
@@ -131,7 +131,7 @@ github.com/rancher/norman/types/slice
 github.com/rancher/norman/httperror
 github.com/rancher/norman/types/definition
 github.com/rancher/norman/types/values
-# github.com/rancher/types v0.0.0-20191002181205-bbd00336fe89
+# github.com/rancher/types v0.0.0-20191003184925-ab3403a2c8ca
 github.com/rancher/types/apis/management.cattle.io/v3
 github.com/rancher/types/apis/project.cattle.io/v3
 github.com/rancher/types/image