diff --git a/shell/edit/auth/github.vue b/shell/edit/auth/github.vue
index 1ca71a3ebb8..242c7767ca2 100644
--- a/shell/edit/auth/github.vue
+++ b/shell/edit/auth/github.vue
@@ -163,6 +163,7 @@ export default {
         <RadioGroup
           v-model="targetType"
           name="targetType"
+          data-testid="authConfig-gitHub"
           :options="['public','private']"
           :mode="mode"
           :labels="[ t(`authConfig.${NAME}.target.public`), t(`authConfig.${NAME}.target.private`)]"
diff --git a/shell/server/server-middleware.js b/shell/server/server-middleware.js
index 8629c8890e6..f4ebb5053a8 100644
--- a/shell/server/server-middleware.js
+++ b/shell/server/server-middleware.js
@@ -1,19 +1,11 @@
-import { URL } from 'url';
-
-export default function(req, res, next) {
-  const parsed = new URL(req.url, 'https://localhost');
-
-  if ( parsed.searchParams.has('spa') ) {
-    res.spa = true;
-    console.log('SPA mode enabled'); // eslint-disable-line no-console
-  }
-
+module.exports = function(req, res, next) {
   // We do this redirect so that /verify-auth can work with both standalone and
   // while dashboard is nested under ember.
   if (req.url.includes('/verify-auth') || req.url.includes('/verify-auth-azure')) {
     res.writeHead(301, { Location: req.url.replace(/verify-auth(-azure)?/, 'auth/verify') });
     res.end();
-  }
 
+    return;
+  }
   next();
-}
+};
diff --git a/shell/vue.config.js b/shell/vue.config.js
index 61621864690..af022e4d05f 100644
--- a/shell/vue.config.js
+++ b/shell/vue.config.js
@@ -4,6 +4,7 @@ const serveStatic = require('serve-static');
 const webpack = require('webpack');
 const { generateDynamicTypeImport } = require('./pkg/auto-import');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
+const serverMiddlewares = require('./server/server-middleware.js');
 
 // Suppress info level logging messages from http-proxy-middleware
 // This hides all of the "[HPM Proxy created] ..." messages
@@ -218,8 +219,6 @@ module.exports = function(dir, _appConfig) {
   serverMiddleware.push({ path: `/pkg/`, handler: serveStatic(`${ dir }/dist-pkg/`) });
   // Endpoint to download and unpack a tgz from the local verdaccio rgistry (dev)
   serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'verdaccio-middleware'));
-  // Add the standard dashboard server middleware after the middleware added to serve up UI packages
-  serverMiddleware.push(path.resolve(dir, SHELL, 'server', 'server-middleware'));
 
   // ===============================================================================================
   // Dashboard nuxt configuration
@@ -319,6 +318,8 @@ module.exports = function(dir, _appConfig) {
           process.exit(1);
         });
 
+        app.use(serverMiddlewares);
+
         Object.keys(proxy).forEach((p) => {
           const px = createProxyMiddleware({
             ...proxy[p],