diff --git a/config/configs.go b/config/configs.go
index aa5f7c64087ea1a9b888fbc5ff6b066ee19bb9cc..2bb565e5c26338927d9dacd50136ec6a9643f77f 100644
--- a/config/configs.go
+++ b/config/configs.go
@@ -38,10 +38,10 @@ func SetConfigValues(configFile, etcdURL string) {
 	// Set Default Values For Config Variables
 
 	// Vereign API Related
-	viper.SetDefault("grpcListenAddress", "localhost:7877")
-	viper.SetDefault("restListenAddress", "localhost:7878")
-	viper.SetDefault("dataStorageUrl", "localhost:7777")
-	viper.SetDefault("entitiesManagerUrl", "localhost:7779")
+	viper.SetDefault("grpcListenAddress", ":7877")
+	viper.SetDefault("restListenAddress", ":7878")
+	viper.SetDefault("dataStorageUrl", "data-storage-agent:7777")
+	viper.SetDefault("entitiesManagerUrl", "entities-management-agent:7779")
 	viper.SetDefault("grpcURL", "key-storage-agent:7877")
 
 	viper.SetDefault("viamUUID", "viam-system")
diff --git a/run.sh b/run.sh
index 7d2db8a5f5b3dd3c6eaf8c73e7e9cf27d298320b..6cdffbd43e1844b1111f1019d70b483b67a242ec 100755
--- a/run.sh
+++ b/run.sh
@@ -2,7 +2,7 @@
 [ -d cert ] || mkdir cert
 
 openssl genrsa -out cert/server.key 2048
-openssl req -new -key cert/server.key -out cert/server.csr -subj "/CN=localhost"
+openssl req -new -key cert/server.key -out cert/server.csr -subj "/CN=key-storage-agent"
 openssl x509 -req -days 365 -in cert/server.csr -signkey cert/server.key -out cert/server.crt