diff --git a/.github/renovate.json5 b/.github/renovate.json5
index 8b698a302..aaf9b8304 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -101,6 +101,13 @@
         "semantic-release*"
       ]
     },
+    {
+      // Max Semver compatibility
+      "packagePatterns": [
+        "@ember/test-waiters"
+      ],
+      "rangeStrategy": "widen"
+    },
     {
       // changing peerDependencies *at all* is a breaking change
       "matchDepTypes": ["peerDependencies"],
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4e4988651..841eda71b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,8 +76,8 @@ jobs:
           - ember-release
           - ember-beta
           - ember-canary
-          # - embroider-safe
-          # - embroider-optimized
+          - embroider-safe
+          - embroider-optimized
     steps:
       - uses: actions/checkout@v2
       - uses: volta-cli/action@v1
diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml
deleted file mode 100644
index 6c5f48730..000000000
--- a/.github/workflows/types.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-name: "Types"
-on:
-  pull_request:
-  push:
-    # filtering branches here prevents duplicate builds from pull_request and push
-    branches:
-      - main
-      - master
-
-env:
-  CI: true
-
-jobs:
-  install_dependencies:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: Install Dependencies
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: volta-cli/action@v1
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-    - run: yarn install
-
-  types:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: "Type Correctness"
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs: [install_dependencies]
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: volta-cli/action@v1
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-    - run: yarn build:types
-      working-directory: ./ember-resources
-    # - run: npm run prepack
-    # - run: yarn tsc --build
-    # - run: npm run prepack
-    # - run: npm exec tsc --build
-
-  types_concurrency_1:
-    if: "! contains(toJSON(github.event.commits.*.message), '[skip ci]')"
-    name: "Type Correctness (w/ concurrency@v1)"
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    needs: [install_dependencies]
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: volta-cli/action@v1
-    - uses: actions/cache@v2
-      with:
-        path: '**/node_modules'
-        key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}
-    - run: |
-        cd ember-resources
-        yarn build:types
-        cd ../testing/ember-concurrency-v1/
-        tsc --build
diff --git a/ember-resources/package.json b/ember-resources/package.json
index ca15dcd55..0b0122fd2 100644
--- a/ember-resources/package.json
+++ b/ember-resources/package.json
@@ -7,7 +7,6 @@
   "description": "An implementation of Resources with some helpful utilities",
   "repository": "https://github.com/NullVoxPopuli/ember-resources",
   "license": "MIT",
-  "type": "module",
   "main": "dist/index.js",
   "types": "declarations",
   "author": "NullVoxPopuli",
@@ -26,7 +25,6 @@
     "start": "rollup -c --watch",
     "build": "FORCE_COLOR=1 npm-run-all --aggregate-output --parallel \"build:*\"",
     "build:js": "rollup -c",
-    "build:types": "tsc --build",
     "build:docs": "cp ../README.md ./README.md",
     "lint": "FORCE_COLOR=1 npm-run-all --aggregate-output --continue-on-error --parallel \"lint:!(fix)\"",
     "lint:fix": "FORCE_COLOR=1 npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
@@ -40,9 +38,7 @@
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.2.0",
-    "@embroider/macros": "^1.2.0"
-  },
-  "peerDependencies": {
+    "@embroider/macros": "^1.2.0",
     "@ember/test-waiters": "^3.0.0"
   },
   "devDependencies": {
diff --git a/testing/ember-app/package.json b/testing/ember-app/package.json
index f18e63c34..2bfd93616 100644
--- a/testing/ember-app/package.json
+++ b/testing/ember-app/package.json
@@ -24,6 +24,7 @@
   },
   "dependencies": {
     "@embroider/macros": "^1.2.0",
+    "@ember/test-waiters": "^3.0.1",
     "ember-concurrency": "^2.0.0",
     "ember-concurrency-ts": "^0.3.1",
     "ember-resources": "*"
@@ -31,7 +32,6 @@
   "devDependencies": {
     "@ember/optional-features": "^2.0.0",
     "@ember/test-helpers": "^2.6.0",
-    "@ember/test-waiters": "^3.0.1",
     "@embroider/test-setup": "^1.2.0",
     "@glimmer/component": "^1.0.4",
     "@glimmer/tracking": "^1.0.4",