diff --git a/bridge/core/token.go b/bridge/core/token.go
index 2ceabca22d2aed8cbc4f7b92b9bf4b0f2be008c1..449ebbb56cf0ed182f47ce70a280790358be3f8c 100644
--- a/bridge/core/token.go
+++ b/bridge/core/token.go
@@ -43,7 +43,7 @@ func NewToken(value, target string) *Token {
 }
 
 func (t *Token) ID() entity.Id {
-	sum := sha256.Sum256([]byte(t.Value))
+	sum := sha256.Sum256([]byte(t.Target + t.Value))
 	return entity.Id(fmt.Sprintf("%x", sum))
 }
 
diff --git a/bridge/github/config.go b/bridge/github/config.go
index 434a2c631b66133dbc76713c7a87c954ccd24b60..e76a14f4e19afe98dc473bd73193310068b17d97 100644
--- a/bridge/github/config.go
+++ b/bridge/github/config.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"os"
 	"regexp"
+	"sort"
 	"strconv"
 	"strings"
 	"syscall"
@@ -471,6 +472,8 @@ func getValidGithubRemoteURLs(remotes map[string]string) []string {
 		}
 	}
 
+	sort.Strings(urls)
+
 	return urls
 }