diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 1cc9ac00d8e..39fb9355f47 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 3.18.0-rc.1
+ENV RC_VERSION 3.18.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 723aed2d2bd..3bd5c8042dc 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -64355,6 +64355,39 @@
           ]
         }
       ]
+    },
+    "3.18.0-rc.2": {
+      "node_version": "12.22.1",
+      "npm_version": "6.14.1",
+      "apps_engine_version": "1.27.1",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0",
+        "4.2"
+      ],
+      "pull_requests": [
+        {
+          "pr": "23055",
+          "title": "[NEW] Banner for the updates regarding authentication services",
+          "userLogin": "g-thome",
+          "description": "Add a banner to inform admins about future authentication changes. This banner targets servers that use some sort of authentication service since they're the ones which this update concerns the most.",
+          "contributors": [
+            "g-thome",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "23048",
+          "title": "Regression: Logs were missing from Omnichannel callback methods",
+          "userLogin": "KevLehman",
+          "milestone": "3.18",
+          "contributors": [
+            "KevLehman",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index 819ed575152..d3731b4d7d7 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-curl -SLf "https://releases.rocket.chat/3.18.0-rc.1/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.18.0-rc.2/download/" -o rocket.chat.tgz
 
 tar xf rocket.chat.tgz --strip 1
 
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index a27f7750669..e1a6f0e8d7d 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
 # 5.  `snapcraft snap`
 
 name: rocketchat-server
-version: 3.18.0-rc.1
+version: 3.18.0-rc.2
 summary: Rocket.Chat server
 description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
 confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index adbde871596..7473b30e5b0 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,29 @@
 
 # 3.18.0 (Under Release Candidate Process)
 
+## 3.18.0-rc.2
+`2021-08-30  ·  1 🎉  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+
+- Banner for the updates regarding authentication services ([#23055](https://github.com/RocketChat/Rocket.Chat/pull/23055))
+
+  Add a banner to inform admins about future authentication changes. This banner targets servers that use some sort of authentication service since they're the ones which this update concerns the most.
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Logs were missing from Omnichannel callback methods ([#23048](https://github.com/RocketChat/Rocket.Chat/pull/23048))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@KevLehman](https://github.com/KevLehman)
+- [@g-thome](https://github.com/g-thome)
+
 ## 3.18.0-rc.1
 `2021-08-26  ·  1 🎉  ·  1 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 8319e3a49e8..14acd82369b 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.18.0-rc.1"
+	"version": "3.18.0-rc.2"
 }
diff --git a/package-lock.json b/package-lock.json
index 42fbca5c5ee..6f68f700f05 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "Rocket.Chat",
-  "version": "3.18.0-rc.1",
+  "version": "3.18.0-rc.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 1478b9ef810..6e5548c2abc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.18.0-rc.1",
+	"version": "3.18.0-rc.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"