diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3599738c..690cbb93 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ There are several ways you can contribute to Pumpkin:
 
 ### Docs
 
-The Documentation of Pumpkin can be found at <https://snowiiii.github.io/Pumpkin/>
+The Documentation of Pumpkin can be found at <https://pumpkinmc.org/>
 
 **Tip: [typos](https://github.com/crate-ci/typos) is a great Project to detect and automatically fix typos
 
diff --git a/Dockerfile b/Dockerfile
index 7fc54425..05edc4d0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ RUN strip pumpkin.release
 FROM alpine:3.21
 
 # Identifying information for registries like ghcr.io
-LABEL org.opencontainers.image.source=https://github.com/Snowiiii/Pumpkin
+LABEL org.opencontainers.image.source=https://github.com/Pumpkin-MC/Pumpkin
 
 RUN apk add --no-cache libgcc
 
diff --git a/README.md b/README.md
index e6259515..5245514c 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 </div>
 
-[Pumpkin](https://snowiiii.github.io/Pumpkin-Website/) is a Minecraft server built entirely in Rust, offering a fast, efficient,
+[Pumpkin](https://pumpkinmc.org/) is a Minecraft server built entirely in Rust, offering a fast, efficient,
 and customizable experience. It prioritizes performance and player enjoyment while adhering to the core mechanics of the game.
 
 ![image](https://github.com/user-attachments/assets/7e2e865e-b150-4675-a2d5-b52f9900378e)
@@ -88,7 +88,7 @@ Check out our [Github Project](https://github.com/users/Snowiiii/projects/12/vie
 
 ## How to run
 
-See our [Quick Start](https://snowiiii.github.io/Pumpkin-Website/about/quick-start.html) Guide to get Pumpkin running
+See our [Quick Start](https://pumpkinmc.org/about/quick-start.html) Guide to get Pumpkin running
 
 ## Contributions
 
@@ -96,7 +96,7 @@ Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Docs
 
-The Documentation of Pumpkin can be found at https://snowiiii.github.io/Pumpkin-Website/
+The Documentation of Pumpkin can be found at https://pumpkinmc.org/
 
 ## Communication
 
diff --git a/pumpkin-config/src/server_links.rs b/pumpkin-config/src/server_links.rs
index a9cf9627..cb8a9b3a 100644
--- a/pumpkin-config/src/server_links.rs
+++ b/pumpkin-config/src/server_links.rs
@@ -21,7 +21,7 @@ impl Default for ServerLinksConfig {
     fn default() -> Self {
         Self {
             enabled: true,
-            bug_report: "https://github.com/Snowiiii/Pumpkin/issues".to_string(),
+            bug_report: "https://github.com/Pumpkin-MC/Pumpkin/issues".to_string(),
             support: "".to_string(),
             status: "".to_string(),
             feedback: "".to_string(),
diff --git a/pumpkin/src/command/commands/cmd_pumpkin.rs b/pumpkin/src/command/commands/cmd_pumpkin.rs
index a76a1be9..ea807966 100644
--- a/pumpkin/src/command/commands/cmd_pumpkin.rs
+++ b/pumpkin/src/command/commands/cmd_pumpkin.rs
@@ -61,11 +61,11 @@ impl CommandExecutor for PumpkinExecutor {
                         .color_named(NamedColor::Gold),
                     )
                     .add_child(TextComponent::text(" "))
-                    // https://snowiiii.github.io/Pumpkin/
+                    // https://pumpkinmc.org/
                     .add_child(
                         TextComponent::text("Github Repository")
                             .click_event(ClickEvent::OpenUrl(Cow::from(
-                                "https://github.com/Snowiiii/Pumpkin",
+                                "https://github.com/Pumpkin-MC/Pumpkin",
                             )))
                             .hover_event(HoverEvent::ShowText(Cow::from(
                                 "Click to open repository.",
@@ -77,11 +77,9 @@ impl CommandExecutor for PumpkinExecutor {
                     // Added docs. and a space for spacing
                     .add_child(TextComponent::text(" "))
                     .add_child(
-                        TextComponent::text("Docs")
-                            .click_event(ClickEvent::OpenUrl(Cow::from(
-                                "https://snowiiii.github.io/Pumpkin/",
-                            )))
-                            .hover_event(HoverEvent::ShowText(Cow::from("Click to open docs.")))
+                        TextComponent::text("Website")
+                            .click_event(ClickEvent::OpenUrl(Cow::from("https://pumpkinmc.org/")))
+                            .hover_event(HoverEvent::ShowText(Cow::from("Click to open website.")))
                             .color_named(NamedColor::Blue)
                             .bold()
                             .underlined(),
diff --git a/pumpkin/src/main.rs b/pumpkin/src/main.rs
index d0dbe401..3dec495f 100644
--- a/pumpkin/src/main.rs
+++ b/pumpkin/src/main.rs
@@ -142,7 +142,7 @@ async fn main() {
     );
 
     log::warn!("Pumpkin is currently under heavy development!");
-    log::info!("Report Issues on https://github.com/Snowiiii/Pumpkin/issues");
+    log::info!("Report Issues on https://github.com/Pumpkin-MC/Pumpkin/issues");
     log::info!("Join our Discord for community support https://discord.com/invite/wT8XjrjKkf");
 
     tokio::spawn(async {
diff --git a/pumpkin/src/net/authentication.rs b/pumpkin/src/net/authentication.rs
index 4136a74a..0069228e 100644
--- a/pumpkin/src/net/authentication.rs
+++ b/pumpkin/src/net/authentication.rs
@@ -43,7 +43,7 @@ const MOJANG_PREVENT_PROXY_AUTHENTICATION_URL: &str = "https://sessionserver.moj
 /// 2. Mojang's servers verify the client's credentials and add the player to the their Servers
 /// 3. Now our server will send a Request to the Session servers and check if the Player has joined the Session Server .
 ///
-/// See <https://snowiiii.github.io/Pumpkin-Website/developer/authentication.html>
+/// See <https://pumpkinmc.org/developer/authentication.html>
 pub async fn authenticate(
     username: &str,
     server_hash: &str,