diff --git a/libraries/examples/browser-example-with-library/pom.xml b/libraries/examples/browser-example-with-library/pom.xml
index b6a1fb41340..3ec428bbb0b 100644
--- a/libraries/examples/browser-example-with-library/pom.xml
+++ b/libraries/examples/browser-example-with-library/pom.xml
@@ -116,7 +116,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_18}/bin/java</jvm>
+                    <jvm>${jdk_1_8}/bin/java</jvm>
                 </configuration>
             </plugin>
 
diff --git a/libraries/examples/browser-example/pom.xml b/libraries/examples/browser-example/pom.xml
index 3d87079571a..d0a44756a16 100644
--- a/libraries/examples/browser-example/pom.xml
+++ b/libraries/examples/browser-example/pom.xml
@@ -104,7 +104,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_18}/bin/java</jvm>
+                    <jvm>${jdk_1_8}/bin/java</jvm>
                 </configuration>
             </plugin>
 
diff --git a/libraries/examples/kotlin-java-example/pom.xml b/libraries/examples/kotlin-java-example/pom.xml
index a46aad011fa..68cf10873cc 100644
--- a/libraries/examples/kotlin-java-example/pom.xml
+++ b/libraries/examples/kotlin-java-example/pom.xml
@@ -42,7 +42,7 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <jvm>${env.JDK_18}/bin/java</jvm>
+                    <jvm>${jdk_1_8}/bin/java</jvm>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 94d1650db2d..cb1f15ab5c1 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -2,7 +2,6 @@
 <project
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
         xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.jetbrains.kotlin</groupId>
@@ -51,7 +50,7 @@
 
         <kotlin-dist>${project-root}/dist</kotlin-dist>
         <kotlin-sdk>${kotlin-dist}/kotlinc</kotlin-sdk>
-        <kotlin.compiler.jdkHome>${env.JDK_18}</kotlin.compiler.jdkHome>
+        <kotlin.compiler.jdkHome>${jdk_1_8}</kotlin.compiler.jdkHome>
 
         <maven.compiler.source>1.6</maven.compiler.source>
         <maven.compiler.target>1.6</maven.compiler.target>
@@ -252,6 +251,30 @@
     </build>
 
     <profiles>
+        <profile>
+            <id>jdk_1_8_new</id>
+            <activation>
+                <property>
+                    <name>env.JDK_1_8</name>
+                </property>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jdk_1_8>${env.JDK_1_8}</jdk_1_8>
+            </properties>
+        </profile>
+        <profile>
+            <id>jdk_1_8_old</id>
+            <activation>
+                <property>
+                    <name>!env.JDK_1_8</name>
+                </property>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <jdk_1_8>${env.JDK_18}</jdk_1_8>
+            </properties>
+        </profile>
         <profile>
             <id>sign-artifacts</id>
             <build>
diff --git a/libraries/tools/kotlin-annotation-processing-maven/pom.xml b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
index ba66e238172..6e2e43b3bf4 100755
--- a/libraries/tools/kotlin-annotation-processing-maven/pom.xml
+++ b/libraries/tools/kotlin-annotation-processing-maven/pom.xml
@@ -75,7 +75,7 @@
         <groupId>org.jetbrains.kotlin</groupId>
         <version>${project.version}</version>
         <configuration>
-          <jdkHome>${env.JDK_18}</jdkHome>
+          <jdkHome>${jdk_1_8}</jdkHome>
           <annotationPaths>
             <annotationPath>${basedir}/kotlinAnnotation</annotationPath>
           </annotationPaths>
@@ -130,7 +130,7 @@
         </file>
       </activation>
       <properties>
-        <toolsjar>${env.JDK_18}/lib/tools.jar</toolsjar>
+        <toolsjar>${jdk_1_8}/lib/tools.jar</toolsjar>
       </properties>
       <dependencies>
         <dependency>
diff --git a/libraries/tools/kotlin-maven-plugin-test/pom.xml b/libraries/tools/kotlin-maven-plugin-test/pom.xml
index 5d2677b3ae5..1e8c3c39a23 100644
--- a/libraries/tools/kotlin-maven-plugin-test/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin-test/pom.xml
@@ -82,7 +82,7 @@
                                     <goal>verify</goal>
                                 </goals>
                                 <configuration>
-                                    <jvm>${env.JDK_18}/bin/java</jvm>
+                                    <jvm>${jdk_1_8}/bin/java</jvm>
                                     <forkMode>once</forkMode>
                                     <systemProperties>
                                         <property>
diff --git a/libraries/tools/kotlin-maven-plugin/pom.xml b/libraries/tools/kotlin-maven-plugin/pom.xml
index 73800c4eab2..02d58cc1e3e 100644
--- a/libraries/tools/kotlin-maven-plugin/pom.xml
+++ b/libraries/tools/kotlin-maven-plugin/pom.xml
@@ -99,7 +99,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire-version}</version>
                 <configuration>
-                    <jvm>${env.JDK_18}/bin/java</jvm>
+                    <jvm>${jdk_1_8}/bin/java</jvm>
                 </configuration>
             </plugin>
         </plugins>