diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml
index 2909feef6b..6e1dfd507c 100644
--- a/docker/services/octavia/octavia-deployment-config.yaml
+++ b/docker/services/octavia/octavia-deployment-config.yaml
@@ -166,15 +166,6 @@ parameters:
     type: string
     default: 'service'
 
-conditions:
-
-  generate_certs:
-      and:
-      - get_param: OctaviaGenerateCerts
-      - equals:
-        - get_param: StackAction
-        - CREATE
-
 resources:
   default_key_pair:
     type: OS::Nova::KeyPair
@@ -218,7 +209,7 @@ outputs:
               ca_private_key_path: { get_param: OctaviaCaKeyFile }
               ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
               client_cert_path: { get_param: OctaviaClientCertFile }
-              generate_certs: {if: [generate_certs, true, false]}
+              generate_certs: { get_param: OctaviaGenerateCerts }
               mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
               overcloud_password: { get_param: AdminPassword }
               overcloud_project: 'admin'
@@ -226,3 +217,4 @@ outputs:
               octavia_ansible_playbook: '/usr/share/tripleo-common/playbooks/octavia-files.yaml'
               overcloud_pub_auth_uri: { get_param: [EndpointMap, KeystoneV3Public, uri] }
               overcloud_int_auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri] }
+              stack_action: { get_param: StackAction }