diff --git a/salt/minion/cert/octavia_amp_client.yml b/salt/minion/cert/octavia_amp_client.yml
index 7a8425a..5219450 100644
--- a/salt/minion/cert/octavia_amp_client.yml
+++ b/salt/minion/cert/octavia_amp_client.yml
@@ -1,13 +1,14 @@
 parameters:
   _param:
-    salt_minion_ca_host: ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
-    salt_minion_ca_authority: octavia_ca
+    octavia_ca_hostname: ${linux:system:name}
+    octavia_ca_host: ${_param:octavia_ca_hostname}.${_param:cluster_domain}
+    octavia_ca_authority: octavia_ca
   salt:
     minion:
       cert:
         octavia_amp_client:
-          host: ${_param:salt_minion_ca_host}
-          authority: ${_param:salt_minion_ca_authority}
+          host: ${_param:octavia_ca_host}
+          authority: ${_param:octavia_ca_authority}
           common_name: octavia_amp_client
           signing_policy: cert_open
           key_usage: "digitalSignature,nonRepudiation,keyEncipherment"