diff --git a/docker-compose-example-app.yml b/docker-compose-example-app.yml
index 365d5f3..6a0b12f 100644
--- a/docker-compose-example-app.yml
+++ b/docker-compose-example-app.yml
@@ -6,10 +6,10 @@ rancher-server:
   ports:
     - 8080:8080
   environment:
-    JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.0.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app"
+    JAVA_OPTS: "-javaagent:/assets/pinpoint-agent/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=app-in-docker -Dpinpoint.applicationName=app"
 
 pinpoint-agent:
-  image: dawidmalina/pinpoint-agent:1.6.0
+  image: wahyd4/pinpoint-agent:1.6.1
   net: "none"
   restart: unless-stopped
 #  volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index a5c548d..89ab829 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.6.0
+  image: wahyd4/pinpoint-hbase:1.6.1
   restart: always
   expose:
     - "2181"
@@ -13,7 +13,7 @@ pinpoint-hbase:
 pinpoint-collector:
   container_name: pinpoint-collector
   hostname: collector
-  image: dawidmalina/pinpoint-collector:1.6.0
+  image: wahyd4/pinpoint-collector:1.6.1
   restart: always
   expose:
     - "9994"
@@ -39,7 +39,7 @@ pinpoint-collector:
 pinpoint-web:
   container_name: pinpoint-web
   hostname: web
-  image: dawidmalina/pinpoint-web:1.6.0
+  image: wahyd4/pinpoint-web:1.6.1
   restart: always
   expose:
     - "8080"
@@ -56,7 +56,7 @@ pinpoint-web:
 
 # only example
 #pinpoint-agent:
-#  image: dawidmalina/pinpoint-agent:1.6.0
+#  image: wahyd4/pinpoint-agent:1.6.1
 #  net: "none"
 #  restart: unless-stopped
 #  volumes:
diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile
index c224add..631b766 100644
--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM alpine:3.5
 
-ENV PINPOINT_VERSION=1.6.0
+ENV PINPOINT_VERSION=1.6.1
 
 ADD configure-agent.sh /usr/local/bin/
 
diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile
index 86d8363..bb43e15 100644
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM tomcat:8-jre8
 
-ENV PINPOINT_VERSION=1.6.0
+ENV PINPOINT_VERSION=1.6.1
 
 ADD start-collector.sh /usr/local/bin/
 
diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile
index 9940627..92ae5fa 100644
--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -7,7 +7,7 @@ FROM java:8-jdk
 ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
 ENV HBASE_VERSION=1.2.3
 ENV HBASE_HOME=/opt/hbase/hbase-$HBASE_VERSION
-ENV PINPOINT_VERSION=1.6.0
+ENV PINPOINT_VERSION=1.6.1
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
 
diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile
index c9c338e..e93f103 100644
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM tomcat:8-jre8
 
-ENV PINPOINT_VERSION=1.6.0
+ENV PINPOINT_VERSION=1.6.1
 
 ADD start-web.sh /usr/local/bin/