diff --git a/main/pom.xml b/main/pom.xml
index 05c3ac498..0de429787 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -24,8 +24,8 @@
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>everything</id>
-            <url>https://repo.citizensnpcs.co</url>
+            <id>citizens-repo</id> 
+            <url>https://maven.citizensnpcs.co/repo</url>
         </repository>
         <repository>
             <id>jitpack.io</id>
diff --git a/pom.xml b/pom.xml
index 0f6440d2f..1534d2f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,10 +15,17 @@
     <distributionManagement>
         <repository>
             <id>citizens-repo</id>
-            <url>https://repo2.citizensnpcs.co/repo</url>
+            <url>https://maven.citizensnpcs.co/repo</url>
         </repository>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>citizens-repo</id>
+            <url>https://maven.citizensnpcs.co/repo</url>
+        </repository>
+    </repositories>
+
     <build>
         <defaultGoal>clean package install</defaultGoal>
 
diff --git a/v1_10_R1/pom.xml b/v1_10_R1/pom.xml
index eb746c79b..2bcfdbd77 100644
--- a/v1_10_R1/pom.xml
+++ b/v1_10_R1/pom.xml
@@ -15,13 +15,6 @@
 		<craftbukkit.version>1.10.2-R0.1-SNAPSHOT</craftbukkit.version>
 	</properties>
 
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/v1_11_R1/pom.xml b/v1_11_R1/pom.xml
index 6ea09f694..192022a3c 100644
--- a/v1_11_R1/pom.xml
+++ b/v1_11_R1/pom.xml
@@ -13,14 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.11.2-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
+	</properties> 
 
 	<dependencies>
 		<dependency>
diff --git a/v1_12_R1/pom.xml b/v1_12_R1/pom.xml
index 83e099f12..3c35136c7 100644
--- a/v1_12_R1/pom.xml
+++ b/v1_12_R1/pom.xml
@@ -13,15 +13,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.12.2-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
-
+	</properties> 
+	
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/v1_13_R2/pom.xml b/v1_13_R2/pom.xml
index 4bb982597..77d59b921 100644
--- a/v1_13_R2/pom.xml
+++ b/v1_13_R2/pom.xml
@@ -13,15 +13,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.13.2-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
-
+	</properties> 
+	
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/v1_14_R1/pom.xml b/v1_14_R1/pom.xml
index 31a15061a..5ec8df91b 100644
--- a/v1_14_R1/pom.xml
+++ b/v1_14_R1/pom.xml
@@ -13,14 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.14.4-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
+	</properties> 
 
 	<dependencies>
 		<dependency>
diff --git a/v1_15_R1/pom.xml b/v1_15_R1/pom.xml
index fc6d774e5..e7a4876b7 100644
--- a/v1_15_R1/pom.xml
+++ b/v1_15_R1/pom.xml
@@ -11,14 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <craftbukkit.version>1.15.2-R0.1-SNAPSHOT</craftbukkit.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>everything</id>
-            <url>https://repo.citizensnpcs.co</url>
-        </repository>
-    </repositories>
+    </properties> 
 
     <dependencies>
         <dependency>
diff --git a/v1_16_R3/pom.xml b/v1_16_R3/pom.xml
index 19ba18d6f..b4adb23ea 100644
--- a/v1_16_R3/pom.xml
+++ b/v1_16_R3/pom.xml
@@ -11,14 +11,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <craftbukkit.version>1.16.5-R0.1-SNAPSHOT</craftbukkit.version>
-    </properties>
-
-    <repositories>
-        <repository>
-            <id>everything</id>
-            <url>https://repo.citizensnpcs.co</url>
-        </repository>
-    </repositories>
+    </properties> 
 
     <dependencies>
         <dependency>
diff --git a/v1_17_R1/pom.xml b/v1_17_R1/pom.xml
index 731a62eba..4f41df82c 100644
--- a/v1_17_R1/pom.xml
+++ b/v1_17_R1/pom.xml
@@ -13,14 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.17.1-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
+	</properties> 
 
 	<dependencies>
 		<dependency>
diff --git a/v1_18_R2/pom.xml b/v1_18_R2/pom.xml
index b200f6a52..25831e848 100644
--- a/v1_18_R2/pom.xml
+++ b/v1_18_R2/pom.xml
@@ -13,15 +13,8 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.18.2-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
-
+	</properties> 
+	
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/v1_19_R1/pom.xml b/v1_19_R1/pom.xml
index 071bba8de..5cf2bd8ea 100644
--- a/v1_19_R1/pom.xml
+++ b/v1_19_R1/pom.xml
@@ -13,13 +13,6 @@
         <craftbukkit.version>1.19.2-R0.1-SNAPSHOT</craftbukkit.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>everything</id>
-            <url>https://repo.citizensnpcs.co</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/v1_8_R3/pom.xml b/v1_8_R3/pom.xml
index bf5541ef4..34429591a 100644
--- a/v1_8_R3/pom.xml
+++ b/v1_8_R3/pom.xml
@@ -13,14 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>1.8.8-R0.1-SNAPSHOT</craftbukkit.version>
-	</properties>
-
-	<repositories>
-		<repository>
-			<id>everything</id>
-			<url>https://repo.citizensnpcs.co</url>
-		</repository>
-	</repositories>
+	</properties> 
 
 	<dependencies>
 		<dependency>