diff --git a/Dockerfile b/Dockerfile
index 564178e..e36f385 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
-FROM registry.fedoraproject.org/f27/kubernetes-master:latest
+FROM candidate-registry.fedoraproject.org/f27/kubernetes-node:1.7.1
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-apiserver VERSION=0.1 RELEASE=8 ARCH=x86_64
+ENV NAME=kubernetes-apiserver VERSION=1.7.1 RELEASE=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
diff --git a/launch.sh b/launch.sh
index feb0ebd..534fa58 100644
--- a/launch.sh
+++ b/launch.sh
@@ -3,6 +3,6 @@
 source /etc/kubernetes/apiserver
 source /etc/kubernetes/config
 
-ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_ETCD_SERVERS $KUBE_API_ADDRESS $KUBE_API_PORT $KUBELET_PORT $KUBE_ALLOW_PRIV $KUBE_SERVICE_ADDRESSES $KUBE_ADMISSION_CONTROL $KUBE_API_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs)
+ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_ETCD_SERVERS $KUBE_API_ADDRESS $KUBE_API_PORT $KUBELET_PORT $KUBE_ALLOW_PRIV $KUBE_SERVICE_ADDRESSES $KUBE_ADMISSION_CONTROL $KUBE_API_ARGS"
 
 exec /usr/bin/kube-apiserver $ARGS