diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml
index 7f19760f9b..9fe1b08983 100644
--- a/docker/services/octavia/octavia-deployment-config.yaml
+++ b/docker/services/octavia/octavia-deployment-config.yaml
@@ -59,7 +59,7 @@ parameters:
     description: SSH key name.
   OctaviaAmphoraSshKeyFile:
     type: string
-    default: '/home/stack/.ssh/id_rsa.pub'
+    default: ''
     description: Public key file path. User will be able to SSH into amphorae
       with the provided key. User may, in most cases, also elevate to root
       from user 'centos' (CentOS), 'ubuntu' (Ubuntu) or 'cloud-user' (RHEL)
@@ -145,6 +145,11 @@ parameters:
     type: string
     default: 'service'
 
+resources:
+  default_key_pair:
+    type: OS::Nova::KeyPair
+    external_id: default
+
 outputs:
   role_data:
     description: Role data for the Octavia configuration service
@@ -167,6 +172,7 @@ outputs:
               amp_image_tag: { get_param: OctaviaAmphoraImageTag }
               amp_ssh_key_name: { get_param: OctaviaAmphoraSshKeyName }
               amp_ssh_key_path: { get_param: OctaviaAmphoraSshKeyFile }
+              amp_ssh_key_data: { get_attr: [default_key_pair, public_key] }
               auth_username: { get_param: OctaviaUserName }
               auth_password: { get_param: OctaviaPassword }
               auth_project_name: { get_param: OctaviaProjectName }
diff --git a/releasenotes/notes/default-octavia-ssh-pub-key-to-keypair-70377d43bf76a407.yaml b/releasenotes/notes/default-octavia-ssh-pub-key-to-keypair-70377d43bf76a407.yaml
new file mode 100644
index 0000000000..e639d8781b
--- /dev/null
+++ b/releasenotes/notes/default-octavia-ssh-pub-key-to-keypair-70377d43bf76a407.yaml
@@ -0,0 +1,3 @@
+---
+fixes:
+  - Default Octavia SSH public key to 'default' keypair from undercloud.