diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index abb3e71fcf..e7a65a2d17 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -114,7 +114,7 @@ outputs:
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_health_manager.json:
-          command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
+          command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-health-manager
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
index 17aebe7a5b..d15210dd93 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -105,7 +105,7 @@ outputs:
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_housekeeping.json:
-          command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
+          command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-housekeeping
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index e6a0e19994..885302c819 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -97,7 +97,7 @@ outputs:
         config_image: {get_param: DockerOctaviaConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/octavia_worker.json:
-          command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
+          command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-file /etc/octavia/post-deploy.conf --config-dir /etc/octavia/conf.d/octavia-worker
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
diff --git a/releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml b/releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml
new file mode 100644
index 0000000000..91d688ba00
--- /dev/null
+++ b/releasenotes/notes/consolidate-octavia-post-deploy-configs-bc251a5446e5615d.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed an issue where Octavia controller services were not properly
+    configured.