diff --git a/Dockerfile b/Dockerfile
index 5889463..83dc2a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,13 @@
-FROM registry.fedoraproject.org/kubernetes-master:rawhide
+FROM registry.fedoraproject.org/f26/kubernetes-master:latest
 MAINTAINER "Jason Brooks" <jbrooks@redhat.com>
 
 ENV container=docker
 
-ENV NAME=kubernetes-controller-manager VERSION=0 ARCH=x86_64
+ENV NAME=kubernetes-controller-manager VERSION=0 RELEASE=5 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 3b38c36..f75107c 100755
--- a/launch.sh
+++ b/launch.sh
@@ -3,6 +3,6 @@
 source /etc/kubernetes/controller-manager
 source /etc/kubernetes/config
 
-ARGS="$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS"
+ARGS=$(echo "$@ $KUBE_LOGTOSTDERR $KUBE_LOG_LEVEL $KUBE_MASTER $KUBE_CONTROLLER_MANAGER_ARGS" | xargs -n1 | sort -u -t = -k 1,1 | xargs)
 
 exec /usr/bin/kube-controller-manager $ARGS