diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
index 4ad9b06c6d4..1c69ae90d0a 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_instance.py
@@ -892,7 +892,7 @@ def main():
         disk_size = dict(type='int', default=None),
         root_disk_size = dict(type='int', default=None),
         keyboard = dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us'], default=None),
-        hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM', 'Simulator'], default=None),
+        hypervisor = dict(choices=CS_HYPERVISORS, default=None),
         security_groups = dict(type='list', aliases=[ 'security_group' ], default=[]),
         affinity_groups = dict(type='list', aliases=[ 'affinity_group' ], default=[]),
         domain = dict(default=None),
diff --git a/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py b/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
index 98af6e2ae7d..221519a8f77 100644
--- a/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
+++ b/lib/ansible/modules/extras/cloud/cloudstack/cs_template.py
@@ -592,9 +592,9 @@ def main():
         is_routing = dict(type='bool', choices=BOOLEANS, default=False),
         checksum = dict(default=None),
         template_filter = dict(default='self', choices=['featured', 'self', 'selfexecutable', 'sharedexecutable', 'executable', 'community']),
-        hypervisor = dict(choices=['KVM', 'VMware', 'BareMetal', 'XenServer', 'LXC', 'HyperV', 'UCS', 'OVM', 'Simulator'], default=None),
-        requires_hvm = dict(type='bool', choices=BOOLEANS, default=False),
-        password_enabled = dict(type='bool', choices=BOOLEANS, default=False),
+        hypervisor = dict(choices=CS_HYPERVISORS, default=None),
+        requires_hvm = dict(type='bool', default=False),
+        password_enabled = dict(type='bool', default=False),
         template_tag = dict(default=None),
         sshkey_enabled = dict(type='bool', choices=BOOLEANS, default=False),
         format = dict(choices=['QCOW2', 'RAW', 'VHD', 'OVA'], default=None),