diff --git a/server/config.go b/server/config.go
index 84d22a26b..1a37ff5d1 100644
--- a/server/config.go
+++ b/server/config.go
@@ -229,34 +229,23 @@ type Config struct {
 	// Toggles /schema/details endpoint. If off, it returns empty.
 	SchemaDetailsOn bool `toml:"schema-details-on"`
 
-	Auth struct {
-		// Enable AuthZ/AuthN for featurebase server
-		Enable bool `toml:"enable"`
+	Auth Auth
+}
 
-		// Application/Client ID
-		ClientId string `toml:"client-id"`
+type Auth struct {
+	// Enable AuthZ/AuthN for featurebase server
+	Enable bool `toml:"enable"`
 
-		// Client Secret
-		ClientSecret string `toml:"client-secret"`
+	// Application/Client ID
+	ClientId string `toml:"client-id"`
 
-		// Authorize URL
-		AuthorizeURL string `toml:"authorize-url"`
-
-		// Token URL
-		TokenURL string `toml:"token-url"`
-
-		// Group Endpoint URL
-		GroupEndpointURL string `toml:"group-endpoint-url"`
-
-		// Scope URL
-		Scopes []string `toml:"scopes"`
-
-		// Hash Key
-		HashKey string `toml:"hash-key"`
-
-		// Block Key
-		BlockKey string `toml:"block-key"`
-	}
+	ClientSecret     string   `toml:"client-secret"`
+	AuthorizeURL     string   `toml:"authorize-url"`
+	TokenURL         string   `toml:"token-url"`
+	GroupEndpointURL string   `toml:"group-endpoint-url"`
+	Scopes           []string `toml:"scopes"`
+	HashKey          string   `toml:"hash-key"`
+	BlockKey         string   `toml:"block-key"`
 }
 
 // Namespace returns the namespace to use based on the Future flag.
diff --git a/server/config_internal_test.go b/server/config_internal_test.go
index 7c762b23e..75fe28144 100644
--- a/server/config_internal_test.go
+++ b/server/config_internal_test.go
@@ -8,8 +8,6 @@ import (
 	"os"
 	"strings"
 	"testing"
-
-	"github.com/molecula/featurebase/v2/auth"
 )
 
 type addrs struct{ bind, advertise string }
@@ -286,12 +284,15 @@ func TestConfig_validateAuth(t *testing.T) {
 	validClientSecret := "clientSecret"
 	notValidURL := "not-a-url"
 	emptyString := ""
+	validStringSlice := []string{"https://graph.microsoft.com/.default", "offline_access"}
+	var emptySlice []string
+
 	enable := true
 	disable := false
 
 	tests := []struct {
 		expErrs []string
-		input   auth.Auth
+		input   Auth
 	}{
 
 		{
@@ -304,14 +305,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         emptyString,
 				ClientSecret:     emptyString,
 				AuthorizeURL:     emptyString,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -323,14 +324,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     emptyString,
 				AuthorizeURL:     emptyString,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -342,14 +343,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         emptyString,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     emptyString,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -360,14 +361,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     emptyString,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -377,14 +378,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     validTestURL,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -393,14 +394,14 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgEmpty,
 				errorMesgEmpty,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     validTestURL,
 				TokenURL:         validTestURL,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           emptySlice,
 			},
 		},
 		{
@@ -408,14 +409,14 @@ func TestConfig_validateAuth(t *testing.T) {
 			[]string{
 				errorMesgURL,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     notValidURL,
 				TokenURL:         validTestURL,
 				GroupEndpointURL: validTestURL,
-				ScopeURL:         validTestURL,
+				Scopes:           validStringSlice,
 			},
 		},
 		{
@@ -424,40 +425,40 @@ func TestConfig_validateAuth(t *testing.T) {
 				errorMesgURL,
 				errorMesgURL,
 			},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     validTestURL,
 				TokenURL:         notValidURL,
 				GroupEndpointURL: notValidURL,
-				ScopeURL:         validTestURL,
+				Scopes:           validStringSlice,
 			},
 		},
 		{
 			// Auth enabled, all configs are set properly
 			[]string{},
-			auth.Auth{
+			Auth{
 				Enable:           enable,
 				ClientId:         validClientID,
 				ClientSecret:     validClientSecret,
 				AuthorizeURL:     validTestURL,
 				TokenURL:         validTestURL,
 				GroupEndpointURL: validTestURL,
-				ScopeURL:         validTestURL,
+				Scopes:           validStringSlice,
 			},
 		},
 		{
 			// Auth disabled, all configs are set to empty string
 			[]string{},
-			auth.Auth{
+			Auth{
 				Enable:           disable,
 				ClientId:         emptyString,
 				ClientSecret:     emptyString,
 				AuthorizeURL:     emptyString,
 				TokenURL:         emptyString,
 				GroupEndpointURL: emptyString,
-				ScopeURL:         emptyString,
+				Scopes:           validStringSlice,
 			},
 		},
 	}