diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
index 0e6ff4759f..8d3f8a7aed 100644
--- a/.github/workflows/stack.yml
+++ b/.github/workflows/stack.yml
@@ -12,9 +12,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - resolver: lts-12
-            ghc: 8.4.4
-            yaml: stack.yaml
+          # XXX: temporarily disabled until xmonad 0.17 release
+          # - resolver: lts-12
+          #   ghc: 8.4.4
+          #   yaml: stack.yaml
           - resolver: lts-12
             ghc: 8.4.4
             yaml: stack-master.yaml
@@ -24,9 +25,9 @@ jobs:
           - resolver: lts-16
             ghc: 8.8.4
             yaml: stack-master.yaml
-          - resolver: lts-17
-            ghc: 8.10.4
-            yaml: stack.yaml
+          # - resolver: lts-17
+          #   ghc: 8.10.4
+          #   yaml: stack.yaml
           - resolver: lts-17
             ghc: 8.10.4
             yaml: stack-master.yaml
diff --git a/stack-master.yaml b/stack-master.yaml
index ea07bf8108..3fa77c94c8 100644
--- a/stack-master.yaml
+++ b/stack-master.yaml
@@ -7,6 +7,8 @@ packages:
 - ./
 
 extra-deps:
+- github: xmonad/X11
+  commit: master@{today}
 - github: xmonad/xmonad
   commit: master@{today}
 
diff --git a/stack.yaml b/stack.yaml
index d6e3356e65..42f10e1cd0 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -4,7 +4,8 @@ packages:
 - ./
 
 extra-deps:
-- xmonad-0.15
+- X11-0.10
+- xmonad-0.17
 
 nix:
   packages:
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
index f2ecdf374b..2c4879b146 100644
--- a/xmonad-contrib.cabal
+++ b/xmonad-contrib.cabal
@@ -57,8 +57,8 @@ library
                    random,
                    mtl >= 1 && < 3,
                    unix,
-                   X11>=1.6.1 && < 1.10,
-                   xmonad >= 0.15 && < 0.16,
+                   X11 >= 1.10 && < 1.11,
+                   xmonad >= 0.16.999 && < 0.18,
                    utf8-string
 
     ghc-options:   -Wall -Wno-unused-do-bind
@@ -409,7 +409,7 @@ test-suite tests
   hs-source-dirs: tests, .
   build-depends: base
                , QuickCheck >= 2
-               , X11>=1.6.1 && < 1.10
+               , X11 >= 1.10 && < 1.11
                , containers
                , directory
                , hspec >= 2.4.0 && < 3
@@ -417,7 +417,7 @@ test-suite tests
                , process
                , unix
                , utf8-string
-               , xmonad >= 0.15 && < 0.16
+               , xmonad >= 0.16.999 && < 0.18
   cpp-options: -DTESTING
   ghc-options: -Wall -Wno-unused-do-bind