diff --git a/.gitlab-ci/molecule.yml b/.gitlab-ci/molecule.yml
index e8efbaa3f..68d847444 100644
--- a/.gitlab-ci/molecule.yml
+++ b/.gitlab-ci/molecule.yml
@@ -33,7 +33,7 @@ molecule:
       - container-engine/gvisor
       - container-engine/kata-containers
       - adduser
-      - bastion-ssh-config
+      - bastion_ssh_config
       - bootstrap_os
 
 molecule_full:
diff --git a/extra_playbooks/upgrade-only-k8s.yml b/extra_playbooks/upgrade-only-k8s.yml
index 5312c6605..bc86efc9a 100644
--- a/extra_playbooks/upgrade-only-k8s.yml
+++ b/extra_playbooks/upgrade-only-k8s.yml
@@ -15,7 +15,7 @@
   gather_facts: false
   roles:
     - { role: kubespray_defaults}
-    - { role: bastion-ssh-config, tags: ["localhost", "bastion"]}
+    - { role: bastion_ssh_config, tags: ["localhost", "bastion"]}
 
 - name: Bootstrap hosts OS for Ansible
   hosts: k8s_cluster:etcd:calico_rr
diff --git a/playbooks/boilerplate.yml b/playbooks/boilerplate.yml
index f540ff7c5..7c0448e1f 100644
--- a/playbooks/boilerplate.yml
+++ b/playbooks/boilerplate.yml
@@ -20,4 +20,4 @@
   environment: "{{ proxy_disable_env }}"
   roles:
     - { role: kubespray_defaults }
-    - { role: bastion-ssh-config, tags: ["localhost", "bastion"] }
+    - { role: bastion_ssh_config, tags: ["localhost", "bastion"] }
diff --git a/roles/bastion-ssh-config/defaults/main.yml b/roles/bastion_ssh_config/defaults/main.yml
similarity index 100%
rename from roles/bastion-ssh-config/defaults/main.yml
rename to roles/bastion_ssh_config/defaults/main.yml
diff --git a/roles/bastion-ssh-config/molecule/default/converge.yml b/roles/bastion_ssh_config/molecule/default/converge.yml
similarity index 91%
rename from roles/bastion-ssh-config/molecule/default/converge.yml
rename to roles/bastion_ssh_config/molecule/default/converge.yml
index e6531b652..67dbf4089 100644
--- a/roles/bastion-ssh-config/molecule/default/converge.yml
+++ b/roles/bastion_ssh_config/molecule/default/converge.yml
@@ -4,7 +4,7 @@
   become: true
   gather_facts: false
   roles:
-    - role: bastion-ssh-config
+    - role: bastion_ssh_config
   tasks:
     - name: Copy config to remote host
       copy:
diff --git a/roles/bastion-ssh-config/molecule/default/molecule.yml b/roles/bastion_ssh_config/molecule/default/molecule.yml
similarity index 100%
rename from roles/bastion-ssh-config/molecule/default/molecule.yml
rename to roles/bastion_ssh_config/molecule/default/molecule.yml
diff --git a/roles/bastion-ssh-config/tasks/main.yml b/roles/bastion_ssh_config/tasks/main.yml
similarity index 100%
rename from roles/bastion-ssh-config/tasks/main.yml
rename to roles/bastion_ssh_config/tasks/main.yml
diff --git a/roles/bastion-ssh-config/templates/ssh-bastion.conf.j2 b/roles/bastion_ssh_config/templates/ssh-bastion.conf.j2
similarity index 100%
rename from roles/bastion-ssh-config/templates/ssh-bastion.conf.j2
rename to roles/bastion_ssh_config/templates/ssh-bastion.conf.j2