diff --git a/go.sum b/go.sum
index a7f09e2ec..453809c78 100644
--- a/go.sum
+++ b/go.sum
@@ -514,6 +514,7 @@ google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380 h1:xriR1EgvKfkKxIoU2uUvrMVl+H26359loFFUleSMXFo=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
diff --git a/internal/id/sonyflake.go b/internal/id/sonyflake.go
index abb46f689..c6cb4e9c7 100644
--- a/internal/id/sonyflake.go
+++ b/internal/id/sonyflake.go
@@ -1,6 +1,10 @@
 package id
 
 import (
+	"errors"
+	"net"
+	"os"
+
 	"strconv"
 	"time"
 
@@ -22,7 +26,53 @@ func (s *sonyflakeGenerator) Next() (string, error) {
 var (
 	SonyFlakeGenerator = Generator(&sonyflakeGenerator{
 		sonyflake.NewSonyflake(sonyflake.Settings{
+			MachineID: lower16BitPrivateIP,
 			StartTime: time.Date(2019, 4, 29, 0, 0, 0, 0, time.UTC),
 		}),
 	})
 )
+
+// the following is a copy of sonyflake (https://github.com/sony/sonyflake/blob/master/sonyflake.go)
+//with the change of using the "POD-IP" if no private ip is found
+func privateIPv4() (net.IP, error) {
+	as, err := net.InterfaceAddrs()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, a := range as {
+		ipnet, ok := a.(*net.IPNet)
+		if !ok || ipnet.IP.IsLoopback() {
+			continue
+		}
+
+		ip := ipnet.IP.To4()
+		if isPrivateIPv4(ip) {
+			return ip, nil
+		}
+	}
+
+	//change: use "POD_IP"
+	ip := net.ParseIP(os.Getenv("POD_IP"))
+	if ip == nil {
+		return nil, errors.New("no private ip address")
+	}
+	if ipV4 := ip.To4(); ipV4 != nil {
+		return ipV4, nil
+	}
+	return nil, errors.New("no pod ipv4 address")
+}
+
+func isPrivateIPv4(ip net.IP) bool {
+	return ip != nil &&
+		(ip[0] == 10 || ip[0] == 172 && (ip[1] >= 16 && ip[1] < 32) || ip[0] == 192 && ip[1] == 168)
+}
+
+func lower16BitPrivateIP() (uint16, error) {
+	ip, err := privateIPv4()
+	if err != nil {
+		return 0, err
+	}
+
+	return uint16(ip[2])<<8 + uint16(ip[3]), nil
+}