diff --git a/.github/workflows/ruby_tests.yml b/.github/workflows/ruby_tests.yml
index c2fa383f..9af4eaaf 100644
--- a/.github/workflows/ruby_tests.yml
+++ b/.github/workflows/ruby_tests.yml
@@ -1,97 +1,30 @@
 name: Ruby Testing
+
 on:
   pull_request:
   push:
     branches:
-    - master
-env:
-  RAILS_ENV: test
-  DATABASE_URL: postgresql://postgres:@localhost/test
-  DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL: true
+      - 'master'
+
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   rubocop:
+    uses: theforeman/actions/.github/workflows/rubocop.yml@v0
+    with:
+      command: bundle exec rubocop -P --format github
+      
+  test:
+    name: Ruby
+    needs: rubocop
     runs-on: ubuntu-latest
+
     env:
       BUNDLE_FOREMAN: '0'
-      BUNDLE_WITHOUT: development:test
-    steps:
-      - uses: actions/checkout@v2
-      - 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
-  test_ruby:
-    runs-on: ubuntu-latest
-    needs: rubocop
-    env:
-      BUNDLE_WITHOUT: journald:development:console:libvirt
-    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: true
-      matrix:
-        foreman-repo: [theforeman/foreman]
-        foreman-core-branch: [develop]
-        ruby-version: [2.7]
-        node-version: [12]
+
     steps:
-      - run: |
-          sudo apt-get update
-          sudo apt-get install build-essential libcurl4-openssl-dev zlib1g-dev libpq-dev
-      - name: Install chromedriver
-        uses: nanasess/setup-chromedriver@master
-      - uses: actions/checkout@v2
-        with:
-          repository: ${{ matrix.foreman-repo }}
-          ref: ${{ matrix.foreman-core-branch }}
-      - uses: actions/checkout@v2
-        with:
-          path: foreman_puppet
-      - name: Setup Bundler
-        run: |
-          echo "gem 'foreman_puppet', path: './foreman_puppet'" > bundler.d/foreman_puppet.local.rb
-      - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-      - name: Setup Node
-        if: github.event_name != 'push'
-        uses: actions/setup-node@v1
-        with:
-          node-version:  ${{ matrix.node-version }}
-      - name: Prepare test DB
-        if: github.event_name != 'push'
-        run: |
-          bundle exec rake db:create
-          bundle exec rake db:migrate
-      - name: Restore NPMs
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-modules-${{ matrix.node-version }}-${{ hashFiles('package.json') }}
-      - name: Prepare webpack
-        if: github.event_name != 'push'
-        run: |
-          npm install
-          bundle exec rake webpack:compile
-      - name: Run plugin tests
-        if: github.event_name != 'push'
-        run: |
-          bundle exec rake test:foreman_puppet
-      - name: Run access permission test
-        if: ${{ github.event_name != 'push' }}
-        run: |
-          bundle exec rake test TEST="test/unit/foreman/access_permissions_test.rb"
-      - name: Upload test.log
-        uses: actions/upload-artifact@v2
-        if: failure() && github.event_name != 'push'
-        with:
-          name: log
-          path: log/test.log
+    - uses: theforeman/actions/.github/workflows/foreman_plugin.yml@v0
+      with:
+        plugin: foreman_puppet
diff --git a/Gemfile b/Gemfile
index 26ea0817..f73449ce 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,21 +1,4 @@
-if ENV.fetch('BUNDLE_FOREMAN', '1') == '0'
-  source 'https://rubygems.org'
-else
-  foreman_path = Dir['./foreman', '../foreman', '../../foreman']
-  foreman_path.map! { |path| File.join(path, 'Gemfile') }
-  foreman_gemfile = foreman_path.detect { |p| File.exist?(p) }
-  raise 'Foreman have not been found!' unless foreman_gemfile
-
-  foreman_gemfile = File.expand_path(foreman_gemfile)
-  eval_gemfile foreman_gemfile
-
-  # remove deps, we want to redefine
-  temporary_deletes = %w[theforeman-rubocop]
-  temporary_deletes.concat(%w[foreman_puppet]).each do |dep_name|
-    dep = dependencies.detect { |d| d.name == dep_name }
-    dependencies.delete(dep) if dep
-  end
-end
+source 'https://rubygems.org'
 
 gemspec