diff --git a/playbooks/roles/create-stack/tasks/create-stack.yml b/playbooks/roles/create-stack/tasks/create-stack.yml
index 546fd40..116b90b 100644
--- a/playbooks/roles/create-stack/tasks/create-stack.yml
+++ b/playbooks/roles/create-stack/tasks/create-stack.yml
@@ -19,7 +19,7 @@
 
 - name: Set keypair name
   set_fact:
-    keypair_name: "keypair-{{ stack_name }}"
+    keypair_name: "keypair-{{ stack_name | regex_replace('\\.', '_') }}"
 
 - name: Delete keypair '{{ keypair_name }}'
   os_keypair: