diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bf6996..4cef426 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,6 +11,29 @@ on:
     branches:
       - main
       - master
+  workflow_dispatch:
+    inputs:
+      staging_url:
+        description: |-
+          URL to a staging Server to test unreleased packages.
+          We will append the version to the Server and assume all packages are in the same directory.
+          Only supported for AIO packages.
+        required: false
+        type: string
+        default: 'https://artifacts.voxpupuli.org/openvox-agent'
+      collection:
+        description: |-
+          When set to staging, we will download the packages from staging_url.
+          Otherwise we will use the official repos. Supported values: puppet7, puppet8, openvox7, openvox8, staging.
+          When unset, we will generate a list of supported collections based on metadata.json.
+        required: false
+        type: string
+      version:
+        description: |-
+          The package version we want to test.
+          Only used for collection = staging
+        required: false
+        type: string
 
 concurrency:
   group: ${{ github.ref_name }}
@@ -22,4 +45,8 @@ permissions:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v4
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@staging
+    with:
+      beaker_staging_url: ${{ inputs.staging_url }}
+      beaker_collection: ${{ inputs.collecton }}
+      beaker_version: ${{ inputs.version }}
diff --git a/Gemfile b/Gemfile
index 5f69bec..056bd09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,7 +14,9 @@ group :development do
 end
 
 group :system_tests do
-  gem 'voxpupuli-acceptance', '~> 4.0',  :require => false
+  gem 'beaker_puppet_helpers', github: 'bastelfreak/beaker_puppet_helpers', branch: 'staging'
+  #gem 'voxpupuli-acceptance', '~> 4.0',  :require => false
+  gem 'voxpupuli-acceptance', github: 'bastelfreak/voxpupuli-acceptance', branch: 'staging'
 end
 
 group :release do