diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml
index 0fc0f014f9..be1d8c197d 100644
--- a/docker/services/mistral-executor.yaml
+++ b/docker/services/mistral-executor.yaml
@@ -157,6 +157,11 @@ outputs:
               Log files from mistral containers can be found under
               /var/log/containers/mistral.
           ignore_errors: true
+        - name: create octavia-amphora-images directory
+          file:
+            path: /usr/share/openstack-octavia-amphora-images
+            state: directory
+            setype: svirt_sandbox_file_t
       upgrade_tasks:
         - when: step|int == 0
           tags: common
diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml
index 0201fbe932..3df6c6ea50 100644
--- a/docker/services/octavia/octavia-deployment-config.yaml
+++ b/docker/services/octavia/octavia-deployment-config.yaml
@@ -42,10 +42,12 @@ parameters:
     type: string
     default: ''
   OctaviaAmphoraImageFilename:
-    description: Filename for the amphora image. Using the default of an empty
-                 string will cause a distro specific default to be used. (e.g.
+    description: Filename for the amphora image. Image files are expected to be
+                 located in directory /usr/share/openstack-octavia-amphora-images.
+                 Using the default of an empty string will cause a distro
+                 specific default to be used. (e.g.
                  /usr/share/openstack-octavia-amphora-images/amphora-x64-haproxy.qcow2
-                 on CentOS and /usr/share/rhosp-director-images/octavia-amphora.qcow2
+                 on CentOS and /usr/share/openstack-octavia-amphora-images/octavia-amphora.qcow2
                  on Red Hat Enterprise Linux).
     type: string
     default: ''
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index 44a0b2d506..a4b1a950c6 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -148,5 +148,6 @@ parameter_defaults:
       connect_timeout: 60
   MistralExecutorExtraVolumes:
     - /usr/share/ceph-ansible:/usr/share/ceph-ansible:ro
+    - /usr/share/openstack-octavia-amphora-images:/usr/share/openstack-octavia-amphora-images:ro
   NeutronMetadataProxySharedSecret: ''
   MetadataNATRule: true
diff --git a/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml b/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml
new file mode 100644
index 0000000000..764f2ce3d8
--- /dev/null
+++ b/releasenotes/notes/octavia-mount-amphora-images-dir-31da44a544628687.yaml
@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    Octavia amphora images are now expected to be located in directory
+    /usr/share/openstack-octavia-amphora-images on the undercloud node
+    for uniformization across different OpenStack distributions.
+deprecations:
+  - |
+    Ensure Octavia amphora image files are placed in directory
+    /usr/share/openstack-octavia-amphora-images on the undercloud node.
+fixes:
+  - |
+    Fix an issue where Octavia amphora images were not accessible during
+    overcloud deployment.