diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8a077911..b57a4b3a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,6 +13,9 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@env
     with:
       pidfile_workaround: 'false'
+      beaker_hypervisor: 'hcloud'
+    secrets:
+      beaker_hcloud_token: '${{ secrets.BEAKER_HCLOUD_TOKEN }}'
diff --git a/Gemfile b/Gemfile
index db21d3b5..fbd3b5ea 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,6 +17,8 @@ end
 
 group :system_tests do
   gem 'voxpupuli-acceptance', '~> 2.0',  :require => false
+  gem 'beaker-hcloud', git: 'https://github.com/bastelfreak/beaker-hcloud', branch: 'hcloud12'
+  gem 'hcloud', git: 'https://github.com/bastelfreak/hcloud-ruby', branch: 'dep'
 end
 
 group :release do