diff --git a/defaults/main.yml b/defaults/main.yml
index defc4f15..31c250e8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -407,7 +407,7 @@ octavia_client_cert: "{{ octavia_cert_dir }}/client.pem"
 octavia_server_ca: "{{ octavia_ca_certificate }}"
 # ca certs
 octavia_ca_private_key: "{{ octavia_cert_dir }}/private/cakey.pem"
-octavia_ca_private_key_passphrase: "{{ octavia_cert_password_client }}"
+octavia_ca_private_key_passphrase: "{{ octavia_cert_client_password }}"
 octavia_ca_certificate: "{{ octavia_cert_dir }}/ca_server_01.pem"
 octavia_signing_digest: sha256
 
diff --git a/tasks/octavia_certs_install.yml b/tasks/octavia_certs_install.yml
index 18beab26..ab84012e 100644
--- a/tasks/octavia_certs_install.yml
+++ b/tasks/octavia_certs_install.yml
@@ -47,7 +47,7 @@
     - name: Create the client CAs private key
       openssl_privatekey:
         path: "{{ octavia_client_ca_key }}"
-        passphrase: "{{ octavia_cert_password_client }}"
+        passphrase: "{{ octavia_cert_client_password }}"
         cipher: "{{ octavia_cert_cipher_client }}"
         size: "{{ octavia_cert_key_length_client }}"
 
@@ -56,13 +56,13 @@
         path: "{{ octavia_cert_dir }}/ca_01.csr"
         common_name: "{{ octavia_cert_client_ca_common_name }}"
         privatekey_path: "{{ octavia_client_ca_key }}"
-        privatekey_passphrase: "{{ octavia_cert_password_client }}"
+        privatekey_passphrase: "{{ octavia_cert_client_password }}"
 
     - name: Create client CA certificate
       openssl_certificate:
         path: "{{ octavia_client_ca }}"
         privatekey_path: "{{ octavia_client_ca_key }}"
-        privatekey_passphrase: "{{ octavia_cert_password_client }}"
+        privatekey_passphrase: "{{ octavia_cert_client_password }}"
         csr_path: "{{ octavia_cert_dir }}/ca_01.csr"
         provider: selfsigned
         owner: "{{ lookup('env', 'USER') }}"
diff --git a/tests/os_octavia-overrides.yml b/tests/os_octavia-overrides.yml
index de997dc5..c414a903 100644
--- a/tests/os_octavia-overrides.yml
+++ b/tests/os_octavia-overrides.yml
@@ -100,5 +100,5 @@ octavia_compute_driver: "{% if test_octavia_amphora | bool %}compute_nova_driver
 octavia_network_driver: "{% if test_octavia_amphora | bool %}allowed_address_pairs_driver{% else %}network_noop_driver{% endif %}"
 
 # cert generation
-octavia_cert_password_client: 'changeme'
+octavia_cert_client_password: 'changeme'