diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41049ef941e3d7eff70ce206d0a2483e985fab86..8603a5dd39f273480122aa96f93041755448c34d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ and this project will adhere to [Semantic Versioning](http://semver.org/spec/v2.
 * Fix bugs in snapshot move, refactor code and improve performance significantly. #2440, #2442
 * Add error handling to GetNoStore. Fixes #2373.
 * Fix bugs in Bulk loader. #2449
+* Posting List and Raft bug fixes. #2457
 
 ### Changed
 
@@ -35,7 +36,7 @@ and this project will adhere to [Semantic Versioning](http://semver.org/spec/v2.
 * Trace how node.Run loop performs.
 * Allow tweaking Badger options.
 
-*Warning: This change modifies some flag names. In particular, Badger options
+**Note:** This change modifies some flag names. In particular, Badger options
 are now exposed via flags named with `--badger.` prefix.
 
 ## [1.0.5] - 2018-04-20
diff --git a/contrib/Dockerfile b/contrib/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..98a49c6c9e93a61f79c7ede64f36bbca78543d77
--- /dev/null
+++ b/contrib/Dockerfile
@@ -0,0 +1,18 @@
+# This file is used to add the nightly Dgraph binaries and assets to Dgraph base
+# image.
+
+# This gets built as part of release.sh. Must be run from /tmp/build, with the linux binaries
+# already built and placed there.
+
+FROM ubuntu:latest
+MAINTAINER Dgraph Labs <contact@dgraph.io>
+
+ADD linux /usr/local/bin
+
+EXPOSE 8080
+EXPOSE 9080
+
+RUN mkdir /dgraph
+WORKDIR /dgraph
+
+CMD ["dgraph"] # Shows the dgraph version and commands available.
diff --git a/contrib/nightly/Dockerfile b/contrib/nightly/Dockerfile
deleted file mode 100644
index 985f26cba64d14a5931b1306fd92104fccea28ef..0000000000000000000000000000000000000000
--- a/contrib/nightly/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is used to add the nightly Dgraph binaries and assets to Dgraph base
-# image.
-
-# Command to build - docker build -t dgraph/dgraph:nightly .
-
-FROM ubuntu:16.04
-MAINTAINER Dgraph Labs <contact@dgraph.io>
-
-RUN mkdir /dgraph \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends ca-certificates curl \
-    && rm -rf /var/lib/apt/lists/*
-
-ADD dgraph-build /usr/local/bin
-
-EXPOSE 8080
-EXPOSE 9080
-WORKDIR /dgraph
-
-CMD ["dgraph"] # Shows the dgraph version and commands available.
diff --git a/contrib/release.sh b/contrib/release.sh
index 3f51b936aa9dd6f6309733346f75196b4cfc35d3..49ada77790e35d1e68088eaa5681a15a02603635 100755
--- a/contrib/release.sh
+++ b/contrib/release.sh
@@ -12,6 +12,8 @@ rm -Rf $GOPATH
 mkdir $GOPATH
 
 TAG=$1
+
+# DO NOT change the /tmp/build directory, because Dockerfile also picks up binaries from there.
 TMP="/tmp/build"
 rm -Rf $TMP
 mkdir $TMP
@@ -134,6 +136,14 @@ createSum () {
 createSum darwin
 createSum linux
 
+# Create Docker image.
+cp $basedir/dgraph/contrib/Dockerfile $TMP
+pushd $TMP
+  docker build -t dgraph/dgraph:$TAG .
+popd
+rm $TMP/Dockerfile
+
+# Create the tars and delete the binaries.
 createTar () {
   os=$1
   echo "Creating tar for $os"