diff --git a/pipelines/pulpcore/01-boxes.yml b/pipelines/pulpcore/01-boxes.yml
index e9db3f783..de38b7b2d 100644
--- a/pipelines/pulpcore/01-boxes.yml
+++ b/pipelines/pulpcore/01-boxes.yml
@@ -3,7 +3,6 @@
   hosts: localhost
   become: False
   vars_files:
-    - ../vars/install_base.yml
-    - ../vars/forklift_{{ pipeline_type }}.yml
+    - ../vars/forklift_pulpcore.yml
   roles:
     - forklift
diff --git a/pipelines/pulpcore/02-install.yml b/pipelines/pulpcore/02-install.yml
index 1398a9360..6400e8867 100644
--- a/pipelines/pulpcore/02-install.yml
+++ b/pipelines/pulpcore/02-install.yml
@@ -2,11 +2,9 @@
 - name: Enable Postgresql 12 module if necessary
   become: True
   hosts:
-   - "{{ forklift_server_name }}"
+   - "{{ forklift_name }}"
   vars_files:
-    - ../vars/install_base.yml
-    - ../vars/forklift_{{ pipeline_type }}.yml
-
+    - ../vars/forklift_pulpcore.yml
   tasks:
   - name: Enable postgresql 12 module
     ansible.builtin.dnf:
@@ -14,7 +12,7 @@
       state: present
     when:
      - pipeline_version is defined
-     - pipeline_version == 'nightly' or pipeline_version is version('3.28', '>=')
+     - pipeline_version != 'nightly' or pipeline_version is version('3.40', '<')
      - pipeline_os is defined
      - pipeline_os is search("centos8-stream")
 
@@ -24,17 +22,37 @@
   become: True
   vars_files:
     - ../vars/install_base.yml
-    - ../vars/forklift_{{ pipeline_type }}.yml
+    - ../vars/forklift_pulpcore.yml
   environment:
     DJANGO_SETTINGS_MODULE: pulpcore.app.settings
   pre_tasks:
-    - when: pipeline_version != 'nightly' and pipeline_version is version('3.28', '<=' )
+    - when: pipeline_version != 'nightly' and pipeline_version is version('3.28', '==' )
       set_fact:
         pulp_pkg_repo: "http://koji.katello.org/releases/yum/pulpcore-{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/"
-    - when: pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=')
+    - when: pipeline_version != 'nightly' and pipeline_version is version('3.39', '==')
       set_fact:
         pulp_pkg_repo: "https://stagingyum.theforeman.org/pulpcore/{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/$basearch/"
         pulp_pkg_name_prefix: "python3.11-"
   roles:
-    - epel_repositories
-    - pulp.pulp_installer.pulp_all_services
+    - role: epel_repositories
+      when:
+        - pipeline_version is defined
+        - pipeline_version != 'nightly' and pipeline_version is version('3.28', '==' )
+    - role: pulp.pulp_installer.pulp_all_services
+      when:
+        - pipeline_version is defined
+        - pipeline_version != 'nightly' or pipeline_version is version('3.39', '==')
+
+- name: Setup git repo
+  become: True
+  hosts:
+   - "{{ forklift_name }}"
+  vars_files:
+    - ../vars/forklift_pulpcore.yml
+  vars:
+    beaker_puppet_module: "puppet-pulpcore"
+  roles:
+    - role: beaker
+      when:
+        - pipeline_version is defined
+        - pipeline_version == 'nightly' or pipeline_version is version('3.40', '>=')
diff --git a/pipelines/pulpcore/03-tests.yml b/pipelines/pulpcore/03-tests.yml
index 32f8f766d..e996601ab 100644
--- a/pipelines/pulpcore/03-tests.yml
+++ b/pipelines/pulpcore/03-tests.yml
@@ -1,10 +1,32 @@
 ---
-- name: run tests
+- name: run tests beaker
+  become: True
   hosts:
-    - "{{ forklift_server_name }}"
+   - "{{ forklift_name }}"
+  vars_files:
+    - ../vars/forklift_pulpcore.yml
+  tasks:
+    - name: Run acceptance tests
+      ansible.builtin.include_role:
+        name: beaker
+        tasks_from: test
+      when:
+        - pipeline_version == 'nightly' or pipeline_version is version('3.40, '>=' )
+      vars:
+        beaker_puppet_module: "puppet-pulpcore"
+        beaker_os: "{{ pipeline_os.replace('-stream', '') }}"
+        beaker_environment:
+          BEAKER_FACTER_PULPCORE_BASEURL: "https://stagingyum.theforeman.org/pulpcore/{{ pipeline_version }}/el{{ ansible_distribution_major_version }}/x86_64"
+
+- name: run tests ansible
   become: True
+  hosts:
+   - "{{ forklift_name }}"
   vars_files:
     - ../vars/install_base.yml
-    - ../vars/forklift_{{ pipeline_type }}.yml
+    - ../vars/forklift_pulpcore.yml
   roles:
-    - pulp.pulp_installer.pulp_health_check
+    - role: pulp.pulp_installer.pulp_health_check
+      when:
+        - pipeline_version is defined
+        - pipeline_version != 'nightly' or pipeline_version is version('3.39', '<=' )
diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml
index 8bb7760b0..045ef527c 100644
--- a/pipelines/vars/forklift_pulpcore.yml
+++ b/pipelines/vars/forklift_pulpcore.yml
@@ -1,9 +1,11 @@
+forklift_name: "pipe-pulpcore-{{ pipeline_version }}-{{ pipeline_os }}"
+
 server_box:
   box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 4680
 
 forklift_boxes:
-  "{{ {forklift_server_name: server_box} }}"
+  "{{ {forklift_name: server_box} }}"
 
 pulp_install_source: packages
 pulp_pkg_repo_gpgcheck: False
diff --git a/playbooks/setup_forklift.yml b/playbooks/setup_forklift.yml
index 4c14aec86..dda20fba7 100644
--- a/playbooks/setup_forklift.yml
+++ b/playbooks/setup_forklift.yml
@@ -80,7 +80,7 @@
       retries: 3
       when: forklift_install_from_galaxy
 
-    - name: 'Install Forklift Pulp collection dependencies for <3.17'
+    - name: 'Install Forklift Pulp collection dependencies for 3.28'
       command:
         cmd: ansible-galaxy collection install -r requirements-pulp.yml
         chdir: "{{ forklift_dest }}"
@@ -88,33 +88,19 @@
         - forklift_install_pulp_from_galaxy
         - pipeline_version is defined
         - pipeline_version != 'nightly'
-        - pipeline_version is version('3.17', '<=')
+        - pipeline_version is version('3.28', '==')
       retries: 3
       register: result
       until: result is succeeded
 
-    - name: 'Install Forklift Pulp collection dependencies for >3.18'
-      command:
-        cmd: ansible-galaxy collection install -r requirements-pulp-322.yml
-        chdir: "{{ forklift_dest }}"
-      when:
-        - forklift_install_pulp_from_galaxy
-        - pipeline_version is defined
-        - pipeline_version != 'nightly'
-        - pipeline_version is version('3.18', '>=')
-        - pipeline_version is version('3.39', '<')
-      retries: 3
-      register: result
-      until: result is succeeded
-
-    - name: 'Install Forklift Pulp collection dependencies for >3.39'
+    - name: 'Install Forklift Pulp collection dependencies for 3.39'
       command:
         cmd: ansible-galaxy collection install -r requirements-pulp-339.yml
         chdir: "{{ forklift_dest }}"
       when:
         - forklift_install_pulp_from_galaxy
         - pipeline_version is defined
-        - pipeline_version == 'nightly' or pipeline_version is version('3.39', '>=')
+        - pipeline_version is version('3.39', '==')
       retries: 3
       register: result
       until: result is succeeded
diff --git a/requirements-pulp-322.yml b/requirements-pulp-322.yml
deleted file mode 100644
index e4d49fa6d..000000000
--- a/requirements-pulp-322.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-collections:
-  - name: pulp.pulp_installer
-    version: 3.22.0
diff --git a/requirements-pulp.yml b/requirements-pulp.yml
index e096d9a2b..e4d49fa6d 100644
--- a/requirements-pulp.yml
+++ b/requirements-pulp.yml
@@ -1,3 +1,3 @@
 collections:
   - name: pulp.pulp_installer
-    version: 3.15.9-4
+    version: 3.22.0