diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb93ffb..75187d1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        foreman-core-branch: [3.1-stable, 3.2-stable, 3.3-stable, 3.4-stable, develop]
+        foreman-core-branch:
+          - 3.1-stable
+          - 3.2-stable
+          - 3.3-stable
+          - 3.4-stable
+          - 3.5-stable
+          - 3.6-stable
+          - 3.7-stable
+          - 3.8-stable
+          - 3.9-stable
+          - develop
         ruby-version: [2.7]
         node-version: [14]
         include:
@@ -31,6 +41,21 @@ jobs:
           - foreman-core-branch: 3.4-stable
             foreman-puppet-version: 4.1.1
             foreman-tasks-version: 7.2.1
+          - foreman-core-branch: 3.5-stable
+            foreman-puppet-version: 5.1.3
+            foreman-tasks-version: 7.2.1
+          - foreman-core-branch: 3.6-stable
+            foreman-puppet-version: 5.1.3
+            foreman-tasks-version: 7.2.1
+          - foreman-core-branch: 3.7-stable
+            foreman-puppet-version: 6.2.0
+            foreman-tasks-version: 8.3.3
+          - foreman-core-branch: 3.8-stable
+            foreman-puppet-version: 6.2.0
+            foreman-tasks-version: 8.3.3
+          - foreman-core-branch: 3.9-stable
+            foreman-puppet-version: 6.2.0
+            foreman-tasks-version: 9.0.2
           - foreman-core-branch: develop
             foreman-puppet-version: 6.2.0
             foreman-tasks-version: 9.0.2
@@ -73,7 +98,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
-          node-version:  ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
       - name: Add foreman_puppet
         working-directory: foreman
         run: echo "gem 'foreman_puppet', '~> ${{ matrix.foreman-puppet-version }}'" > bundler.d/foreman_puppet.local.rb