diff --git a/docker-compose.yml b/docker-compose.yml
index df36ee5..18369e5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 pinpoint-hbase:
   container_name: pinpoint-hbase
   hostname: hbase
-  image: dawidmalina/pinpoint-hbase:1.5.2
+  image: dawidmalina/pinpoint-hbase:1.6.0-RC1
   restart: always
   expose:
     - "2181"
@@ -13,7 +13,7 @@ pinpoint-hbase:
 pinpoint-collector:
   container_name: pinpoint-collector
   hostname: collector
-  image: dawidmalina/pinpoint-collector:1.5.2
+  image: dawidmalina/pinpoint-collector:1.6.0-RC1
   restart: always
   expose:
     - "9994"
@@ -39,7 +39,7 @@ pinpoint-collector:
 pinpoint-web:
   container_name: pinpoint-web
   hostname: web
-  image: dawidmalina/pinpoint-web:1.5.2
+  image: dawidmalina/pinpoint-web:1.6.0-RC1
   restart: always
   expose:
     - "8080"
@@ -56,7 +56,7 @@ pinpoint-web:
 
 # only example
 #pinpoint-agent:
-#  image: dawidmalina/pinpoint-agent:1.5.2
+#  image: dawidmalina/pinpoint-agent:1.6.0-RC1
 #  net: "none"
 #  restart: unless-stopped
 #  volumes:
@@ -66,4 +66,4 @@ pinpoint-web:
 #    COLLECTOR_TCP_PORT: 9994
 #    COLLECTOR_UDP_STAT_LISTEN_PORT: 9995
 #    COLLECTOR_UDP_SPAN_LISTEN_PORT: 9996
-#    DISABLE_DEBUG: 'true'
\ No newline at end of file
+#    DISABLE_DEBUG: 'true'
diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile
index 4e703a2..1ef80ee 100644
--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -2,9 +2,9 @@
 # TO_BUILD          docker build -t pinpoint-agent .
 # TO_RUN            docker run --name=pinpoint-agent pinpoint-agent
 
-FROM alpine:3.3
+FROM alpine:3.4
 
-ENV PINPOINT_VERSION=1.5.2
+ENV PINPOINT_VERSION=1.6.0-RC1
 
 ADD configure-agent.sh /usr/local/bin/
 
@@ -16,7 +16,7 @@ RUN apk add --update curl bash \
     && gunzip pinpoint-agent-$PINPOINT_VERSION.tar.gz \
     && tar -xf pinpoint-agent-$PINPOINT_VERSION.tar -C /assets \
     && if test -d /assets/pinpoint-agent-$PINPOINT_VERSION; then mv /assets/pinpoint-agent-$PINPOINT_VERSION /assets/pinpoint-agent; fi \
-    && sed -i 's/DEBUG/INFO/' /assets/pinpoint-agent/lib/log4j.xml \
+    && sed -i 's/DEBUG/INFO/' /assets/lib/log4j.xml \
     && rm pinpoint-agent-$PINPOINT_VERSION.tar \
     && apk del curl \
     && rm /var/cache/apk/*
diff --git a/pinpoint-agent/configure-agent.sh b/pinpoint-agent/configure-agent.sh
index ec3ce2f..711f882 100644
--- a/pinpoint-agent/configure-agent.sh
+++ b/pinpoint-agent/configure-agent.sh
@@ -18,5 +18,5 @@ sed -i "s/profiler.collector.stat.port=9995/profiler.collector.stat.port=${COLLE
 sed -i "s/profiler.collector.span.port=9996/profiler.collector.span.port=${COLLECTOR_UDP_SPAN_LISTEN_PORT}/g" /assets/pinpoint-agent/pinpoint.config
 
 if [ "$DISABLE_DEBUG" == "true" ]; then
-    sed -i 's/level value="DEBUG"/level value="INFO"/' /assets/pinpoint-agent/lib/log4j.xml
+    sed -i 's/level value="DEBUG"/level value="INFO"/' /assets/lib/log4j.xml
 fi
diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile
index ffe848b..e2c1369 100644
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM tomcat:8-jre8
 
-ENV PINPOINT_VERSION=1.5.2
+ENV PINPOINT_VERSION=1.6.0-RC1
 
 ADD start-collector.sh /usr/local/bin/
 
diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile
index ace170e..a86662a 100644
--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -5,13 +5,15 @@
 FROM java:8-jdk
 
 ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
-ENV HBASE_VERSION=1.0.3
+ENV HBASE_VERSION=1.2.3
 ENV HBASE_HOME=/opt/hbase/hbase-$HBASE_VERSION
-ENV PINPOINT_VERSION=1.5.2
+ENV PINPOINT_VERSION=1.6.0-RC1
+ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
+ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
 
 RUN mkdir -p /opt/hbase \
     && cd /opt/hbase \
-    && curl -SL "http://apache.mirrors.pair.com/hbase/hbase-$HBASE_VERSION/hbase-$HBASE_VERSION-bin.tar.gz" -o hbase.tar.gz \
+    && curl -fSL "$HBASE_REPOSITORY/$HBASE_VERSION/hbase-$HBASE_VERSION-bin.tar.gz" -o hbase.tar.gz || curl -fSL "$HBASE_SUB_REPOSITORY/$HBASE_VERSION/hbase-$HBASE_VERSION-bin.tar.gz" -o hbase.tar.gz \
     && tar xfvz hbase.tar.gz \
     && rm -rf hbase.tar.gz
 
diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile
index c48eac3..323686d 100644
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM tomcat:8-jre8
 
-ENV PINPOINT_VERSION=1.5.2
+ENV PINPOINT_VERSION=1.6.0-RC1
 
 ADD start-web.sh /usr/local/bin/