diff --git a/lib/beaker-hostgenerator/hypervisor.rb b/lib/beaker-hostgenerator/hypervisor.rb
index 30bb69ad..0dbedac5 100644
--- a/lib/beaker-hostgenerator/hypervisor.rb
+++ b/lib/beaker-hostgenerator/hypervisor.rb
@@ -39,12 +39,16 @@ def self.create(node_info, options)
     #                                                and their implementations.
     def self.builtin_hypervisors
       {
-        'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
-        'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant,
-        'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant,
-        'docker' => BeakerHostGenerator::Hypervisor::Docker,
         'abs' => BeakerHostGenerator::Hypervisor::ABS,
+        'container' => BeakerHostGenerator::Hypervisor::Docker,
+        'container_docker' => BeakerHostGenerator::Hypervisor::Docker,
+        'container_swarm' => BeakerHostGenerator::Hypervisor::Docker,
+        'docker' => BeakerHostGenerator::Hypervisor::Docker,
+        'docker_podman' => BeakerHostGenerator::Hypervisor::Docker,
         'hcloud' => BeakerHostGenerator::Hypervisor::Hcloud,
+        'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant,
+        'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant,
+        'vmpooler' => BeakerHostGenerator::Hypervisor::Vmpooler,
       }
     end