diff --git a/README.md b/README.md
index 8ac2c6d..e1164ff 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,21 @@
 # docker-pinpoint
 
-This repo contains the docker images for [Pinpoint](https://github.com/naver/pinpoint), or you can just use the docker compose file run pinpoint in seconds.
+<!-- TOC -->
 
-### To build the images
+- [docker-pinpoint](#docker-pinpoint)
+    - [Build the images](#build-the-images)
+    - [Run all the containers](#run-all-the-containers)
+    - [Add your own Java based application to be monitored.](#add-your-own-java-based-application-to-be-monitored)
+
+<!-- /TOC -->
+
+This repo contains all the docker images for [Pinpoint](https://github.com/naver/pinpoint), or you can just use the docker compose file run pinpoint in seconds.
+
+### Build the images
 * Go to a folder
 * `docker build -t repo-name:latest .` to build the image
 
-### To run all containers
+### Run all the containers
 
 ```
 docker-compose up -d
@@ -17,7 +26,7 @@ Open your browser and then go to <http://localhost:28080>
 
 ### Add your own Java based application to be monitored.
 
-* Modify the `pinpoint.config` if you need.
+* Download the pinpoint agent tar file from <https://github.com/naver/pinpoint/releases/download/1.6.2/pinpoint-agent-1.6.2.tar.gz> and then modify the `pinpoint.config` if you need.
 
 ```
 ###########################################################
@@ -43,9 +52,10 @@ profiler.collector.tcp.port=9994
 * The following script is a example for a spring boot application.
 
 ```shell
-java  -javaagent:/some-absolute-path/pinpoint-agent-1.6.1/pinpoint-bootstrap-1.6.1.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/wise-log-1.0.0-SNAPSHOT.jar
+java  -javaagent:/some-absolute-path/pinpoint-agent-1.6.2/pinpoint-bootstrap-1.6.2.jar -Dpinpoint.agentId=some-union-id -Dpinpoint.applicationName=some-name -jar build/libs/your-jar.jar
 
 ```
+
 You can find more samples at: <https://github.com/spring-projects/spring-boot/tree/master/spring-boot-samples>
 
 If you plan to use external volumes for hbase you should fill hbase first.
diff --git a/docker-compose.yml b/docker-compose.yml
index ebebd90..b36d926 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   pinpoint-hbase:
     container_name: pinpoint-hbase
-    image: marcosamm/pinpoint-hbase:1.6.2
+    image: wahyd4/pinpoint-hbase:1.6.2
     restart: always
     expose:
       - "2181"
@@ -35,7 +35,7 @@ services:
     depends_on:
       - pinpoint-hbase
     container_name: pinpoint-collector
-    image: marcosamm/pinpoint-collector:1.6.2
+    image: wahyd4/pinpoint-collector:1.6.2
     restart: always
     expose:
       - "9994"
@@ -63,7 +63,7 @@ services:
       - pinpoint-hbase
       - pinpoint-mysql
     container_name: pinpoint-web
-    image: marcosamm/pinpoint-web:1.6.2
+    image: wahyd4/pinpoint-web:1.6.2
     restart: always
     expose:
       - "8080"