diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b22b8f..78473a7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,48 +1,73 @@
 name: CI
 
 on:
-  pull_request: {}
   push:
     branches:
+      - main
       - master
+  pull_request: {}
 
 jobs:
+  test:
+    name: "Tests"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: npm
+      - name: Install Dependencies
+        run: npm ci
+      - name: Lint
+        run: npm run lint:js
+      - name: Run Tests
+        run: npm run test
 
   floating:
-    name: "Floating dependencies"
-    env:
-      CI: true
+    name: "Floating Dependencies"
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: npm
+      - name: Install Dependencies
+        run: npm install --no-shrinkwrap
+      - name: Run Tests
+        run: npm run test
+
+  try-scenarios:
+    name: ${{ matrix.try-scenario }}
     runs-on: ubuntu-latest
+    needs: 'test'
+
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        try-scenario: [
-          ember-lts-3.20,
-          ember-lts-3.24,
-          ember-release,
-          ember-beta,
-        ]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Install node
-      uses: actions/setup-node@v2-beta
-      with:
-        node-version: 12.x
-
-    - name: Get yarn cache
-      id: yarn-cache
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - uses: actions/cache@v2
-      with:
-        path: ${{ steps.yarn-cache.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-        restore-keys: |
-         ${{ runner.os }}-yarn-
-    - name: yarn install
-      run: yarn
-    - name: lint js
-      run: yarn lint:js
-    - name: Run test
-      run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
+        try-scenario:
+          - ember-lts-3.20
+          - ember-lts-3.24
+          - ember-release
+          #- ember-beta
+          #- ember-canary
+          - ember-classic
+          - ember-default-with-jquery
+          #- embroider-safe
+          #- embroider-optimized
 
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 12.x
+          cache: npm
+      - name: Install Dependencies
+        run: npm ci
+      - name: Run Tests
+        run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}