diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 0cc7c068..ffb1c533 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -27,7 +27,7 @@ jobs:
         dotnet-version: 9.0.x
 
     - name: Setup DocFX
-      run: dotnet tool install -g docfx --version 2.78.2
+      run: dotnet tool install -g docfx --version 2.78.3
 
     - name: Build DNet docs
       run: docfx docs/docfx.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24cd3cf9..01c17d90 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.18.0-beta.1] - 2025-05-08
+
+### Added
+- #3065 Components V2 (ba78e0c)
+- #3110 CV2 Find component by id (cc81669)
+
+### Fixed
+- #3106 Providing multiple message flags fails to pass validations (05a0acc)
+- #3114 Fix NRE responding with a modal info class with null required fields (2b6a912)
+
+### Misc
+- #3107 update component limits + add `ComponentCount()` extension (348928a)
+
+
 ## [3.17.4] - 2025-04-26
 
 ### Fixed
diff --git a/Discord.Net.targets b/Discord.Net.targets
index d38d20c1..7f9836d4 100644
--- a/Discord.Net.targets
+++ b/Discord.Net.targets
@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>3.17.4</VersionPrefix>
+        <VersionPrefix>3.18.0</VersionPrefix>
         <LangVersion>latest</LangVersion>
         <Authors>Discord.Net Contributors</Authors>
         <PackageTags>discord;discordapp</PackageTags>
diff --git a/docs/README.md b/docs/README.md
index 493bdbe0..d52550c6 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -4,7 +4,7 @@ The documentation for the Discord.Net library uses [DocFX][docfx-main].
 Instructions for installing this tool can be found [here][docfx-installing].
 
 > [!IMPORTANT]
-> You must use DocFX version **2.77.0** for everything to work correctly.
+> You must use DocFX version **2.78.3** for everything to work correctly.
 
 1. Navigate to the root of the repository.
 2. Build the docs using `docfx docs/docfx.json`. Add the `--serve`
diff --git a/docs/docfx.json b/docs/docfx.json
index 93108f97..a648ecf0 100644
--- a/docs/docfx.json
+++ b/docs/docfx.json
@@ -59,7 +59,7 @@
     "globalMetadata": {
       "_appTitle": "Discord.Net Documentation",
       "_appName": "Discord.Net",
-      "_appFooter": "Discord.Net © 2015-2025 3.17.4",
+      "_appFooter": "Discord.Net © 2015-2025 3.18.0",
       "_enableSearch": true,
       "_appLogoPath": "marketing/logo/SVG/Logomark Purple.svg",
       "_appFaviconPath": "favicon.png"
diff --git a/src/Discord.Net/Discord.Net.nuspec b/src/Discord.Net/Discord.Net.nuspec
index ea1534e9..f0991514 100644
--- a/src/Discord.Net/Discord.Net.nuspec
+++ b/src/Discord.Net/Discord.Net.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Discord.Net</id>
-    <version>3.17.4$suffix$</version>
+    <version>3.18.0$suffix$</version>
     <title>Discord.Net</title>
     <authors>Discord.Net Contributors</authors>
     <owners>foxbot</owners>
@@ -15,60 +15,60 @@
     <readme>NUGET_README.md</readme>
     <dependencies>
         <group targetFramework="net9.0">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="net8.0">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="net6.0">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="net5.0">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="net461">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="netstandard2.0">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
         <group targetFramework="netstandard2.1">
-            <dependency id="Discord.Net.Core" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Rest" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.WebSocket" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Commands" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Webhook" version="3.17.4$suffix$" />
-            <dependency id="Discord.Net.Interactions" version="3.17.4$suffix$" />
+            <dependency id="Discord.Net.Core" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Rest" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.WebSocket" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Commands" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Webhook" version="3.18.0$suffix$" />
+            <dependency id="Discord.Net.Interactions" version="3.18.0$suffix$" />
         </group>
     </dependencies>
   </metadata>