diff --git a/.gitlab-ci.elife.yml b/.gitlab-ci.elife.yml
index 5d090470b82eb49e69c4a554e9074714e51a36a8..aabcc1518dc9356715631d366cba3c00bbc9f9a5 100644
--- a/.gitlab-ci.elife.yml
+++ b/.gitlab-ci.elife.yml
@@ -104,15 +104,18 @@ deploy:
 #   script:
 #     - *run_script_template
 
+.vars_template: &vars_insert
+   GIT_STRATEGY: none
+   POSTGRES_USER: kotahidev
+   POSTGRES_PASSWORD: kotahidev
+   PGUSER: kotahidev
+   PGPASSWORD: kotahidev
+
 test-chrome:
   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
   stage: test
   variables:
-    GIT_STRATEGY: none
-    POSTGRES_USER: kotahidev
-    POSTGRES_PASSWORD: kotahidev
-    PGUSER: kotahidev
-    PGPASSWORD: kotahidev
+  <<: *vars_insert
   services:
     - postgres
   script:
@@ -125,135 +128,135 @@ test-chrome:
     # specify host here else it confuses the linked postgres image
     - POSTGRES_HOST=postgres yarn test:all:chrome:elife
 
-# test-chrome-samsung:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:elife:samsung
+test-chrome-samsung:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:chrome:elife:samsung
 
-# test-chrome-samsung-tablet:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:elife:samsung:tablet
+test-chrome-samsung-tablet:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:chrome:elife:samsung:tablet
 
-# test-chrome-iPhone:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:elife:iPhone
+test-chrome-iPhone:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:chrome:elife:iPhone
 
-# test-chrome-iPhone-tablet:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:elife:iPhone:tablet
+test-chrome-iPhone-tablet:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:chrome:elife:iPhone:tablet
 
-# test-chrome-hd-laptop:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:elife:hd:laptop   
+test-chrome-hd-laptop:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:chrome:elife:hd:laptop   
 
-# test-firefox:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife
+test-firefox:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife
 
-# test-firefox-samsung:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife:samsung
+test-firefox-samsung:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife:samsung
 
-# test-firefox-samsung-tablet:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife:samsung:tablet
+test-firefox-samsung-tablet:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife:samsung:tablet
 
-# test-firefox-iPhone:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife:iPhone
+test-firefox-iPhone:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife:iPhone
 
-# test-firefox-iPhone-tablet:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife:iPhone:tablet
+test-firefox-iPhone-tablet:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife:iPhone:tablet
 
-# test-firefox-hd-laptop:
-#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
-#   stage: test
-#   services:
-#     - postgres
-#   script:
-#     - cd ${HOME}
-#     - apt-get -y install postgresql-client
-#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     - cp .env.example .env
-#     - POSTGRES_HOST=postgres yarn test:all:firefox:elife:hd:laptop
+test-firefox-hd-laptop:
+  image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+  stage: test
+  services:
+    - postgres
+  script:
+    - cd ${HOME}
+    - apt-get -y install postgresql-client
+    - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+    - cp .env.example .env
+    - POSTGRES_HOST=postgres yarn test:all:firefox:elife:hd:laptop