diff --git a/.env b/.env
index 9e8897d..4afc6a6 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Hbase
 
diff --git a/Readme.md b/Readme.md
index 2ba0a9f..e95742e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -13,6 +13,7 @@ It supports and helps you understand your application in a glance and allow you
 
 ## Supported Tags
 
+ - 2.0.0
  - 1.8.5 
  - 1.8.4
  - 1.8.3
diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env
index 9c97940..04ade7c 100644
--- a/pinpoint-agent-attach-example/java/.env
+++ b/pinpoint-agent-attach-example/java/.env
@@ -1,4 +1,4 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
\ No newline at end of file
diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env
index dda85f0..fa7b0f2 100644
--- a/pinpoint-agent-attach-example/tomcat/.env
+++ b/pinpoint-agent-attach-example/tomcat/.env
@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 APP_PORT=8000
 AGENT_ID=app-in-docker
 APP_NAME=quickapp
\ No newline at end of file
diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env
index 4ccd0c6..eb80289 100644
--- a/pinpoint-agent/.env
+++ b/pinpoint-agent/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Agent
 
diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile
index 7882520..5d5778f 100644
--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.7
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.0}
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-agent-${PINPOINT_VERSION}.tar.gz
 
 COPY /build/scripts/configure-agent.sh /usr/local/bin/
diff --git a/pinpoint-agent/Readme.md b/pinpoint-agent/Readme.md
index 60d7828..c975030 100644
--- a/pinpoint-agent/Readme.md
+++ b/pinpoint-agent/Readme.md
@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Agent component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.0.0
  - 1.8.5 
  - 1.8.4
  - 1.8.3
diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env
index 8133583..9c3c3a0 100644
--- a/pinpoint-collector/.env
+++ b/pinpoint-collector/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Collector
 
diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile
index a201895..5df4be4 100644
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -2,7 +2,7 @@ FROM tomcat:8-jre8
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.0}
 
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-collector-${PINPOINT_VERSION}.war
 
diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md
index fa1ab3b..8f5be44 100644
--- a/pinpoint-collector/Readme.md
+++ b/pinpoint-collector/Readme.md
@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Collector component of the Pinpoint appl
 
 ## Supported Tags
 
+ - 2.0.0
  - 1.8.5 
  - 1.8.4
  - 1.8.3
diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env
index 4bc1ba2..951bd31 100644
--- a/pinpoint-flink/.env
+++ b/pinpoint-flink/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-flink
 
diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env
index eaf57ad..f005f96 100644
--- a/pinpoint-hbase/.env
+++ b/pinpoint-hbase/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Hbase
 
diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile
index 9f0674c..ce84e43 100644
--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -2,7 +2,7 @@ FROM java:8-jdk
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.0}
 
 ENV HBASE_REPOSITORY=http://apache.mirrors.pair.com/hbase
 ENV HBASE_SUB_REPOSITORY=http://archive.apache.org/dist/hbase
diff --git a/pinpoint-hbase/Readme.md b/pinpoint-hbase/Readme.md
index 1003827..95fb704 100644
--- a/pinpoint-hbase/Readme.md
+++ b/pinpoint-hbase/Readme.md
@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Hbase component of the Pinpoint applicat
 
 ## Supported Tags
 
+ - 2.0.0
  - 1.8.5 
  - 1.8.4
  - 1.8.3
diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env
index f22e698..c0f4d14 100644
--- a/pinpoint-mysql/.env
+++ b/pinpoint-mysql/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile
index 4973085..fa26514 100644
--- a/pinpoint-mysql/Dockerfile
+++ b/pinpoint-mysql/Dockerfile
@@ -1,6 +1,6 @@
 FROM mysql:5.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.0}
 
 RUN apt update \ 
 	&& apt-get install -y --no-install-recommends ca-certificates wget \
diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md
index 0f7279c..9272b90 100644
--- a/pinpoint-mysql/Readme.md
+++ b/pinpoint-mysql/Readme.md
@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Mysql component of the Pinpoint applicat
 
 ## Supported Tags
  
+ - 2.0.0
  - 1.8.5
  - 1.8.4
  - 1.8.3
diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env
index 1c8ea51..4b1b50e 100644
--- a/pinpoint-quickstart/.env
+++ b/pinpoint-quickstart/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Agent
 
diff --git a/pinpoint-web/.env b/pinpoint-web/.env
index 8916379..1e44654 100644
--- a/pinpoint-web/.env
+++ b/pinpoint-web/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=1.8.5
+PINPOINT_VERSION=2.0.0
 
 ### Pinpoint-Web
 
diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile
index 6c3a20c..ac8bc28 100644
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -2,7 +2,7 @@ FROM tomcat:8-jre8
 
 LABEL maintainer="Roy Kim <roy.kim@navercorp.com>"
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-1.8.5}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.0.0}
 ARG INSTALL_URL=https://github.com/naver/pinpoint/releases/download/${PINPOINT_VERSION}/pinpoint-web-${PINPOINT_VERSION}.war
 
 COPY /build/scripts/start-web.sh /usr/local/bin/
diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md
index d689983..c34f4d1 100644
--- a/pinpoint-web/Readme.md
+++ b/pinpoint-web/Readme.md
@@ -5,6 +5,7 @@ This Docker image contains the Pinpoint Web component of the Pinpoint applicatio
 
 ## Supported Tags
 
+ - 2.0.0
  - 1.8.5 
  - 1.8.4
  - 1.8.3