diff --git a/boards/utils.py b/boards/utils.py
--- a/boards/utils.py
+++ b/boards/utils.py
@@ -2,6 +2,8 @@
 This module contains helper functions and helper classes.
 """
 import hashlib
+import uuid
+
 from boards.abstracts.constants import FILE_DIRECTORY
 from random import random
 import time
@@ -130,12 +132,8 @@ def get_extension(filename):
 
 
 def get_upload_filename(model_instance, old_filename):
-    # TODO Use something other than random number in file name
     extension = get_extension(old_filename)
-    new_name = '{}{}.{}'.format(
-        str(int(time.mktime(time.gmtime()))),
-        str(int(random() * 1000)),
-        extension)
+    new_name = '{}.{}'.format(uuid.uuid4(), extension)
 
     return os.path.join(FILE_DIRECTORY, new_name)