diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml
index b7de7531d3..72da256524 100644
--- a/deployment/octavia/octavia-api-container-puppet.yaml
+++ b/deployment/octavia/octavia-api-container-puppet.yaml
@@ -352,7 +352,12 @@ outputs:
           with_items:
             - { 'path': /var/log/containers/octavia, 'setype': container_file_t, 'mode': '0750' }
             - { 'path': /var/log/containers/httpd/octavia-api, 'setype': container_file_t, 'mode': '0750' }
-            - { 'path': /var/run/octavia, 'setype': container_file_t, 'mode': '0750'  }
+            - { 'path': /var/run/octavia, 'setype': container_file_t, 'mode': '0755'  }
+        - name: ensure /var/run/octavia is present upon reboot
+          copy:
+            dest: /etc/tmpfiles.d/var-run-octavia.conf
+            content: |
+              d /var/run/octavia 0755 root root - -
       update_tasks:
         - name: Set internal tls variable
           set_fact:
diff --git a/releasenotes/notes/fix-octavia-api-driver-agent-failed-on-reboot-373a31d28ea72587.yaml b/releasenotes/notes/fix-octavia-api-driver-agent-failed-on-reboot-373a31d28ea72587.yaml
new file mode 100644
index 0000000000..d3aada3145
--- /dev/null
+++ b/releasenotes/notes/fix-octavia-api-driver-agent-failed-on-reboot-373a31d28ea72587.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue where containers octavia_api and octavia_driver_agent would
+    fail to start on node reboot.