diff --git a/lua/gmod_integration/server/sv__websocket.lua b/lua/gmod_integration/server/sv__websocket.lua
index 5a5ddb9..02f17b9 100644
--- a/lua/gmod_integration/server/sv__websocket.lua
+++ b/lua/gmod_integration/server/sv__websocket.lua
@@ -1,6 +1,3 @@
-local websocketFQDN = "ws.gmod-integration.com"
-local websocketDevFQDN = "dev-ws.gmod-integration.com"
-
 //
 // WebSocket
 //
@@ -33,7 +30,7 @@ if (!GWSockets) then
 end
 
 local function getWebSocketURL()
-    return "wss://" .. (gmInte.config.devInstance and websocketDevFQDN or websocketFQDN)
+    return "wss://" .. gmInte.config.websocketFQDN
 end
 
 local socket = GWSockets.createWebSocket(getWebSocketURL())
diff --git a/lua/gmod_integration/server/sv_settings.lua b/lua/gmod_integration/server/sv_settings.lua
index 6f7f9aa..d8aed59 100644
--- a/lua/gmod_integration/server/sv_settings.lua
+++ b/lua/gmod_integration/server/sv_settings.lua
@@ -57,7 +57,8 @@ function gmInte.publicGetConfig(ply)
 
     gmInte.SendNet("publicConfig", {
         ["debug"] = gmInte.config.debug,
-        ["devInstance"] = gmInte.config.devInstance
+        ["apiFQDN"] = gmInte.config.apiFQDN,
+        ["websocketFQDN"] = gmInte.config.websocketFQDN,
     }, ply)
 end
 
diff --git a/lua/gmod_integration/shared/sh_http.lua b/lua/gmod_integration/shared/sh_http.lua
index 94855de..8a7918e 100644
--- a/lua/gmod_integration/shared/sh_http.lua
+++ b/lua/gmod_integration/shared/sh_http.lua
@@ -1,7 +1,4 @@
 local apiVersion = "v3"
-local apiFQDN = "api.gmod-integration.com"
-local apiDevFQDN = "dev-api.gmod-integration.com"
-
 gmInte.http = gmInte.http || {}
 
 //
@@ -9,7 +6,7 @@ gmInte.http = gmInte.http || {}
 //
 
 local function getAPIURL(endpoint)
-    local url = "https://" .. (gmInte.config.devInstance && apiDevFQDN || apiFQDN) .. "/" .. apiVersion
+    local url = "https://" .. gmInte.config.apiFQDN .. "/" .. apiVersion
 
     if (SERVER) then
         url = url .. "/servers/" .. gmInte.config.id
@@ -58,7 +55,7 @@ function gmInte.http.requestAPI(params)
     local type = "application/json"
 
     // Log
-    if (gmInte.config.devInstance) then gmInte.log("HTTP Using dev Instance", true) end
+    gmInte.log("HTTP FQDN: " .. gmInte.config.apiFQDN, true)
     gmInte.log("HTTP Request ID: " .. requestID, true)
     gmInte.log("HTTP Request: " .. method .. " " .. url, true)
     gmInte.log("HTTP Body: " .. (showableBody && body || "HIDDEN"), true)
@@ -76,11 +73,6 @@ function gmInte.http.requestAPI(params)
             gmInte.log("HTTP Response: " .. code, true)
             if (gmInte.config.debug) then gmInte.log("HTTP Body: " .. body, true) end
 
-            // if not 2xx return failed
-            if (code < 200 || code >= 300) then
-                return failed(body, code, headers)
-            end
-
             // if not application/json return failed
             if (string.sub(headers["Content-Type"], 1, 16) != "application/json") then
                 gmInte.log("HTTP Failed: Invalid Content-Type", true)
@@ -90,6 +82,11 @@ function gmInte.http.requestAPI(params)
             // Parse body
             body = util.JSONToTable(body || "{}")
 
+            // if not 2xx return failed
+            if (code < 200 || code >= 300) then
+                return failed(code, body, headers)
+            end
+
             // Return success
             return success(code, body)
         end,