diff --git a/Dockerfile b/Dockerfile
index ee4b64e..daeaf09 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-FROM registry.fedoraproject.org/fedora:24
+FROM fedora:24
 MAINTAINER "Adam Miller" <maxamillion@fedoraproject.org>
 
-ENV VERSION=0.95 RELEASE=0.7
+ENV NAME=cockpit VERSION=0.117 RELEASE=1.8
 LABEL BZComponent="cockpit" \
-	Name="fedora/cockpit" \
+	Name="$FGC/$NAME" \
 	Version="$VERSION" \
-	Release="$RELEASE" \
+	Release="$RELEASE.$DISTTAG" \
 	Architecture="x86_64"
 
-RUN dnf install -y cockpit-ws
+RUN dnf install -y $NAME
 
 # And the stuff that starts the container
 RUN mkdir -p /container && ln -s /host/proc/1 /container/target-namespace