diff --git a/docker.be0 b/docker.be0
index 953988045..4d0f6ecb0 100755
--- a/docker.be0
+++ b/docker.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION docker-1.12.3-0
+# BEE_VERSION docker-17.03.0_ce-0
 
 # NOTE: We require a running docker environment. For the first bootstrap
 # this can be provided by the package docker_binary
@@ -12,7 +12,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="https://github.com/docker/docker/archive/v${PKGVERSION}.tar.gz"
+SRCURL[0]="https://github.com/docker/docker/archive/v${PKGFULLVERSION//_/-}.tar.gz"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -62,7 +62,7 @@ mee_configure() {
 
 mee_build() {
     start_cmd make build
-    start_cmd make DOCKER_GITCOMMIT=${PKGVERSION} binary
+    start_cmd make DOCKER_GITCOMMIT=v${PKGVERSION}${PKGEXTRAVERSION_DASH} binary
 }
 
 mee_install() {
@@ -70,7 +70,7 @@ mee_install() {
     install --directory $D$SYSCONFDIR/default
     install --directory $D$SYSCONFDIR/systemd/system
 
-    V=$PKGVERSION
+    V=${PKGFULLVERSION//_/-}
 
     (
         cd $B/bundles/latest/binary-client
@@ -82,7 +82,7 @@ mee_install() {
         install --target-directory $D$BINDIR docker-containerd
         install --target-directory $D$BINDIR docker-containerd-ctr
         install --target-directory $D$BINDIR docker-containerd-shim
-        install docker-proxy-$V $D$BINDIR/docker-proxy
+        install docker-proxy $D$BINDIR/docker-proxy
         install --target-directory $D$BINDIR docker-runc
         install dockerd-$V $D$BINDIR/dockerd
     )