diff --git a/config.yaml.sample b/config.yaml.sample
index 1ee2d92b8a78a1c7cab3001a72a679b71314c503..28d760a620292f12ae7593d778132bb8da51690e 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -7,6 +7,10 @@ dataStorageUrl: localhost:7777
 grpcListenAddress: localhost:7877
 restListenAddress: localhost:7878
 
+# VIAM Variables
+viamUUID: viam-system
+viamSession: viam-session
+
 # Choose a certificate method for providing PEM strings
 # 1 = Read from file (*.crt and *.key files)
 # 2 = Read from Vault server (this will require additional config information for Vault)
diff --git a/server/configs.go b/server/configs.go
index d66e379e5d9d5bf3f19626119ee638ac9268b2fb..e40bafc9a7132651a0ee851e8ec5b7e6fb2422e1 100644
--- a/server/configs.go
+++ b/server/configs.go
@@ -21,6 +21,9 @@ func SetConfigValues() {
 	viper.SetDefault("vereignCertFile", "vereign_ca.cer")
 	viper.SetDefault("vereignCertKey", "vereign_ca.key")
 
+	viper.SetDefault("viamUUID", "viam-system")
+	viper.SetDefault("viamSession", "viam-session")
+
 	viper.SetDefault("maxMessageSize", "32")
 
 	// Read Config File
diff --git a/server/server.go b/server/server.go
index 16a947d8547a8e06a0197e1f66d3b3a9368a4c3e..5dcbe0eb7da5169c56898390935e35fcd98a7325 100644
--- a/server/server.go
+++ b/server/server.go
@@ -67,8 +67,8 @@ func authenticateClient(ctx context.Context, s *handler.KeyStorageServerImpl, in
 		}
 
 		viamAuth := &authentication.Authentication{
-			Uuid:    "viam-system",
-			Session: "viam-session",
+			Uuid:    viper.GetString("viamUUID"),
+			Session: viper.GetString("viamSession"),
 		}
 
 		sessionClient := &client.DataStorageClientImpl{}