diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 37e3fcd2..fa7c882c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -166,11 +166,11 @@ jobs:
 
     services:
       selenium:
-        image: selenium/standalone-${{ matrix.browser }}
+        # geckodriver-0.31 seems to have problems as of 2022 May 1
+        image: selenium/standalone-${{ matrix.browser == 'firefox' && 'firefox:99.0-geckodriver-0.30-20220427' || matrix.browser }}
         ports:
         - 4444:4444
-        volumes: # share shm with host: https://stackoverflow.com/questions/53902507/unknown-error-session-deleted-because-of-page-crash-from-unknown-error-cannot
-        - /dev/shm:/dev/shm
+        options: --shm-size=2gb
 
     steps:
     - uses: actions/checkout@v2
diff --git a/config/wdio.conf.js b/config/wdio.conf.js
index e2840e65..06b07a1b 100644
--- a/config/wdio.conf.js
+++ b/config/wdio.conf.js
@@ -21,7 +21,8 @@ exports.config = {
       browserName: (process.env.BROWSER || 'chrome'),
     }
   ],
-  services: process.env.DOCKER_HOST ? [] : ['selenium-standalone'],
+  // geckodriver-0.31 seems to have problems as of 2022 May 1
+  services: process.env.DOCKER_HOST ? [] : [ ['selenium-standalone', { drivers: { firefox: '0.30.0', chrome: 'latest' } } ] ],
   logLevel: 'info',
   bail: 0,
   screenshotPath: SCREENSHOT_PATH,