diff --git a/config.yaml.sample b/config.yaml.sample
index 728fa2d92067de3f32df1f4a18c3d13613766734..b87eaeab5d675bbf2cc69561517fdd602daabe42 100644
--- a/config.yaml.sample
+++ b/config.yaml.sample
@@ -7,7 +7,7 @@ dataStorageUrl: localhost:7777
 grpcListenAddress: localhost:7877
 restListenAddress: localhost:7878
 # This one using by rest-gateway. Must contain the same domain name with issued certificate
-grpcURL: key-storage-agent:7877
+grpcURL: localhost:7877
 
 # VIAM Variables
 viamUUID: viam-system
diff --git a/config/configs.go b/config/configs.go
index 2630c025e2f810eb6d7b3083eaec3b1aaf8ef195..93f09a78907cdfd003ed9de8bbada505c8f90aa7 100644
--- a/config/configs.go
+++ b/config/configs.go
@@ -8,9 +8,9 @@ import (
 
 	"code.vereign.com/code/viam-apis/authentication"
 	"github.com/spf13/viper"
-)
 
-import _ "github.com/spf13/viper/remote"
+	_ "github.com/spf13/viper/remote"
+)
 
 var SystemAuth = &authentication.Authentication{
 	Uuid:    "undefined",
@@ -44,7 +44,7 @@ func SetConfigValues(configFile, etcdURL string) {
 	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("grpcURL", "localhost:7877")
 
 	viper.SetDefault("replaceKey", false)