diff --git a/app/main.py b/app/main.py
index c2ed223..c1e2192 100644
--- a/app/main.py
+++ b/app/main.py
@@ -111,7 +111,7 @@ def create_playlist():
     # Add default document
     new_id = playlists_coll.insert_one(Playlist(spotify).get_json(new=True)).inserted_id
 
-    q.enqueue(create_playlist_helper, new_id, job_timeout=1800) # 30 mins
+    q.enqueue(create_playlist_helper, new_id, job_timeout=7200) # 2 hrs
     return { 'playlist': { 'id': str(new_id), 'spotifyPlaylists': 'generating' } }
 
 def create_playlist_helper(playlist_id):
diff --git a/app/src/queue_update_playlists.py b/app/src/queue_update_playlists.py
index a03267f..f4db5db 100644
--- a/app/src/queue_update_playlists.py
+++ b/app/src/queue_update_playlists.py
@@ -24,6 +24,6 @@
 # Add all playlists to worker queues
 print('Updating all playlists...')
 for obj in playlists_coll.find({ 'token': { '$exists': True }}):
-    q.enqueue(update_playlist, obj, job_timeout=600) # 10 mins
+    q.enqueue(update_playlist, obj, job_timeout=1800) # 30 mins
 
 print('Finished updating playlists')
\ No newline at end of file