diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ddf0a206c..ddf2759ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,18 +1,17 @@
-name: CI
+name: tests
 
 on:
   push:
     branches:
-      - main
-      - '*x'
+      - master
+      - '*.x'
     tags:
       - '*'
   pull_request:
-    branches:
-      - main
   schedule:
     # Weekly Monday 9AM build
-    - cron: "0 9 * * 1"
+    # * is a special character in YAML so you have to quote this string
+    - cron: '0 9 * * 1'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -30,25 +29,21 @@ jobs:
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - linux: test-oldestdeps-cov-xdist
-          python-version: 3.9
-        - linux: test-xdist
-          python-version: '3.9'
-        - linux: test-xdist
-          python-version: '3.10'
-        - linux: test-xdist
-          python-version: '3.11'
-        - macos: test-xdist
-          python-version: '3.11'
-        - linux: test-cov-xdist
-          coverage: 'codecov'
+        - linux: py39-oldestdeps-cov-xdist
+        - linux: py39-xdist
+        - linux: py310-xdist
+        - linux: py311-xdist
+        - macos: py311-xdist
+        - linux: py3-xdist-cov
+          coverage: codecov
   test_downstream:
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       setenv: |
         CRDS_PATH: /tmp/crds_cache
         CRDS_CLIENT_RETRY_COUNT: 3
         CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
       envs: |
-        - linux: test-jwst-cov-xdist
-        - linux: test-romancal-cov-xdist
+        - linux: py3-jwst-cov-xdist
+        - linux: py3-romancal-cov-xdist
+
diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml
index 43ac55469..75680102c 100644
--- a/.github/workflows/ci_cron.yml
+++ b/.github/workflows/ci_cron.yml
@@ -1,4 +1,4 @@
-name: Weekly cron
+name: scheduled tests
 
 on:
   schedule:
@@ -6,13 +6,20 @@ on:
     - cron: "0 0 * * 1"
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   test:
+    if: (github.repository == 'spacetelescope/stdatamodels' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run scheduled tests')))
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
     with:
       envs: |
-        - macos: test-xdist
-          python-version: 3.9
-        - macos: test-xdist
-          python-version: 3.10
-        - linux: test-devdeps-xdist
+        - macos: py39-xdist
+        - windows: py39-xdist
+        - macos: py310-xdist
+        - windows: py310-xdist
+        - windows: py311-xdist
+        - windows: py3-xdist
+
diff --git a/.github/workflows/tests_devdeps.yml b/.github/workflows/tests_devdeps.yml
new file mode 100644
index 000000000..daf9a4610
--- /dev/null
+++ b/.github/workflows/tests_devdeps.yml
@@ -0,0 +1,38 @@
+name: tests with development versions
+
+on:
+  push:
+    branches:
+      - master
+      - '*.x'
+    tags:
+      - '*'
+  pull_request:
+  schedule:
+    # Weekly Monday 9AM build
+    # * is a special character in YAML so you have to quote this string
+    - cron: '0 9 * * 1'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test:
+    if: (github.repository == 'spacetelescope/stdatamodels' && (github.event_name == 'schedule' || github.event_name == 'push' || github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'run devdeps tests')))
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    with:
+      envs: |
+        - linux: py3-devdeps-xdist
+  test_downstream:
+    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
+    with:
+      setenv: |
+        CRDS_PATH: /tmp/crds_cache
+        CRDS_CLIENT_RETRY_COUNT: 3
+        CRDS_CLIENT_RETRY_DELAY_SECONDS: 20
+      envs: |
+        - linux: py3-jwst-devdeps-xdist
+        - linux: py3-romancal-devdeps-xdist
+