diff --git a/Dockerfile b/Dockerfile
index c544230bd..73b508793 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ADD . $D
 RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/
 
 # final stage
-FROM fnproject/dind
+FROM fnproject/dind:17.12
 WORKDIR /app
-COPY --from=build-env /tmp/fn-alpine /app/functions
-CMD ["./functions"]
+COPY --from=build-env /tmp/fn-alpine /app/fnserver
+CMD ["./fnserver"]
diff --git a/images/dind/Dockerfile b/images/dind/Dockerfile
index 5e4893626..515e18648 100644
--- a/images/dind/Dockerfile
+++ b/images/dind/Dockerfile
@@ -1,4 +1,4 @@
-FROM docker:17.11-dind
+FROM docker:17.12-dind
 
 RUN apk add --no-cache ca-certificates
 
diff --git a/images/dind/release.sh b/images/dind/release.sh
index 02bebe3f8..f15cd7d80 100755
--- a/images/dind/release.sh
+++ b/images/dind/release.sh
@@ -1,12 +1,19 @@
-set -e
+set -ex
 
-./build.sh
+# ./build.sh
 
 # Match version with Docker version
 version=$(docker run --rm -v "$PWD":/app treeder/bump  --extract --input "`docker -v`")
 echo "Version: $version"
+M=$(docker run --rm treeder/bump --format M --input "$version")
+Mm=$(docker run --rm treeder/bump --format M.m --input "$version")
 
 docker tag fnproject/dind:latest fnproject/dind:$version
-
-docker push fnproject/dind:latest
+# be nice to have bump image do all of this tagging and pushing too (mount docker sock and do it all)
+docker tag fnproject/dind:$version fnproject/dind:$Mm
+docker tag fnproject/dind:$version fnproject/dind:$M
+ 
 docker push fnproject/dind:$version
+docker push fnproject/dind:$Mm
+docker push fnproject/dind:$M
+docker push fnproject/dind:latest