diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index 7a4eec679e..68aa4cd2e5 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -25,6 +25,7 @@
         <module>spring-cloud-ribbon-client</module>
         <module>spring-cloud-zookeeper</module>
         <module>spring-cloud-gateway</module>
+        <module>spring-cloud-gateway-2</module>
         <module>spring-cloud-stream</module>
         <module>spring-cloud-stream-starters</module>
         <module>spring-cloud-connectors-heroku</module>
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/README.md b/spring-cloud-modules/spring-cloud-gateway-2/README.md
new file mode 100644
index 0000000000..578bfc623e
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-gateway-2/README.md
@@ -0,0 +1,7 @@
+## Spring Cloud Gateway 2
+
+This module contains additional articles about Spring Cloud Gateway.
+
+### Relevant Articles:
+
+- [Rate Limiting With Client IP in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-rate-limit-by-client-ip)
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/pom.xml b/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
new file mode 100644
index 0000000000..22182e8c78
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-gateway-2/pom.xml
@@ -0,0 +1,124 @@
+<?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>spring-cloud-gateway-2</artifactId>
+    <name>spring-cloud-gateway-2</name>
+    <packaging>jar</packaging>
+
+    <parent>
+        <groupId>com.baeldung.spring.cloud</groupId>
+        <artifactId>spring-cloud-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud-dependencies.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
+        </dependency>
+        <!-- Redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis-reactive</artifactId>
+        </dependency>
+        <!-- Embedded Redis -->
+        <dependency>
+            <groupId>it.ozimov</groupId>
+            <artifactId>embedded-redis</artifactId>
+            <version>${redis.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator-cdi</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- Spring security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-oauth2-client</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
+        <redis.version>0.7.2</redis.version>
+        <oauth2-oidc-sdk.version>9.19</oauth2-oidc-sdk.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/GatewayApplication b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/GatewayApplication
new file mode 100644
index 0000000000..53b2629dd0
--- /dev/null
+++ b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/GatewayApplication
@@ -0,0 +1,14 @@
+package com.baeldung.springcloudgateway;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+public class GatewayApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(GatewayApplication.class, args);
+    }
+
+}
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/IpAddressApplication.java b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/IpAddressApplication.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/IpAddressApplication.java
rename to spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/IpAddressApplication.java
diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java
rename to spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/ProxiedClientAddressResolver.java
diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/SimpleClientAddressResolver.java b/spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/SimpleClientAddressResolver.java
similarity index 100%
rename from spring-cloud-modules/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/ipaddress/SimpleClientAddressResolver.java
rename to spring-cloud-modules/spring-cloud-gateway-2/src/main/java/com/baeldung/springcloudgateway/ipaddress/SimpleClientAddressResolver.java
diff --git a/spring-cloud-modules/spring-cloud-gateway/src/main/resources/ipaddress-application.properties b/spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/ipaddress-application.properties
similarity index 100%
rename from spring-cloud-modules/spring-cloud-gateway/src/main/resources/ipaddress-application.properties
rename to spring-cloud-modules/spring-cloud-gateway-2/src/main/resources/ipaddress-application.properties
diff --git a/spring-cloud-modules/spring-cloud-gateway/README.md b/spring-cloud-modules/spring-cloud-gateway/README.md
index 3d6d70f8a2..80315040c9 100644
--- a/spring-cloud-modules/spring-cloud-gateway/README.md
+++ b/spring-cloud-modules/spring-cloud-gateway/README.md
@@ -11,4 +11,3 @@ This module contains articles about Spring Cloud Gateway
 - [Using Spring Cloud Gateway with OAuth 2.0 Patterns](https://www.baeldung.com/spring-cloud-gateway-oauth2)
 - [URL Rewriting With Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-url-rewriting)
 - [Processing the Response Body in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-response-body)
-- [Rate Limiting With Client IP in Spring Cloud Gateway](https://www.baeldung.com/spring-cloud-gateway-rate-limit-by-client-ip)