diff --git a/.gitlab-ci.ncrc.yml b/.gitlab-ci.ncrc.yml
index 7f41365931b3e7e37419295b203a45b247e999bc..55b4a72a83e6b466750f804e0881b4283aa3f7a9 100644
--- a/.gitlab-ci.ncrc.yml
+++ b/.gitlab-ci.ncrc.yml
@@ -66,9 +66,8 @@ deploy:
 #   script:
 #     - cd ${HOME}
 #     - npm run lint
-#
 
-# .test_template: &run_test_template
+# test-chrome:
 #   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
 #   stage: test
 #   variables:
@@ -79,10 +78,22 @@ deploy:
 #     # used by psql
 #     PGUSER: kotahidev
 #     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
 #   services:
 #     - postgres
+#   script:
+#     - cd ${HOME}
+#     - apt-get -y install postgresql-client
+#     # this is needed for pgboss initial setup
+#     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
+#     # use the example env for tests
+#     - cp .env.example .env
+#     # specify host here else it confuses the linked postgres image
+#     - echo $INSTANCE_NAME
+#     - POSTGRES_HOST=postgres yarn test:all:chrome:ncrc
 
-# test-chrome:
+# test-chrome-samsung:
 #   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
 #   stage: test
 #   variables:
@@ -100,11 +111,227 @@ deploy:
 #   script:
 #     - cd ${HOME}
 #     - apt-get -y install postgresql-client
-#     # this is needed for pgboss initial setup
-#     - hostname
 #     - psql -h postgres -U kotahidev -d kotahidev -c "create extension pgcrypto;"
-#     # use the example env for tests
 #     - cp .env.example .env
-#     # specify host here else it confuses the linked postgres image
-#     - POSTGRES_HOST=postgres yarn test:all:chrome:ncrc
+#     - POSTGRES_HOST=postgres yarn test:all:chrome:ncrc:samsung
+
+# test-chrome-samsung-tablet:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:samsung:tablet
+
+# test-chrome-iPhone:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:iPhone
+
+# test-chrome-iPhone-tablet:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:iPhone:tablet
+
+# test-chrome-hd-laptop:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:hd:laptop   
+
+# test-firefox:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc
+
+# test-firefox-samsung:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:samsung
+
+# test-firefox-samsung-tablet:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:samsung:tablet
+
+# test-firefox-iPhone:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:iPhone
+
+# test-firefox-iPhone-tablet:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:iPhone:tablet
+
+# test-firefox-hd-laptop:
+#   image: $IMAGE_ORG/$IMAGE_NAME-dev:$CI_COMMIT_SHA
+#   stage: test
+#   variables:
+#     GIT_STRATEGY: none
+#     # setup data for postgres image
+#     POSTGRES_USER: kotahidev
+#     POSTGRES_PASSWORD: kotahidev
+#     # used by psql
+#     PGUSER: kotahidev
+#     PGPASSWORD: kotahidev
+#     # this is used to ignore self signed certs
+#     #START_SERVER_AND_TEST_INSECURE: 1
+#   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:ncrc:hd:laptop