diff --git a/.gitignore b/.gitignore
index ba70fcecd..8b2e6aebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ tmp/
 fnlb/fnlb
 /fn
 .DS_Store
+/fn-server
diff --git a/Makefile b/Makefile
index 72fa95a8d..12d6e02e9 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ docker-dep:
 	docker run --rm -it -v ${CURDIR}:/go/src/github.com/fnproject/fn -w /go/src/github.com/fnproject/fn treeder/glide install -v
 
 docker-build:
-	docker build --build-arg HTTPS_PROXY --build-arg HTTP_PROXY -t fnproject/functions:latest .
+	docker build --build-arg HTTPS_PROXY --build-arg HTTP_PROXY -t fnproject/fn-server:latest .
 
 docker-run: docker-build
 	docker run --rm --privileged -it -e NO_PROXY -e HTTP_PROXY -e LOG_LEVEL=debug -e "DB_URL=sqlite3:///app/data/fn.db" -v ${CURDIR}/data:/app/data -p 8080:8080 fnproject/functions
diff --git a/release.sh b/release.sh
index 8d6c673c8..86e527d05 100755
--- a/release.sh
+++ b/release.sh
@@ -40,7 +40,8 @@ docker push $user/$image:$version
 docker push $user/$image:latest
 
 # Deprecated images, should remove this sometime in near future
-docker tag $user/$image_deprecated:latest $user/$image_deprecated:$version
+docker tag $user/$image:latest $user/$image_deprecated:$version
+docker tag $user/$image:latest $user/$image_deprecated:latest
 docker push $user/$image_deprecated:$version
 docker push $user/$image_deprecated:latest