diff --git a/creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java b/creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java
index 7c7c828..6f15707 100644
--- a/creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java
+++ b/creator-tools/src/main/java/com/skcraft/launcher/creator/Creator.java
@@ -35,8 +35,6 @@
         this.dataDir = getAppDataDir();
         this.config = Persistence.load(new File(dataDir, "config.json"), CreatorConfig.class);
 
-        System.setProperty("com.skcraft.builder.ignoreURLOverrides", "true");
-
         // Remove deleted workspaces
         List<RecentEntry> recentEntries = config.getRecentEntries();
         Iterator<RecentEntry> it = recentEntries.iterator();
diff --git a/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java b/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
index f7a1054..be8e9dc 100644
--- a/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
+++ b/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/PackManagerController.java
@@ -748,7 +748,7 @@
 
         String version = generateVersionFromDate();
 
-        PackBuilder builder = new PackBuilder(pack, webRoot, version, "staging.json", false);
+        PackBuilder builder = new PackBuilder(pack, webRoot, version, "staging.json", false, false);
         InstanceList.Enumerator enumerator = launcher.getInstances().createEnumerator();
         TestLauncher instanceLauncher = new TestLauncher(launcher, frame, pack.getCachedConfig().getName(), session);
 
@@ -773,7 +773,7 @@
 
         if (options != null) {
             ConsoleFrame.showMessages();
-            PackBuilder builder = new PackBuilder(pack, options.getDestDir(), options.getVersion(), options.getManifestFilename(), false);
+            PackBuilder builder = new PackBuilder(pack, options.getDestDir(), options.getVersion(), options.getManifestFilename(), false, true);
             Deferred<?> deferred = Deferreds.makeDeferred(executor.submit(builder), executor)
                     .handleAsync(result -> {
                         ConsoleFrame.hideMessages();
diff --git a/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java b/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
index bf33fe2..365bf0d 100644
--- a/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
+++ b/creator-tools/src/main/java/com/skcraft/launcher/creator/controller/task/PackBuilder.java
@@ -25,13 +25,15 @@
     private final String version;
     private final String manifestFilename;
     private final boolean clean;
+    private final boolean downloadUrls;
 
-    public PackBuilder(Pack pack, File outputDir, String version, String manifestFilename, boolean clean) {
+    public PackBuilder(Pack pack, File outputDir, String version, String manifestFilename, boolean clean, boolean downloadUrls) {
         this.pack = pack;
         this.outputDir = outputDir;
         this.version = version;
         this.manifestFilename = manifestFilename;
         this.clean = clean;
+        this.downloadUrls = downloadUrls;
     }
 
     @Override
@@ -54,6 +56,7 @@
         //noinspection ResultOfMethodCallIgnored
         outputDir.mkdirs();
 
+        System.setProperty("com.skcraft.builder.ignoreURLOverrides", downloadUrls ? "false" : "true");
         String[] args = {
                 "--version", version,
                 "--manifest-dest", new File(outputDir, manifestFilename).getAbsolutePath(),