diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml
index b848c73ae5..539d629d13 100644
--- a/docker/services/octavia/octavia-deployment-config.yaml
+++ b/docker/services/octavia/octavia-deployment-config.yaml
@@ -30,6 +30,13 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  StackAction:
+    type: string
+    description: >
+      Heat action on performed top-level stack.  Note StackUpdateType is
+      set to UPGRADE when a major-version upgrade is in progress.
+    constraints:
+    - allowed_values: ['CREATE', 'UPDATE']
   OctaviaPostWorkflowName:
     description: Mistral workflow name for octavia configuration steps
                  once the overcloud is ready.
@@ -161,6 +168,13 @@ parameters:
     type: string
     default: 'service'
 
+  generate_certs:
+      and:
+      - get_param: OctaviaGenerateCerts
+      - equals:
+        - get_param: StackAction
+        - CREATE
+
 resources:
   default_key_pair:
     type: OS::Nova::KeyPair
@@ -195,7 +209,7 @@ resources:
           server_certs_key_passphrase: {get_param: OctaviaServerCertsKeyPassphrase}
           ca_passphrase: { get_param: OctaviaCaKeyPassphrase }
           client_cert_path: { get_param: OctaviaClientCertFile }
-          generate_certs: { get_param: OctaviaGenerateCerts }
+          generate_certs: {if: [generate_certs, true, false]}
           mgmt_port_dev: { get_param: OctaviaMgmtPortDevName }
           os_password: { get_param: AdminPassword }
           os_project_name: 'admin'