diff --git a/agent/src/assembly/component/core.xml b/agent/src/assembly/component/core.xml
index b34a1fd947e8..47ebb623476d 100644
--- a/agent/src/assembly/component/core.xml
+++ b/agent/src/assembly/component/core.xml
@@ -45,7 +45,6 @@
                 <include>com.navercorp.pinpoint:pinpoint-annotations</include>
                 <include>com.navercorp.pinpoint:pinpoint-commons</include>
                 <include>com.navercorp.pinpoint:pinpoint-bootstrap-core</include>
-                <include>com.navercorp.pinpoint:pinpoint-bootstrap-java8</include>
                 <include>com.navercorp.pinpoint:pinpoint-bootstrap-java9</include>
                 <include>com.navercorp.pinpoint:pinpoint-bootstrap-java9-internal</include>
             </includes>
@@ -57,7 +56,6 @@
                 <exclude>com.navercorp.pinpoint:pinpoint-commons</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-bootstrap</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-bootstrap-core</exclude>
-                <exclude>com.navercorp.pinpoint:pinpoint-bootstrap-java8</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-bootstrap-java9</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-bootstrap-java9-internal</exclude>
                 <exclude>com.navercorp.pinpoint:pinpoint-profiler-test</exclude>
diff --git a/bootstraps/bootstrap-java8/src/main/java/com/navercorp/pinpoint/bootstrap/java8/lambda/UnsafeDelegatorJava8.java b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/lambda/UnsafeDelegatorJava8.java
similarity index 97%
rename from bootstraps/bootstrap-java8/src/main/java/com/navercorp/pinpoint/bootstrap/java8/lambda/UnsafeDelegatorJava8.java
rename to bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/lambda/UnsafeDelegatorJava8.java
index 4c2fb1529dad..4e31e1e14636 100644
--- a/bootstraps/bootstrap-java8/src/main/java/com/navercorp/pinpoint/bootstrap/java8/lambda/UnsafeDelegatorJava8.java
+++ b/bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/lambda/UnsafeDelegatorJava8.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.navercorp.pinpoint.bootstrap.java8.lambda;
+package com.navercorp.pinpoint.bootstrap.lambda;
 
 import com.navercorp.pinpoint.bootstrap.instrument.lambda.LambdaBytecodeHandler;
 import sun.misc.Unsafe;
diff --git a/bootstraps/bootstrap-java8/pom.xml b/bootstraps/bootstrap-java8/pom.xml
deleted file mode 100644
index 218ab50a8495..000000000000
--- a/bootstraps/bootstrap-java8/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.navercorp.pinpoint</groupId>
-        <artifactId>pinpoint</artifactId>
-        <relativePath>../../pom.xml</relativePath>
-        <version>2.5.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>pinpoint-bootstrap-java8</artifactId>
-    <packaging>jar</packaging>
-
-    <properties>
-        <jdk.version>1.8</jdk.version>
-        <jdk.home>${env.JAVA_8_HOME}</jdk.home>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.navercorp.pinpoint</groupId>
-            <artifactId>pinpoint-bootstrap-core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/bootstraps/pom.xml b/bootstraps/pom.xml
index c4f92d2751e2..64984e593f4a 100644
--- a/bootstraps/pom.xml
+++ b/bootstraps/pom.xml
@@ -30,7 +30,6 @@
     <modules>
         <module>bootstrap</module>
         <module>bootstrap-core</module>
-        <module>bootstrap-java8</module>
         <module>bootstrap-java9</module>
         <module>bootstrap-java9-internal</module>
     </modules>
diff --git a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava8.java b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava8.java
index 56d15463bb90..34994bb2d2ff 100644
--- a/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava8.java
+++ b/profiler/src/main/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaClassJava8.java
@@ -21,7 +21,7 @@
  */
 public class LambdaClassJava8 implements LambdaClass {
 
-    public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/java8/lambda/UnsafeDelegatorJava8";
+    public static final String DELEGATE_CLASS = "com/navercorp/pinpoint/bootstrap/lambda/UnsafeDelegatorJava8";
 
     @Override
     public String getUnsafeClass() {