diff --git a/tripleo_ansible/playbooks/octavia-files.yaml b/tripleo_ansible/playbooks/octavia-files.yaml
index ce09973f2..2961fcbcd 100644
--- a/tripleo_ansible/playbooks/octavia-files.yaml
+++ b/tripleo_ansible/playbooks/octavia-files.yaml
@@ -79,9 +79,9 @@
     octavia_confd_prefix: "/var/lib/config-data/puppet-generated/octavia"
     lb_mgmt_net_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_net_id'] }}"
     lb_mgmt_secgroup_id: "{{ hostvars[groups['octavia_nodes'][0]]['lb_mgmt_secgroup_id'] }}"
-    private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
-    ca_cert_content: "{{ hostvars[groups['octavia_nodes'][0]]['ca_cert_content'] | default('') }}"
-    service_pem_content: "{{ hostvars[groups['octavia_nodes'][0]]['service_pem_content'] | default('') }}"
+    updated_private_key_content: "{{ hostvars[groups['octavia_nodes'][0]]['private_key_content'] | default('') }}"
+    updated_ca_cert_content: "{{ hostvars[groups['octavia_nodes'][0]]['ca_cert_content'] | default('') }}"
+    updated_service_pem_content: "{{ hostvars[groups['octavia_nodes'][0]]['service_pem_content'] | default('') }}"
     update_certs: "{{ hostvars[groups['octavia_nodes'][0]]['update_certs'] | default(true) }}"
     generate_certs: "{{ generate_certs }}"
     ca_cert_path: "{{ ca_cert_path }}"
diff --git a/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml b/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml
index 18a2fd0c8..b1be801ef 100644
--- a/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml
+++ b/tripleo_ansible/roles/octavia-controller-config/tasks/certificate.yml
@@ -17,11 +17,11 @@
     setype: svirt_sandbox_file_t
   no_log: true
   loop:
-    - content: "{{ private_key_content }}"
+    - content: "{{ updated_private_key_content }}"
       path: "{{ ca_private_key_path }}"
-    - content: "{{ ca_cert_content }}"
+    - content: "{{ updated_ca_cert_content }}"
       path: "{{ ca_cert_path }}"
-    - content: "{{ service_pem_content }}"
+    - content: "{{ updated_service_pem_content }}"
       path: "{{ client_cert_path }}"
   notify:
     - octavia config updated