diff --git a/cr-destsol/build.gradle.kts b/cr-destsol/build.gradle.kts
index 0b4ceb0..5ddc761 100644
--- a/cr-destsol/build.gradle.kts
+++ b/cr-destsol/build.gradle.kts
@@ -8,6 +8,31 @@ plugins {
     idea
 }
 
+// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
+repositories {
+    mavenCentral {
+        content {
+            // This is first choice for most java dependencies, but assume we'll need to check our
+            // own repository for things from our own organization.
+            // (This is an optimization so gradle doesn't try to find our hundreds of modules in 3rd party repos)
+            excludeGroupByRegex("org.terasology(..+)?")
+        }
+    }
+    // JBoss Maven Repository requried to fetch `org.jpastebin` dependency for CrashReporter
+    // https://developer.jboss.org/docs/DOC-11377
+    maven {
+        name = "JBoss Public Maven Repository Group"
+        url = uri("https://repository.jboss.org/nexus/content/repositories/public/")
+        content {
+            includeModule("org", "jpastebin")
+        }
+    }
+    maven {
+        name = "Terasology Artifactory"
+        url = uri("https://artifactory.terasology.io/artifactory/virtual-repo-live")
+    }
+}
+
 dependencies {
     api(project(":cr-core"))
 }
diff --git a/cr-terasology/build.gradle.kts b/cr-terasology/build.gradle.kts
index dce1c43..904ba3f 100644
--- a/cr-terasology/build.gradle.kts
+++ b/cr-terasology/build.gradle.kts
@@ -8,15 +8,28 @@ plugins {
     idea
 }
 
+// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
 repositories {
-    maven {
-        name = "Terasology Artifactory"
-        url = uri("https://artifactory.terasology.io/artifactory/virtual-repo-live")
+    mavenCentral {
+        content {
+            // This is first choice for most java dependencies, but assume we'll need to check our
+            // own repository for things from our own organization.
+            // (This is an optimization so gradle doesn't try to find our hundreds of modules in 3rd party repos)
+            excludeGroupByRegex("org.terasology(..+)?")
+        }
     }
-    mavenCentral()
+    // JBoss Maven Repository requried to fetch `org.jpastebin` dependency for CrashReporter
+    // https://developer.jboss.org/docs/DOC-11377
     maven {
         name = "JBoss Public Maven Repository Group"
         url = uri("https://repository.jboss.org/nexus/content/repositories/public/")
+        content {
+            includeModule("org", "jpastebin")
+        }
+    }
+    maven {
+        name = "Terasology Artifactory"
+        url = uri("https://artifactory.terasology.io/artifactory/virtual-repo-live")
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index ac1fcd9..fe20b25 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,17 +1,6 @@
 // Copyright 2021 The Terasology Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-// Check to see if CR is embedded within Terasology, if so use nested paths
-println("rootProject for CrashReporter is: " + rootProject.name)
-
-if (rootProject.name == "Terasology") {
-    println("CrashReporter is embedded within Terasology, using nested paths")
-    include(":libs:CrashReporter:cr-core")
-    include(":libs:CrashReporter:cr-destsol")
-    include(":libs:CrashReporter:cr-terasology")
-} else {
-    println("CrashReporter is running standalone so using simple paths for includes")
-    include("cr-core")
-    include("cr-destsol")
-    include("cr-terasology")
-}
+include("cr-core")
+include("cr-destsol")
+include("cr-terasology")