diff --git a/Makefile b/Makefile
index f118725..8134ebd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 UTILS_PATH := build-utils
 SERVICE_NAME := riak-base
 BUILD_IMAGE_TAG := 917afcdd0c0a07bf4155d597bbba72e962e1a34a
-PORTAGE_REF := 24b8642ec0a5562111df6267e967257d537c0b04
-OVERLAYS_RBKMONEY_REF := 672b718c5b20d7d5c4852c924878a201aab5b625
+PORTAGE_REF := 366f3e8f548f03ed8c8f43b84e06000912f8a8f9
+OVERLAYS_RBKMONEY_REF := 8a54bfff180677ef2afc0db91a4e6b4ea10804e3
 
 .PHONY: $(SERVICE_NAME) push submodules repos
 $(SERVICE_NAME): .state
diff --git a/files/riak-cluster.sh b/files/riak-cluster.sh
index 07a475a..fa6c889 100755
--- a/files/riak-cluster.sh
+++ b/files/riak-cluster.sh
@@ -41,7 +41,10 @@ for s in $PRESTART; do
 done
 
 # Start the node and wait until fully up
-$RIAK start
+# `riak start` command can be configured through env variables (e.g, WAIT_FOR_ERLANG).
+# However, `riak` resets all env variables if the user is different from riak.
+# So let's use su to pass the current environment into `riak` script.
+su riak -c "$RIAK start"
 $RIAK_ADMIN wait-for-service riak_kv
 
 # Run all poststart scripts