diff --git a/config/env/env.go b/config/env/env.go
index f8da4110f..8190078dc 100644
--- a/config/env/env.go
+++ b/config/env/env.go
@@ -40,7 +40,12 @@ func (e *env) load(envStrings []string) []*config.KeyValue {
 				k = k[1:]
 			}
 		}
-
+		if strings.Contains(k, "_") {
+			kv = append(kv, &config.KeyValue{
+				Key:   strings.Replace(k, "_", ".", -1),
+				Value: []byte(v),
+			})
+		}
 		kv = append(kv, &config.KeyValue{
 			Key:   k,
 			Value: []byte(v),