diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index badad1f..38af696 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,70 +1,35 @@
+---
 name: CI
-on: [push, pull_request]
-env:
-  RAILS_ENV: test
-  DATABASE_URL: postgresql://postgres:@localhost/test
-  DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
+
+on:
+  pull_request:
+  push:
+    branch:
+      - master
+      - '*-stable'
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   rubocop:
-    runs-on: ubuntu-latest
-    env:
-      BUNDLE_WITHOUT: development:test
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 2.7
-          bundler-cache: true
-      - name: Run rubocop
-        run: bundle exec rubocop -P --format github
+    name: Rubocop
+    uses: theforeman/actions/.github/workflows/rubocop.yml@v0
+    with:
+      command: bundle exec rubocop --parallel --format github
+
   test:
-    runs-on: ubuntu-latest
+    name: Ruby
     needs: rubocop
-    services:
-      postgres:
-        image: postgres:12.1
-        ports: ['5432:5432']
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     strategy:
       fail-fast: false
       matrix:
-        foreman-core-branch: [3.0-stable, 3.1-stable, 3.2-stable, 3.3-stable, 3.4-stable, 3.5-stable, develop]
-        ruby-version: [2.7]
-        node-version: [14]
-    steps:
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install build-essential libcurl4-openssl-dev libvirt-dev ruby-libvirt zlib1g-dev libpq-dev
-      - uses: actions/checkout@v3
-        with:
-          repository: theforeman/foreman
-          ref: ${{ matrix.foreman-core-branch }}
-      - uses: actions/checkout@v3
-        with:
-          path: foreman_expire_hosts
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version:  ${{ matrix.node-version }}
-      - name: Setup Plugin
-        run: |
-          echo "gem 'foreman_expire_hosts', path: './foreman_expire_hosts'" > bundler.d/foreman_expire_hosts.local.rb
-          gem install bundler
-          bundle config set without journald development console mysql2 sqlite
-          bundle install --jobs=3 --retry=3
-          bundle exec rake db:create
-          bundle exec rake db:migrate
-          npm install
-          bundle exec rake webpack:compile
-      - name: Run plugin tests
-        run: bundle exec rake test:foreman_expire_hosts
-      - name: Precompile plugin assets
-        run: bundle exec rake 'plugin:assets:precompile[foreman_expire_hosts]'
-        env:
-          RAILS_ENV: production
+        foreman:
+          - 'develop'
+          - '3.9-stable'
+          - '3.8-stable'
+    uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0
+    with:
+      plugin: foreman_expire_hosts
+      foreman_version: ${{ matrix.foreman }}
diff --git a/test/helpers/hosts_helper_test.rb b/test/helpers/hosts_helper_test.rb
index 0ef2d54..174ca60 100644
--- a/test/helpers/hosts_helper_test.rb
+++ b/test/helpers/hosts_helper_test.rb
@@ -5,7 +5,11 @@
 class HostsHelperTest < ActionView::TestCase
   include HostsHelper
   include HostDescriptionHelper
-  include PuppetRelatedHelper
+  # Foreman 3.7 dropped this via
+  # https://github.com/theforeman/foreman/commit/6cdb8c7a9ebd790537510213e43537a4a87189d6
+  # Foreman 3.9 bought it back via
+  # https://github.com/theforeman/foreman/commit/37a99c70ebd9e4d6f03af546dfe36e7678e2bcf3
+  include PuppetRelatedHelper if defined?(PuppetRelatedHelper)
   include ForemanExpireHosts::HostsHelper
   include ApplicationHelper