diff --git a/database/sql/controller.go b/database/sql/controller.go
index af478fea..3b7a9166 100644
--- a/database/sql/controller.go
+++ b/database/sql/controller.go
@@ -42,7 +42,7 @@ func (s *sqlDatabase) InitController() (params.ControllerInfo, error) {
 		return params.ControllerInfo{}, runnerErrors.NewConflictError("controller already initialized")
 	}
 
-	newID, err := uuid.NewUUID()
+	newID, err := uuid.NewRandom()
 	if err != nil {
 		return params.ControllerInfo{}, errors.Wrap(err, "generating UUID")
 	}
diff --git a/database/sql/models.go b/database/sql/models.go
index 051b5a3b..2d900368 100644
--- a/database/sql/models.go
+++ b/database/sql/models.go
@@ -38,7 +38,7 @@ func (b *Base) BeforeCreate(tx *gorm.DB) error {
 	if b.ID != emptyId {
 		return nil
 	}
-	newID, err := uuid.NewUUID()
+	newID, err := uuid.NewRandom()
 	if err != nil {
 		return errors.Wrap(err, "generating id")
 	}