diff --git a/.gitignore b/.gitignore
index c9b213e..d7ce33e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ features/screenshots
 /website/.bundle
 /vendor/bundle
 /public/swagger.json
+.vscode
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index c0de361..e855679 100644
--- a/Gemfile
+++ b/Gemfile
@@ -26,10 +26,10 @@ gem 'monsoon-openstack-auth',
 gem 'active_model_serializers', '>= 0.10.0.rc4'
 
 # Asynchronous jobs via postgres
-gem 'que', '~>1.0.0.beta3'
+# before upgrading to version 1.3.0 there is an action required see here
+# https://github.com/que-rb/que/blob/master/CHANGELOG.md#130-2022-02-25
+gem 'que', '1.2.0'
 gem 'que-web' # at some point this should be remove and started standalone
-# You must use the master branch of Sinatra for que-web. See https://github.com/sinatra/sinatra/issues/1071
-gem 'sinatra', git: 'https://github.com/sinatra/sinatra'
 
 # arc client
 gem 'arc-client', git: 'https://github.com/sapcc/arc-client.git'
diff --git a/Gemfile.lock b/Gemfile.lock
index dd98f87..40269ba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -16,18 +16,6 @@ GIT
       rails
       uglifier (>= 1.3.0)
 
-GIT
-  remote: https://github.com/sinatra/sinatra
-  revision: 6f15fba2790ebdf4d1215cebf425dea2ea3130ea
-  specs:
-    rack-protection (2.0.5)
-      rack
-    sinatra (2.0.5)
-      mustermann (~> 1.0)
-      rack (~> 2.0)
-      rack-protection (= 2.0.5)
-      tilt (~> 2.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -213,7 +201,9 @@ GEM
       mimemagic (~> 0.3.2)
     method_source (0.8.2)
     mime-types (2.99.3)
-    mimemagic (0.3.3)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.0.1)
     mini_portile2 (2.4.0)
     minitar (0.8)
@@ -230,7 +220,8 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mustermann (1.0.3)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
@@ -275,14 +266,15 @@ GEM
     public_suffix (2.0.5)
     puma (3.11.4)
     quantile (0.2.0)
-    que (1.0.0.beta3)
-    que-web (0.8.0)
-      erubis
-      que (~> 1.0.0.beta3)
+    que (1.2.0)
+    que-web (0.9.4)
+      que (~> 1)
       sinatra
     quiet_safari (1.0.0)
       railties (>= 3.1.0)
-    rack (2.0.7)
+    rack (2.2.3.1)
+    rack-protection (2.2.0)
+      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.2.1)
@@ -350,6 +342,7 @@ GEM
       activesupport (>= 3.1, < 6.0)
       json-schema (~> 2.2)
       railties (>= 3.1, < 6.0)
+    ruby2_keywords (0.0.5)
     ruby_dep (1.5.0)
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
@@ -363,6 +356,11 @@ GEM
       rspec-its
       specinfra (~> 2.72)
     sfl (2.3)
+    sinatra (2.2.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
+      tilt (~> 2.0)
     slop (3.6.0)
     solve (4.0.2)
       molinillo (~> 0.6)
@@ -388,7 +386,7 @@ GEM
     systemu (2.6.5)
     thor (0.19.1)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     tomlrb (1.2.8)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
@@ -431,7 +429,7 @@ DEPENDENCIES
   prometheus-client (~> 0.6.0)
   pry-rails
   puma
-  que (~> 1.0.0.beta3)
+  que (= 1.2.0)
   que-web
   quiet_safari
   rails (= 5.2.2.1)
@@ -439,7 +437,6 @@ DEPENDENCIES
   rspec-rails
   rswag-specs
   sentry-raven
-  sinatra!
   spring
   swift_client (>= 0.1.6)
   unf (>= 0.2.0beta2)
@@ -450,4 +447,4 @@ RUBY VERSION
    ruby 2.4.10p364
 
 BUNDLED WITH
-   2.0.1
+   2.2.25