diff --git a/core-java-modules/core-java-lang-6/Dockerfile b/core-java-modules/core-java-lang-7/Dockerfile
similarity index 100%
rename from core-java-modules/core-java-lang-6/Dockerfile
rename to core-java-modules/core-java-lang-7/Dockerfile
diff --git a/core-java-modules/core-java-lang-7/README.md b/core-java-modules/core-java-lang-7/README.md
new file mode 100644
index 0000000000..7874da33ce
--- /dev/null
+++ b/core-java-modules/core-java-lang-7/README.md
@@ -0,0 +1,7 @@
+## Core Java Lang (Part 7)
+
+This module contains articles about core features in the Java language
+
+### Relevant Articles:
+
+- [Set an Environment Variable at Runtime in Java](https://www.baeldung.com/java-set-environment-variable-runtime)
diff --git a/core-java-modules/core-java-lang-6/docker-pom.xml b/core-java-modules/core-java-lang-7/docker-pom.xml
similarity index 100%
rename from core-java-modules/core-java-lang-6/docker-pom.xml
rename to core-java-modules/core-java-lang-7/docker-pom.xml
diff --git a/core-java-modules/core-java-lang-7/pom.xml b/core-java-modules/core-java-lang-7/pom.xml
new file mode 100644
index 0000000000..577e36f7c4
--- /dev/null
+++ b/core-java-modules/core-java-lang-7/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    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>
+    <artifactId>core-java-lang-6</artifactId>
+
+    <parent>
+        <groupId>com.baeldung.core-java-modules</groupId>
+        <artifactId>core-java-modules</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit-pioneer</groupId>
+            <artifactId>junit-pioneer</artifactId>
+            <version>${junit.pioneer.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${testcontaienr.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${testcontaienr.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <!-- https://mvnrepository.com/artifact/org.mapstruct/mapstruct-processor -->
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.openjdk.jmh</groupId>
+                            <artifactId>jmh-generator-annprocess</artifactId>
+                            <version>${jmh.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <source>14</source>
+                    <target>14</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <junit.pioneer.version>2.2.0</junit.pioneer.version>
+        <testcontaienr.version>1.19.3</testcontaienr.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingChildProcessEnvironmentVariableUnitTest.java b/core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingChildProcessEnvironmentVariableUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingChildProcessEnvironmentVariableUnitTest.java
rename to core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingChildProcessEnvironmentVariableUnitTest.java
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingDockerEnvironmentVariableUnitTest.java b/core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingDockerEnvironmentVariableUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingDockerEnvironmentVariableUnitTest.java
rename to core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingDockerEnvironmentVariableUnitTest.java
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingSameProcessEnvironmentVariableUnitTest.java b/core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingSameProcessEnvironmentVariableUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingSameProcessEnvironmentVariableUnitTest.java
rename to core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingSameProcessEnvironmentVariableUnitTest.java
diff --git a/core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingTestcontainerVariableUnitTest.java b/core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingTestcontainerVariableUnitTest.java
similarity index 100%
rename from core-java-modules/core-java-lang-6/src/test/java/com/baeldung/setenvironment/SettingTestcontainerVariableUnitTest.java
rename to core-java-modules/core-java-lang-7/src/test/java/com/baeldung/setenvironment/SettingTestcontainerVariableUnitTest.java