diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e098a5904a..e7af7d1fbc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,7 +19,7 @@ guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md).
 
 The requirements to build Machine are:
 
-1.  A running instance of Docker or a Golang 1.6 development environment
+1.  A running instance of Docker or a Golang 1.10 development environment
 2.  The `bash` shell
 3.  [Make](https://www.gnu.org/software/make/)
 
diff --git a/Dockerfile b/Dockerfile
index 6ea97d8b59..348aa1d211 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.8.3
+FROM golang:1.10.0
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
                 openssh-client \
diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go
index 720b13a5cb..ef84f407db 100644
--- a/drivers/openstack/client.go
+++ b/drivers/openstack/client.go
@@ -81,8 +81,8 @@ func (c *GenericClient) CreateInstance(d *Driver) (string, error) {
 	log.Info("Creating machine...")
 
 	server, err := servers.Create(c.Compute, keypairs.CreateOptsExt{
-		serverOpts,
-		d.KeyPairName,
+		CreateOptsBuilder: serverOpts,
+		KeyName:           d.KeyPairName,
 	}).Extract()
 	if err != nil {
 		return "", err