diff --git a/Gemfile b/Gemfile
index c300130a..1e9adae2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,7 +26,7 @@ gem 'will_paginate'
 gem 'will_paginate-bootstrap'
 gem 'devise', '~> 4.0'
 gem 'devise-i18n'
-gem 'devise-async', git: "https://github.com/mhfs/devise-async.git", ref: "devise-4.x" # TODO: bring this to 1.0 after rails5 upgrade
+gem 'devise-async'
 gem 'bootstrap_form'
 gem 'font-kit-rails'
 gem 'nprogress-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index c0d7faeb..612e4bb5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/mhfs/devise-async.git
-  revision: 177f6363a002f7ff28f1d289c8cab7ad8d9cb8c5
-  ref: devise-4.x
-  specs:
-    devise-async (0.10.2)
-      devise (>= 4.0)
-
 GIT
   remote: https://github.com/retrospring/questiongenerator.git
   revision: c5f8362ff769425d42a94b3a611731eadaa5e0ca
@@ -131,6 +123,9 @@ GEM
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-async (1.0.0)
+      activejob (>= 5.0)
+      devise (>= 4.0)
     devise-i18n (1.9.1)
       devise (>= 4.7.1)
     diff-lcs (1.3)
@@ -411,8 +406,6 @@ GEM
     multi_json (1.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    mustermann (1.1.1)
-      ruby2_keywords (~> 0.0.1)
     naught (1.1.0)
     nenv (0.3.0)
     nested_form (0.3.2)
@@ -549,7 +542,6 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
     ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
     sanitize (5.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.8.0)
@@ -592,11 +584,6 @@ GEM
       simplecov
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sinatra (2.0.8.1)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.8.1)
-      tilt (~> 2.0)
     spring (1.3.6)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
@@ -686,7 +673,7 @@ DEPENDENCIES
   database_cleaner
   delayed_paperclip
   devise (~> 4.0)
-  devise-async!
+  devise-async
   devise-i18n
   factory_girl_rails
   fake_email_validator
@@ -735,7 +722,6 @@ DEPENDENCIES
   simplecov
   simplecov-json
   simplecov-rcov
-  sinatra
   spring (~> 1.3.5)
   sweetalert-rails
   tiny-color-rails