diff --git a/greataped/components/core/system_component.go b/greataped/components/core/system_component.go
index a922d40..67d8354 100644
--- a/greataped/components/core/system_component.go
+++ b/greataped/components/core/system_component.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/google/uuid"
+	uuid "github.com/satori/go.uuid"
 	. "github.com/xeronith/diamante/contracts/email"
 	. "github.com/xeronith/diamante/contracts/logging"
 	. "github.com/xeronith/diamante/contracts/settings"
@@ -85,11 +85,11 @@ func (component *systemComponent) UnixNano() int64 {
 }
 
 func (component *systemComponent) GenerateUUID() string {
-	return uuid.New().String()
+	return uuid.NewV4().String()
 }
 
 func (component *systemComponent) GenerateSalt() string {
-	return uuid.New().String()
+	return uuid.NewV4().String()
 }
 
 func (component *systemComponent) GenerateHash(value string, salt string) string {
diff --git a/greataped/go.mod b/greataped/go.mod
index b305afe..9c6ae93 100644
--- a/greataped/go.mod
+++ b/greataped/go.mod
@@ -3,8 +3,8 @@ module rail.town/infrastructure
 go 1.19
 
 require (
-	github.com/google/uuid v1.3.0
 	github.com/robfig/cron v1.2.0
+	github.com/satori/go.uuid v1.2.0
 	github.com/sendgrid/sendgrid-go v3.12.0+incompatible
 	github.com/xeronith/diamante v1.5.3
 	google.golang.org/protobuf v1.28.1
@@ -18,6 +18,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/influxdata/influxdb v1.10.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
diff --git a/greataped/go.sum b/greataped/go.sum
index 86bb35a..04e0e15 100644
--- a/greataped/go.sum
+++ b/greataped/go.sum
@@ -50,6 +50,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ=
 github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sendgrid/rest v2.6.9+incompatible h1:1EyIcsNdn9KIisLW50MKwmSRSK+ekueiEMJ7NEoxJo0=
 github.com/sendgrid/rest v2.6.9+incompatible/go.mod h1:kXX7q3jZtJXK5c5qK83bSGMdV6tsOE70KbHoqJls4lE=
 github.com/sendgrid/sendgrid-go v3.12.0+incompatible h1:/N2vx18Fg1KmQOh6zESc5FJB8pYwt5QFBDflYPh1KVg=