diff --git a/.env b/.env
index abd1afd..32104e3 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,9 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 # Used to make collector ip fixed for external microservices which uses pinpoint agent with collector ip.
-PINPOINT_NETWORK_SUBNET=172.24.0.0/28
-COLLECTOR_FIXED_IP=172.24.0.11
+PINPOINT_NETWORK_SUBNET=172.24.0.0/27
+COLLECTOR_FIXED_IP=172.24.0.30
 
 #zookeeper information required
 PINPOINT_ZOOKEEPER_ADDRESS=zoo1
@@ -155,3 +155,11 @@ FLINK_WEB_PORT=8081
 ### Pinpoint-quickstart
 
 APP_PORT=8085
+
+### Pinpoint-pinot
+PINPOINT_PINOT_JDBC_URL=jdbc:pinot://pinot-controller:9000
+PINPOINT_PINOT_JDBC_USERNAME=admin
+PINPOINT_PINOT_JDBC_PASSWORD=admin
+
+### Pinpoint-kafka
+PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=pinpoint-kafka:9092
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index 0fb10a1..4deb44e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -12,6 +12,7 @@ Installing Pinpoint with these docker files will take approximately 10min. to ch
 It supports and helps you understand your application in a glance and allow you to build world-class, high-quality software.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/docker-compose-metric.yml b/docker-compose-metric.yml
new file mode 100644
index 0000000..eae3399
--- /dev/null
+++ b/docker-compose-metric.yml
@@ -0,0 +1,214 @@
+version: "3.6"
+
+services:
+  pinpoint-web:
+    build:
+      context: ./pinpoint-web
+      dockerfile: Dockerfile-metric
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+    container_name: "${PINPOINT_WEB_NAME}"
+    image: "pinpointdocker/pinpoint-web:${PINPOINT_VERSION}-metric"
+    depends_on:
+      - pinpoint-hbase
+      - pinpoint-mysql
+      - zoo1
+      - pinpoint-kafka-init
+      - pinot-init
+    restart: always
+    expose:
+      - "9997"
+    ports:
+      - "9997:9997"
+      - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
+    environment:
+      - WEB_SERVER_PORT=${WEB_SERVER_PORT}
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},metric
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
+      - CLUSTER_ENABLE=${CLUSTER_ENABLE}
+      - ADMIN_PASSWORD=${ADMIN_PASSWORD}
+      - CONFIG_SENDUSAGE=${CONFIG_SENDUSAGE}
+      - LOGGING_LEVEL_ROOT=${WEB_LOGGING_LEVEL_ROOT}
+      - CONFIG_SHOW_APPLICATIONSTAT=${CONFIG_SHOW_APPLICATIONSTAT}
+      - JDBC_DRIVERCLASSNAME=${JDBC_DRIVERCLASSNAME}
+      - JDBC_URL=${JDBC_URL}
+      - JDBC_USERNAME=${JDBC_USERNAME}
+      - JDBC_PASSWORD=${JDBC_PASSWORD}
+      - PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
+      - PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
+      - PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
+    links:
+      - "pinpoint-mysql:pinpoint-mysql"
+    networks:
+      - pinpoint
+
+
+  pinpoint-collector:
+    build:
+      context: ./pinpoint-collector
+      dockerfile: Dockerfile-metric
+      args:
+        - PINPOINT_VERSION=${PINPOINT_VERSION}
+    container_name: "${PINPOINT_COLLECTOR_NAME}"
+    image: "pinpointdocker/pinpoint-collector:${PINPOINT_VERSION}-metric"
+    depends_on:
+      - pinpoint-hbase
+      - zoo1
+      - pinpoint-kafka-init
+      - pinot-init
+    restart: always
+    expose:
+      - "9991"
+      - "9992"
+      - "9993"
+      - "9994"
+      - "9995"
+      - "9996"
+      - "15200"
+    ports:
+      - "${COLLECTOR_RECEIVER_GRPC_AGENT_PORT:-9991}:9991/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_STAT_PORT:-9992}:9992/tcp"
+      - "${COLLECTOR_RECEIVER_GRPC_SPAN_PORT:-9993}:9993/tcp"
+      - "${COLLECTOR_RECEIVER_BASE_PORT:-9994}:9994"
+      - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/tcp"
+      - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/tcp"
+      - "${COLLECTOR_RECEIVER_STAT_UDP_PORT:-9995}:9995/udp"
+      - "${COLLECTOR_RECEIVER_SPAN_UDP_PORT:-9996}:9996/udp"
+    networks:
+      pinpoint:
+        ipv4_address: ${COLLECTOR_FIXED_IP}
+    environment:
+      - SPRING_PROFILES_ACTIVE=local,metric
+      - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
+      - CLUSTER_ENABLE=${CLUSTER_ENABLE}
+      - LOGGING_LEVEL_ROOT=${COLLECTOR_LOGGING_LEVEL_ROOT}
+      - FLINK_CLUSTER_ENABLE=${FLINK_CLUSTER_ENABLE}
+      - FLINK_CLUSTER_ZOOKEEPER_ADDRESS=${FLINK_CLUSTER_ZOOKEEPER_ADDRESS}
+      - PINPOINT_PINOT_JDBC_URL=${PINPOINT_PINOT_JDBC_URL}
+      - PINPOINT_PINOT_JDBC_USERNAME=${PINPOINT_PINOT_JDBC_USERNAME}
+      - PINPOINT_PINOT_JDBC_PASSWORD=${PINPOINT_PINOT_JDBC_PASSWORD}
+      - PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS=${PINPOINT_METRIC_KAFKA_BOOTSTRAP_SERVERS}
+
+  pinpoint-kafka:
+    image: ubuntu/kafka:3.1-22.04_beta
+    restart: unless-stopped
+    hostname: pinpoint-kafka
+    command: /etc/kafka/server.properties --override advertised.listeners=PLAINTEXT://pinpoint-kafka:9092
+    depends_on:
+      - pinot-zoo
+    expose:
+      - "9092"
+    environment:
+      - ZOOKEEPER_HOST=pinot-zoo
+    networks:
+      - pinpoint
+
+  pinpoint-kafka-init:
+    image: ubuntu/kafka:3.1-22.04_beta
+    restart: "no"
+    depends_on:
+      - pinpoint-kafka
+    entrypoint: >
+      sh -c "/opt/kafka/bin/kafka-topics.sh --create --topic url-stat --bootstrap-server pinpoint-kafka:9092 &&
+      /opt/kafka/bin/kafka-topics.sh --create --topic system-metric-data-type --bootstrap-server pinpoint-kafka:9092 &&
+      /opt/kafka/bin/kafka-topics.sh --create --topic system-metric-tag --bootstrap-server pinpoint-kafka:9092 &&
+      /opt/kafka/bin/kafka-topics.sh --create --topic system-metric-double --bootstrap-server pinpoint-kafka:9092"
+    networks:
+      - pinpoint
+
+  pinot-controller:
+    image: apachepinot/pinot:latest-arm64
+    restart: unless-stopped
+    command: StartController -zkAddress pinot-zoo
+    depends_on:
+      - pinot-zoo
+    expose:
+      - "9000"
+    ports:
+      - "9000:9000"
+    networks:
+      - pinpoint
+
+  pinot-broker-0:
+    image: apachepinot/pinot:latest-arm64
+    restart: unless-stopped
+    command: StartBroker -zkAddress pinot-zoo
+    depends_on:
+      - pinot-controller
+    expose:
+      - "8099"
+    networks:
+      - pinpoint
+
+  pinot-server-0:
+    image: apachepinot/pinot:latest-arm64
+    restart: unless-stopped
+    command: StartServer -zkAddress pinot-zoo
+    depends_on:
+      - pinot-broker-0
+    expose:
+      - "8098"
+    networks:
+      - pinpoint
+
+  pinot-init:
+    image: apachepinot/pinot:latest-arm64
+    restart: "no"
+    entrypoint: >
+      sh -c "
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-table.json > uriStatTable.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-uriStat-schema.json > uriStatSchema.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-table.json > tagTable.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-tag-schema.json > tagSchema.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-table.json > doubleTable.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-double-schema.json > doubleSchema.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-table.json > dataTypeTable.json &&
+      curl https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v${PINPOINT_VERSION}/metric-module/metric/src/main/pinot/pinot-dataType-schema.json > dataTypeSchema.json &&
+
+      sed -i 's/localhost:19092/pinpoint-kafka:9092/g' uriStatTable.json tagTable.json doubleTable.json dataTypeTable.json &&
+      sed -i 's/uri-stat/url-stat/g' uriStatTable.json &&
+      sed -i '3,$$s/Double/DOUBLE/' doubleSchema.json &&
+
+      sleep 30 &&
+      /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile uriStatSchema.json -realtimeTableConfigFile uriStatTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
+      /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile tagSchema.json -realtimeTableConfigFile tagTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
+      /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile doubleSchema.json -realtimeTableConfigFile doubleTable.json -controllerHost pinot-controller -controllerPort 9000 -exec &&
+      /opt/pinot/bin/pinot-admin.sh AddTable -schemaFile dataTypeSchema.json -realtimeTableConfigFile dataTypeTable.json -controllerHost pinot-controller -controllerPort 9000 -exec"
+    depends_on:
+      - pinot-server
+      - pinpoint-kafka-init
+    networks:
+      - pinpoint
+
+  #zookeepers
+  pinot-zoo:
+    image: zookeeper:3.8.0-temurin
+    restart: always
+    expose:
+      - "2181"
+    networks:
+      - pinpoint
+
+  telegraf:
+    image: telegraf:1.25.0
+    networks:
+      - pinpoint
+    depends_on:
+      - pinpoint-collector
+    entrypoint: >
+      sh -c "
+      echo '
+      [[inputs.cpu]]\
+        percpu = true\
+        totalcpu = true\
+        collect_cpu_time = false\
+        report_active = false\
+
+      [[outputs.http]]\
+        url = \"http://pinpoint-collector:15200/telegraf\"\
+        data_format = \"json\"\
+        [outputs.http.headers]\
+          hostGroupName = \"pinpoint-docker\"\
+          Content-Type = \"application/json\"\' > telegraf.conf &&
+      cat telegraf.conf &&
+      telegraf -config telegraf.conf"
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index a086254..a7d9dc6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
       - "${WEB_SERVER_PORT:-8080}:${WEB_SERVER_PORT:-8080}"
     environment:
       - WEB_SERVER_PORT=${WEB_SERVER_PORT}
-      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES},batch
+      - SPRING_PROFILES_ACTIVE=${SPRING_PROFILES}
       - PINPOINT_ZOOKEEPER_ADDRESS=${PINPOINT_ZOOKEEPER_ADDRESS}
       - CLUSTER_ENABLE=${CLUSTER_ENABLE}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -223,9 +223,7 @@ services:
 
     container_name: "${PINPOINT_AGENT_NAME}"
     image: "pinpointdocker/pinpoint-agent:${PINPOINT_VERSION}"
-
     restart: unless-stopped
-
     networks:
       - pinpoint
     volumes:
diff --git a/pinpoint-agent-attach-example/java/.env b/pinpoint-agent-attach-example/java/.env
index f399a9e..b79d46b 100644
--- a/pinpoint-agent-attach-example/java/.env
+++ b/pinpoint-agent-attach-example/java/.env
@@ -1,5 +1,5 @@
 ### Pinpoint with Java
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 AGENT_ID=java-app-in-docker
 APP_NAME=JavaAttachExample
diff --git a/pinpoint-agent-attach-example/tomcat/.env b/pinpoint-agent-attach-example/tomcat/.env
index 540594d..1218d83 100644
--- a/pinpoint-agent-attach-example/tomcat/.env
+++ b/pinpoint-agent-attach-example/tomcat/.env
@@ -1,5 +1,5 @@
 ### Pinpoint with Tomcat
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 APP_PORT=8085
 AGENT_ID=app-in-docker
diff --git a/pinpoint-agent/.env b/pinpoint-agent/.env
index ae485d8..668071c 100644
--- a/pinpoint-agent/.env
+++ b/pinpoint-agent/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
diff --git a/pinpoint-agent/Dockerfile b/pinpoint-agent/Dockerfile
index 1096e8f..4eaa9e8 100644
--- a/pinpoint-agent/Dockerfile
+++ b/pinpoint-agent/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${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 e89c582..d64cb70 100644
--- a/pinpoint-agent/Readme.md
+++ b/pinpoint-agent/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Agent component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-agent/build/scripts/configure-agent.sh b/pinpoint-agent/build/scripts/configure-agent.sh
index 4a6ac1d..cc33f68 100644
--- a/pinpoint-agent/build/scripts/configure-agent.sh
+++ b/pinpoint-agent/build/scripts/configure-agent.sh
@@ -3,25 +3,25 @@ set -e
 set -x
 
 #sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.transport.module=/ s/=.*/=${PROFILER_TRANSPORT_MODULE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
 
-sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
 sed -i "/profiler.collector.tcp.port=/ s/=.*/=${COLLECTOR_TCP_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.collector.stat.port=/ s/=.*/=${COLLECTOR_STAT_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.collector.span.port=/ s/=.*/=${COLLECTOR_SPAN_PORT}/" /pinpoint-agent/pinpoint-root.config
 
 #sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/pinpoint.config
-sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.transport.grpc.collector.ip=/ s/=.*/=${COLLECTOR_IP}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
 sed -i "/profiler.transport.grpc.agent.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_AGENT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.transport.grpc.metadata.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_METADATA_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.transport.grpc.stat.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_STAT_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
 sed -i "/profiler.transport.grpc.span.collector.port=/ s/=.*/=${PROFILER_TRANSPORT_SPAN_COLLECTOR_PORT}/" /pinpoint-agent/pinpoint-root.config
-sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
-sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/${SPRING_PROFILES}/pinpoint.config
+sed -i "/profiler.sampling.type=/ s/=.*/=${PROFILER_SAMPLING_TYPE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
+sed -i "/profiler.sampling.counting.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_COUNTING_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
+sed -i "/profiler.sampling.percent.sampling-rate=/ s/=.*/=${PROFILER_SAMPLING_PERCENT_SAMPLING_RATE}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
+sed -i "/profiler.sampling.new.throughput=/ s/=.*/=${PROFILER_SAMPLING_NEW_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
+sed -i "/profiler.sampling.continue.throughput=/ s/=.*/=${PROFILER_SAMPLING_CONTINUE_THROUGHPUT}/" /pinpoint-agent/profiles/local/pinpoint.config /pinpoint-agent/profiles/release/pinpoint.config
 
-sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/${SPRING_PROFILES}/log4j2.xml
+sed -i "/Root level=/ s/=.*/=\"${DEBUG_LEVEL}\">/g" /pinpoint-agent/profiles/local/log4j2.xml /pinpoint-agent/profiles/release/log4j2.xml
 
 exec "$@"
diff --git a/pinpoint-batch/.env b/pinpoint-batch/.env
index b934909..44fcc5a 100644
--- a/pinpoint-batch/.env
+++ b/pinpoint-batch/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 ### Pinpoint-Batch
diff --git a/pinpoint-batch/Dockerfile b/pinpoint-batch/Dockerfile
index e4f5ec7..14b0693 100644
--- a/pinpoint-batch/Dockerfile
+++ b/pinpoint-batch/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-batch-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
diff --git a/pinpoint-batch/Readme.md b/pinpoint-batch/Readme.md
index 01dad95..34db8fb 100644
--- a/pinpoint-batch/Readme.md
+++ b/pinpoint-batch/Readme.md
@@ -3,6 +3,7 @@
 This Docker image contains the Pinpoint Batch component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-collector/.env b/pinpoint-collector/.env
index 89cd126..4e6d3a4 100644
--- a/pinpoint-collector/.env
+++ b/pinpoint-collector/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 ### Pinpoint-Collector
diff --git a/pinpoint-collector/Dockerfile b/pinpoint-collector/Dockerfile
index a1332df..23db443 100644
--- a/pinpoint-collector/Dockerfile
+++ b/pinpoint-collector/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -8,8 +8,6 @@ RUN mkdir -p /pinpoint/config \
 
 COPY /build/config/pinpoint-collector.properties /pinpoint/config/
 COPY /build/scripts/start-collector.sh /pinpoint/scripts/
-#temporary line for local test
-#COPY /pinpoint-collector-boot-2.4.2-SNAPSHOT.jar /pinpoint/pinpoint-collector-boot.jar
 
 RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-collector.sh \
diff --git a/pinpoint-collector/Dockerfile-metric b/pinpoint-collector/Dockerfile-metric
new file mode 100644
index 0000000..3030d50
--- /dev/null
+++ b/pinpoint-collector/Dockerfile-metric
@@ -0,0 +1,19 @@
+FROM openjdk:11.0.16-jre-slim-buster
+
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
+#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-${PINPOINT_VERSION}.jar
+ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-collector-starter-boot-2.5.0.jar
+
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts
+
+COPY /build/config/pinpoint-collector.properties /pinpoint/config/
+COPY /build/scripts/start-collector-metric.sh /pinpoint/scripts/
+
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+    && chmod a+x /pinpoint/scripts/start-collector-metric.sh \
+    && chmod a+x /pinpoint/config/pinpoint-collector.properties \
+    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-collector-boot.jar
+
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-collector-metric.sh"]
+
diff --git a/pinpoint-collector/Readme.md b/pinpoint-collector/Readme.md
index da4d44e..d9ea365 100644
--- a/pinpoint-collector/Readme.md
+++ b/pinpoint-collector/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Collector component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-collector/build/scripts/start-collector-metric.sh b/pinpoint-collector/build/scripts/start-collector-metric.sh
new file mode 100644
index 0000000..0282627
--- /dev/null
+++ b/pinpoint-collector/build/scripts/start-collector-metric.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+set -e
+set -x
+
+exec java -jar /pinpoint/pinpoint-collector-boot.jar --spring.config.additional-location=/pinpoint/config/pinpoint-collector.properties --pinpoint.collector.type=ALL
\ No newline at end of file
diff --git a/pinpoint-flink/.env b/pinpoint-flink/.env
index cc684c4..4fd848d 100644
--- a/pinpoint-flink/.env
+++ b/pinpoint-flink/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 
 ### Pinpoint-flink
 
diff --git a/pinpoint-flink/Dockerfile b/pinpoint-flink/Dockerfile
index 36ce463..99c04b5 100644
--- a/pinpoint-flink/Dockerfile
+++ b/pinpoint-flink/Dockerfile
@@ -1,5 +1,5 @@
 FROM flink:1.14-java11
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-flink-job-${PINPOINT_VERSION}.jar
 
 RUN apt-get update \
diff --git a/pinpoint-flink/Readme.md b/pinpoint-flink/Readme.md
index f468087..eb18c21 100644
--- a/pinpoint-flink/Readme.md
+++ b/pinpoint-flink/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Flink component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-hbase/.env b/pinpoint-hbase/.env
index 90379a4..84d75da 100644
--- a/pinpoint-hbase/.env
+++ b/pinpoint-hbase/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 
 ### Pinpoint-Hbase
 
diff --git a/pinpoint-hbase/Dockerfile b/pinpoint-hbase/Dockerfile
index c8a6102..86f50a0 100644
--- a/pinpoint-hbase/Dockerfile
+++ b/pinpoint-hbase/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8u342-slim
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.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 dbaed5c..5684f8c 100644
--- a/pinpoint-hbase/Readme.md
+++ b/pinpoint-hbase/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Hbase component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-mysql/.env b/pinpoint-mysql/.env
index 5d11351..dd897e5 100644
--- a/pinpoint-mysql/.env
+++ b/pinpoint-mysql/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 
 ### Pinpoint-mysql
 MYSQL_ROOT_PASSWORD=root123
diff --git a/pinpoint-mysql/Dockerfile b/pinpoint-mysql/Dockerfile
index 2aa79d6..23c44d1 100644
--- a/pinpoint-mysql/Dockerfile
+++ b/pinpoint-mysql/Dockerfile
@@ -1,6 +1,6 @@
 FROM mysql:8.0
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 
 RUN curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/CreateTableStatement-mysql.sql" -o /docker-entrypoint-initdb.d/CreateTableStatement-mysql.sql \
 	&& curl -SL "https://raw.githubusercontent.com/pinpoint-apm/pinpoint/v$PINPOINT_VERSION/web/src/main/resources/sql/SpringBatchJobRepositorySchema-mysql.sql" -o /docker-entrypoint-initdb.d/SpringBatchJobRepositorySchema-mysql.sql \
diff --git a/pinpoint-mysql/Readme.md b/pinpoint-mysql/Readme.md
index f553017..a77500a 100644
--- a/pinpoint-mysql/Readme.md
+++ b/pinpoint-mysql/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Mysql component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-quickstart/.env b/pinpoint-quickstart/.env
index 31d3b2f..d93e319 100644
--- a/pinpoint-quickstart/.env
+++ b/pinpoint-quickstart/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 ### Pinpoint-Agent
diff --git a/pinpoint-quickstart/Readme.md b/pinpoint-quickstart/Readme.md
index ce526e4..74d49e4 100644
--- a/pinpoint-quickstart/Readme.md
+++ b/pinpoint-quickstart/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Quickstart sample to test Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0
diff --git a/pinpoint-web/.env b/pinpoint-web/.env
index 444d518..0145aa4 100644
--- a/pinpoint-web/.env
+++ b/pinpoint-web/.env
@@ -1,4 +1,4 @@
-PINPOINT_VERSION=2.4.2
+PINPOINT_VERSION=2.5.0
 SPRING_PROFILES=release
 
 ### Pinpoint-Web
diff --git a/pinpoint-web/Dockerfile b/pinpoint-web/Dockerfile
index 260fe25..fba1d13 100644
--- a/pinpoint-web/Dockerfile
+++ b/pinpoint-web/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:11.0.16-jre-slim-buster
 
-ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.4.2}
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
 ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-boot-${PINPOINT_VERSION}.jar
 
 RUN mkdir -p /pinpoint/config \
@@ -8,8 +8,6 @@ RUN mkdir -p /pinpoint/config \
 
 COPY /build/config/pinpoint-web.properties /pinpoint/config/
 COPY /build/scripts/start-web.sh /pinpoint/scripts/
-#temporary line for local test
-#COPY /pinpoint-web-boot-2.4.2-SNAPSHOT.jar /pinpoint/pinpoint-web-boot.jar
 
 RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
     && chmod a+x /pinpoint/scripts/start-web.sh \
diff --git a/pinpoint-web/Dockerfile-metric b/pinpoint-web/Dockerfile-metric
new file mode 100644
index 0000000..8a0f491
--- /dev/null
+++ b/pinpoint-web/Dockerfile-metric
@@ -0,0 +1,19 @@
+FROM openjdk:11.0.16-jre-slim-buster
+
+ARG PINPOINT_VERSION=${PINPOINT_VERSION:-2.5.0}
+#ARG INSTALL_URL=https://github.com/pinpoint-apm/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-${PINPOINT_VERSION}.jar
+ARG INSTALL_URL=https://github.com/ga-ram/pinpoint/releases/download/v${PINPOINT_VERSION}/pinpoint-web-starter-boot-2.5.0.jar
+
+RUN mkdir -p /pinpoint/config \
+    && mkdir -p /pinpoint/scripts
+
+COPY /build/config/pinpoint-web.properties /pinpoint/config/
+COPY /build/scripts/start-web.sh /pinpoint/scripts/
+
+RUN apt-get update && apt-get install --no-install-recommends -y curl && apt-get clean \
+    && chmod a+x /pinpoint/scripts/start-web.sh \
+    && chmod a+x /pinpoint/config/pinpoint-web.properties \
+    && curl -SL ${INSTALL_URL} -o /pinpoint/pinpoint-web-boot.jar
+
+#entry point to start-web.sh for future use.
+ENTRYPOINT ["sh", "/pinpoint/scripts/start-web.sh"]
diff --git a/pinpoint-web/Readme.md b/pinpoint-web/Readme.md
index c52d2c1..035f2dd 100644
--- a/pinpoint-web/Readme.md
+++ b/pinpoint-web/Readme.md
@@ -4,6 +4,7 @@
 This Docker image contains the Pinpoint Web component of the Pinpoint application monitoring system.
 
 ## Supported Tags
+ - 2.5.0
  - 2.4.2
  - 2.4.1
  - 2.4.0