diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml
index 503310f169..628aba1f1a 100644
--- a/deployment/octavia/octavia-health-manager-container-puppet.yaml
+++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml
@@ -163,15 +163,3 @@ outputs:
               Log files from octavia containers can be found under
               /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
           ignore_errors: true
-      post_upgrade_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
-      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 0f6a0250a1..cae7db7ebc 100644
--- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml
+++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml
@@ -163,15 +163,3 @@ outputs:
               /var/log/containers/octavia and /var/log/containers/httpd/octavia-api.
           ignore_errors: true
       upgrade_tasks: []
-      post_upgrade_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
-      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 ec0539b5b9..2513e8d32f 100644
--- a/deployment/octavia/octavia-worker-container-puppet.yaml
+++ b/deployment/octavia/octavia-worker-container-puppet.yaml
@@ -163,15 +163,3 @@ outputs:
             persistent: yes
             state: yes
       upgrade_tasks: []
-      post_upgrade_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
-      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