diff --git a/bin/image/tm-5/setup-remote b/bin/image/tm-5/setup-remote
index b47f3e2..803b51b 100644
--- a/bin/image/tm-5/setup-remote
+++ b/bin/image/tm-5/setup-remote
@@ -836,10 +836,9 @@ ln -s /etc/hadoop/conf/mapred-site.xml /etc/hbase/conf

 cat >> /etc/hbase/conf/hbase-env.sh <<EOF
 export HBASE_MASTER_HEAPSIZE=1000
-export HBASE_MASTER_OPTS="-XX:+UseMembar -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:/var/log/hbase/hbase-master-gc.log"
+export HBASE_MASTER_OPTS="-Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf -XX:+UseMembar -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:/var/log/hbase/hbase-master-gc.log"
 export HBASE_REGIONSERVER_HEAPSIZE=3000
-export HBASE_REGIONSERVER_OPTS="-XX:+UseMembar -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:/var/log/hbase/hbase-regionserver-gc.log"
-export HBASE_OPTS="$HBASE_OPTS -Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf"
+export HBASE_REGIONSERVER_OPTS="-Djava.security.auth.login.config=/etc/hbase/conf/jaas.conf -XX:+UseMembar -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:/var/log/hbase/hbase-regionserver-gc.log"
 EOF

 cat > /etc/hbase/conf/log4j.properties <<EOF