diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml
index f6f9131dc0..fb0bbdd05c 100644
--- a/docker/services/opendaylight-api.yaml
+++ b/docker/services/opendaylight-api.yaml
@@ -140,7 +140,6 @@ outputs:
                   - /var/lib/config-data/puppet-generated/opendaylight/:/var/lib/kolla/config_files/src:ro
                   - /var/lib/opendaylight/journal:/opt/opendaylight/journal
                   - /var/lib/opendaylight/snapshots:/opt/opendaylight/snapshots
-                  - /var/lib/opendaylight/data:/opt/opendaylight/data
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       metadata_settings:
@@ -149,12 +148,12 @@ outputs:
         list_concat:
           - {get_attr: [OpenDaylightApiLogging, host_prep_tasks]}
           -
-            - name: Delete cache and karaf folder
+            - name: Delete data and karaf folder
               file:
                 path: "{{ item }}"
                 state: absent
               with_items:
-                - /var/lib/opendaylight/data/cache
+                - /var/lib/opendaylight/data # Delete folder if present from previous deployment
                 - /var/lib/config-data/puppet-generated/opendaylight/opt/opendaylight/etc/opendaylight/karaf
             - name: create persistent directories
               file:
@@ -163,7 +162,6 @@ outputs:
               with_items:
                 - /var/lib/opendaylight/snapshots
                 - /var/lib/opendaylight/journal
-                - /var/lib/opendaylight/data
       upgrade_tasks:
         - when: step|int == 0
           tags: common
@@ -201,14 +199,13 @@ outputs:
                 name: opendaylight_api
                 state: stopped
               when: step|int == 0
-            - name: remove data, journal and snapshots
+            - name: remove journal and snapshots
               file:
                 path: /var/lib/opendaylight/{{item}}
                 state: absent
               with_items:
                 - snapshots
                 - journal
-                - data
               when: step|int == 0
             - name: Set ODL upgrade flag to True
               copy:
@@ -278,9 +275,9 @@ outputs:
               docker_container:
                 name: opendaylight_api
                 state: stopped
-            - name: Delete cache folder
+            - name: Delete data folder
               file:
-                path: /var/lib/opendaylight/data/cache
+                path: /var/lib/opendaylight/data
                 state: absent
           when:
             - step|int == 0
diff --git a/releasenotes/notes/odl-dont-mount-data-folder-c993df185af375a8.yaml b/releasenotes/notes/odl-dont-mount-data-folder-c993df185af375a8.yaml
new file mode 100644
index 0000000000..452c5750c9
--- /dev/null
+++ b/releasenotes/notes/odl-dont-mount-data-folder-c993df185af375a8.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    /opt/opendaylight/data folder is mounted on host. This folder
+    contains information about installed features in ODL. Mounting
+    this folder on container makes ODL believe that features are
+    installed and it doesnot generate required for proper boot. Thus
+    this folder is no longer mounted to host so that ODL can boot
+    properly on restart.
\ No newline at end of file