diff --git a/api/middleware.go b/api/middleware.go
index edab71c..30d8a8c 100644
--- a/api/middleware.go
+++ b/api/middleware.go
@@ -7,9 +7,9 @@ import (
 	"github.com/DataDog/datadog-go/statsd"
 	"github.com/MEDIGO/laika/store"
 	log "github.com/Sirupsen/logrus"
+	"github.com/google/uuid"
 	"github.com/labstack/echo"
 	"github.com/labstack/echo/middleware"
-	"github.com/satori/go.uuid"
 	"golang.org/x/crypto/bcrypt"
 )
 
@@ -31,7 +31,7 @@ func StateMiddleware(store store.Store) echo.MiddlewareFunc {
 func TraceMiddleware() echo.MiddlewareFunc {
 	return func(next echo.HandlerFunc) echo.HandlerFunc {
 		return func(c echo.Context) error {
-			if id, err := uuid.NewV4(); err == nil {
+			if id, err := uuid.NewRandom(); err == nil {
 				c.Set("request_id", id.String())
 			}
 			return next(c)
diff --git a/go.mod b/go.mod
index 0c0f60e..0a3c195 100644
--- a/go.mod
+++ b/go.mod
@@ -9,13 +9,13 @@ require (
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.3.1-0.20180308100310-1a676ac6e4dc
+	github.com/google/uuid v1.1.1
 	github.com/labstack/echo v3.3.4+incompatible
 	github.com/labstack/gommon v0.2.2-0.20180316174944-3bc2d333a4c3
 	github.com/mattn/go-colorable v0.1.0
 	github.com/mattn/go-isatty v0.0.4
 	github.com/pmezard/go-difflib v1.0.0
 	github.com/rubenv/sql-migrate v0.0.0-20180217203553-081fe17d19ff
-	github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5
 	github.com/stretchr/testify v1.2.2-0.20180319223459-c679ae2cc0cb
 	github.com/urfave/cli v1.20.1-0.20180226030253-8e01ec4cd3e2
 	github.com/valyala/bytebufferpool v1.0.0
diff --git a/go.sum b/go.sum
index 9ce50d7..abc797b 100644
--- a/go.sum
+++ b/go.sum
@@ -10,6 +10,8 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumC
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/go-sql-driver/mysql v1.3.1-0.20180308100310-1a676ac6e4dc h1:WhgK0tta5yLnKy4x0XbxaxErBoUbEt2ckjRGZGiF7lo=
 github.com/go-sql-driver/mysql v1.3.1-0.20180308100310-1a676ac6e4dc/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/labstack/echo v3.3.4+incompatible h1:83oKvzg2Fa6PN1pQfsUxlfR4MiSjsFzyxbEXKzsE0cQ=
 github.com/labstack/echo v3.3.4+incompatible/go.mod h1:0INS7j/VjnFxD4E2wkz67b8cVwCLbBmJyDaka6Cmk1s=
 github.com/labstack/gommon v0.2.2-0.20180316174944-3bc2d333a4c3 h1:oaPp0U6xfzrmg9lGhEm1ZkBv6WqTiHkgTPuYM7xhocU=