diff --git a/Dockerfile b/Dockerfile
index f339174..9752ce9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,12 @@
-FROM registry.fedoraproject.org/f26/kubernetes-master:latest
+FROM registry.fedoraproject.org/kubernetes-master:rawhide
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-scheduler VERSION=0 RELEASE=5 ARCH=x86_64
+ENV NAME=kubernetes-scheduler VERSION=0 ARCH=x86_64
 LABEL BZComponent="$NAME" \
         name="$FGC/$NAME" \
         version="$VERSION" \
-        release="$RELEASE.$DISTTAG" \
         architecture="$ARCH" \
         atomic.type='system'
 
diff --git a/launch.sh b/launch.sh
index 9d198d2..ce28a97 100755
--- a/launch.sh
+++ b/launch.sh
@@ -3,6 +3,6 @@
 source /etc/kubernetes/scheduler
 source /etc/kubernetes/config
 
-ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_SCHEDULER_ARGS"
+ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_SCHEDULER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs)
 
 exec /usr/bin/kube-scheduler $ARGS