diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index 4c8532d46c..318dd6e1d2 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -104,7 +104,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/octavia-health-manager
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_health_manager
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
index d71b5ba778..00b1a582b3 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -103,7 +103,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/octavia-housekeeping
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_housekeeping
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml
index c314b4c08f..74b9aa4865 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -91,7 +91,7 @@ outputs:
         config_image: {get_param: ContainerOctaviaConfigImage}
       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 --config-file /etc/octavia/post-deploy.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/octavia-worker
           config_files:
             - source: "/var/lib/kolla/config_files/src/*"
               dest: "/"
@@ -171,3 +171,14 @@ outputs:
             containers_to_rm:
               - octavia_worker
             tripleo_container_cli: "docker"
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
+      post_update_tasks:
+        - name: remove directory /etc/octavia/conf.d/common
+          when: step|int == 5
+          file:
+            path: "/var/lib/config-data/puppet-generated/octavia/etc/octavia/conf.d/common"
+            state: absent
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.