diff --git a/server/private/lib/traefik/getTraefikConfig.ts b/server/private/lib/traefik/getTraefikConfig.ts
index 5def19865..132bb95bc 100644
--- a/server/private/lib/traefik/getTraefikConfig.ts
+++ b/server/private/lib/traefik/getTraefikConfig.ts
@@ -705,7 +705,7 @@ export async function getTraefikConfig(
                             resource.ssl ? entrypointHttps : entrypointHttp
                         ],
                         service: maintenanceServiceName,
-                        rule: `${rule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`))`,
+                        rule: `${rule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`)) `,
                         priority: 2001,
                         ...(resource.ssl ? { tls } : {})
                     };
@@ -1190,8 +1190,7 @@ export async function getTraefikConfig(
             loadBalancer: {
                 servers: [
                     {
-                        // url: `http://${internalHost}:${internalPort}`
-                        url: `https://owen-devel.hostlocal.app`
+                        url: `http://${internalHost}:${internalPort}`
                     }
                 ]
             }
@@ -1204,7 +1203,7 @@ export async function getTraefikConfig(
             entryPoints: [entrypoint],
             middlewares: routerMiddlewares,
             service: bgUiServiceName,
-            rule: `${hostRule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`))`,
+            rule: `${hostRule} && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
             priority: 101,
             ...(bgResource.ssl ? { tls } : {})
         };
@@ -1336,7 +1335,7 @@ export async function getTraefikConfig(
             config_output.http.routers[`${siteResourceRouterName}-assets`] = {
                 entryPoints: [config.getRawConfig().traefik.https_entrypoint],
                 service: siteResourceServiceName,
-                rule: `Host(\`${fullDomain}\`) && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`))`,
+                rule: `Host(\`${fullDomain}\`) && (PathPrefix(\`/_next\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
                 priority: 101,
                 tls
             };
@@ -1439,7 +1438,7 @@ export async function getTraefikConfig(
                         config.getRawConfig().traefik.https_entrypoint
                     ],
                     service: "landing-service",
-                    rule: `Host(\`${fullDomain}\`) && (PathRegexp(\`^/auth/resource/[^/]+$\`) || PathRegexp(\`^/auth/idp/[0-9]+/oidc/callback\`) || PathPrefix(\`/_next\`) || Path(\`/auth/org\`) || PathRegexp(\`^/__nextjs*\`))`,
+                    rule: `Host(\`${fullDomain}\`) && (PathRegexp(\`^/auth/resource/[^/]+$\`) || PathRegexp(\`^/auth/idp/[0-9]+/oidc/callback\`) || PathPrefix(\`/_next\`) || Path(\`/auth/org\`) || PathRegexp(\`^/__nextjs*\`) || Path(\`/favicon.ico\`))`,
                     priority: 203,
                     tls: tls
                 };
diff --git a/src/app/favicon.ico b/src/app/favicon.ico
new file mode 100644
index 000000000..bcaab339d
Binary files /dev/null and b/src/app/favicon.ico differ
diff --git a/src/app/rdp/RdpClient.tsx b/src/app/rdp/RdpClient.tsx
index 15ca74f9e..cedcd5282 100644
--- a/src/app/rdp/RdpClient.tsx
+++ b/src/app/rdp/RdpClient.tsx
@@ -35,7 +35,6 @@ declare module "react" {
 type FormState = {
     username: string;
     password: string;
-    gatewayAddress: string;
     hostname: string;
     domain: string;
     authtoken: string;
@@ -59,7 +58,6 @@ export default function RdpClient() {
     const [form, setForm] = useState<FormState>({
         username: "Administrator",
         password: "Password123!",
-        gatewayAddress: "ws://localhost:8082/rdp",
         hostname: "172.31.3.58:3389",
         domain: "",
         authtoken: "pangolin-browser-gateway-dev",
@@ -233,7 +231,9 @@ export default function RdpClient() {
             .withUsername(form.username)
             .withPassword(form.password)
             .withDestination(form.hostname)
-            .withProxyAddress(form.gatewayAddress)
+            .withProxyAddress(
+                `${window.location.protocol === "https:" ? "wss" : "ws"}://${window.location.host}/gateway/rdp`
+            )
             .withServerDomain(form.domain)
             .withAuthToken(form.authtoken)
             .withDesktopSize({
@@ -341,15 +341,6 @@ export default function RdpClient() {
                                 }
                             />
                         </Field>
-                        <Field label="Gateway Address" id="gatewayAddress">
-                            <Input
-                                id="gatewayAddress"
-                                value={form.gatewayAddress}
-                                onChange={(e) =>
-                                    update("gatewayAddress", e.target.value)
-                                }
-                            />
-                        </Field>
                         {/* <Field label="Auth Token" id="authtoken">
                             <Input
                                 id="authtoken"