diff --git a/Gemfile b/Gemfile
index 60f2000..bbd08ed 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,8 @@ group :system_tests do
   gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-docker"
-  gem "beaker-puppet"
+  gem "beaker-docker", git: 'https://github.com/treydock/beaker-docker.git', branch: 'amazon-2023'
+  gem "beaker-puppet", git: 'https://github.com/puppetlabs/beaker-puppet.git', ref: '6063d22b6c4449df795731f5853c3c75241240c4'
   gem "beaker-puppet_install_helper",                                            require: false
   gem "beaker-module_install_helper",                                            require: false
 end
diff --git a/spec/acceptance/nodesets/amazon2023.yml b/spec/acceptance/nodesets/amazon2023.yml
index 12447bd..2ea704c 100644
--- a/spec/acceptance/nodesets/amazon2023.yml
+++ b/spec/acceptance/nodesets/amazon2023.yml
@@ -2,9 +2,7 @@ HOSTS:
   amazon-2023:
     roles:
       - agent
-    # Update to non-hack version once beaker-docker supports Amazon
-    # platform: amazon-2023-x86_64
-    platform: el-2023-x86_64
+    platform: amazon-2023-x86_64
     hypervisor: docker
     image: amazonlinux:2023
     docker_preserve_image: true