diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index 476fb1b..d271096 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -30,15 +30,8 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
     enable = true;
     systemdIntegration = true;
 
-    # TODO: remove patch once sway > 1.5.1 is released and in nixpkgs
-    package = pkgs.sway.override {
-      sway-unwrapped = pkgs.sway-unwrapped.overrideAttrs (o: o // {
-        patches = lib.singleton (pkgs.fetchpatch {
-          url = "https://github.com/swaywm/sway/commit/33b64667ae0bfe9af752cb8c850b4f52b34660d2.patch";
-          sha256 = "05s0xhd4wn98insn0wynr359nq938dmc7aa9rmyn7ira78fw40w8";
-        });
-      });
-    };
+    # TODO: remove with 21.05
+    package = pkgs.unstable.sway;
 
     config = {
       modifier = "Mod4";
@@ -215,6 +208,9 @@ lib.mkIf nixosConfig.sbruder.gui.enable {
     extraConfig = ''
       # Cursor
       seat seat0 xcursor_theme Adwaita
+
+      # GCR prompter requires dbus to have wayland related variables
+      exec "dbus-update-activation-environment WAYLAND_DISPLAY"
     '';
   };