diff --git a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
index d69d2217..25132e40 100644
--- a/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
+++ b/eidastest-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
@@ -2,29 +2,24 @@
 eidastest_compose:
    version: "3"
    services:
-     selenium-hub:
-       image: selenium/hub
-       container_name: selenium-hub
+     chrome:
+       image: selenium/standalone-chrome:3.141.59-20200719
+       container_name: standalone-chrome
+       volumes:
+         - /dev/shm:/dev/shm
        ports:
          - "4444:4444"
-     firefox:
-       image: selenium/node-firefox
-       depends_on:
-         - selenium-hub
        environment:
-         - HUB_PORT_4444_TCP_ADDR=selenium-hub
-         - HUB_PORT_4444_TCP_PORT=4444
-
-     chrome:
-       image: selenium/node-chrome
-       depends_on:
-         - selenium-hub
-       environment:
-         - HUB_PORT_4444_TCP_ADDR=selenium-hub
-         - HUB_PORT_4444_TCP_PORT=4444
+         - DBUS_SESSION_BUS_ADDRESS=/dev/null
+         - START_XVFB=false
+         - NODE_MAX_SESSION=4
+         - NODE_MAX_INSTANCES=4
+       logging:
+         driver: none
+       restart: on-failure
 
      eidastest-testid:
-       image: docker.sunet.se/eidastest-testid:1.3.4
+       image: docker.sunet.se/eidastest-testid:2.0.0
        container_name: eidastest-testid
        ports:
          - "443:8099"
@@ -32,6 +27,7 @@ eidastest_compose:
          - CERTNAME=eidastest-1.qa.sveidas.se
        volumes:
          - "/etc/ssl:/etc/ssl"
+	 - /dev/shm:/dev/shm
        depends_on:
-         - firefox
          - chrome
+       restart: on-failure
\ No newline at end of file