diff --git a/common/container-puppet.sh b/common/container-puppet.sh
index 9b0ff468b8..4ea088be49 100644
--- a/common/container-puppet.sh
+++ b/common/container-puppet.sh
@@ -72,7 +72,7 @@ verbosity=""
 
 # Disables archiving
 if [ -z "$NO_ARCHIVE" ]; then
-    archivedirs=("/etc" "/root" "/opt" "/var/lib/ironic/tftpboot" "/var/lib/ironic/httpboot" "/var/www" "/var/spool/cron" "/var/lib/nova/.ssh")
+    archivedirs=("/etc" "/root" "/opt" "/var/www" "/var/spool/cron" "/var/lib/nova/.ssh")
     rsync_srcs=""
     for d in "${archivedirs[@]}"; do
         if [ -d "$d" ]; then
diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml
index 17390582b4..7f1cdf72c4 100644
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@@ -584,6 +584,20 @@ outputs:
           with_items:
             - httpboot
             - tftpboot
+        # TODO(emilien): remove the cleanup tasks after Ussuri
+        # https://bugs.launchpad.net/tripleo/+bug/1868934
+        - name: Cleanup unnecessary container config-data
+          block: &ironic_config_data_cleanup
+            - name: Remove /var/lib/config-data/puppet-generated/ironic/var
+              file:
+                path: /var/lib/config-data/puppet-generated/ironic/var
+                state: absent
+      upgrade_tasks:
+        - name: Cleanup unnecessary container config-data
+          when:
+            - step|int == 0
+          tags: common
+          block: *ironic_config_data_cleanup
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0
diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml
index cd339e1386..6c167b80bd 100644
--- a/deployment/ironic/ironic-inspector-container-puppet.yaml
+++ b/deployment/ironic/ironic-inspector-container-puppet.yaml
@@ -480,3 +480,17 @@ outputs:
             path: /var/lib/ironic-inspector/dhcp-hostsdir
             state: directory
             setype: svirt_sandbox_file_t
+        # TODO(emilien): remove the cleanup tasks after Ussuri
+        # https://bugs.launchpad.net/tripleo/+bug/1868934
+        - name: Cleanup unnecessary container config-data
+          block: &ironic_config_data_cleanup
+            - name: Remove /var/lib/config-data/puppet-generated/ironic_inspector/var
+              file:
+                path: /var/lib/config-data/puppet-generated/ironic_inspector/var
+                state: absent
+      upgrade_tasks:
+        - name: Cleanup unnecessary container config-data
+          when:
+            - step|int == 0
+          tags: common
+          block: *ironic_config_data_cleanup
diff --git a/releasenotes/notes/ironic_cleanup_config_data-1d4ae909c0869a90.yaml b/releasenotes/notes/ironic_cleanup_config_data-1d4ae909c0869a90.yaml
new file mode 100644
index 0000000000..8433cf2d5d
--- /dev/null
+++ b/releasenotes/notes/ironic_cleanup_config_data-1d4ae909c0869a90.yaml
@@ -0,0 +1,15 @@
+---
+upgrade:
+  - |
+    Exclude /var/lib/ironic/* from container-puppet.sh rsync, this is a
+    leftover from the initial containerization of TripleO; now we have
+    host prep tasks, the ironic conductor and inspector bind mount
+    /var/lib/ironic and generate the data that they need. But this data should
+    not be in the config volume or it can conflict from each other when rsync
+    runs at the same time. Check `launchpad bug 1868934
+    <https://bugs.launchpad.net/tripleo/+bug/1868934>`_.
+    TripleO upgrade tasks and host prep tasks will take care of removing
+    the var directory from the config volumes and the containers will just use
+    the bind mount, like it should be doing now.
+    These tasks will run during a minor update, major upgrade, and fast
+    forward upgrade.