diff --git a/puppet-manifests/src/modules/platform/manifests/filesystem.pp b/puppet-manifests/src/modules/platform/manifests/filesystem.pp
index 67bf92fe12..83cbf2c4f8 100644
--- a/puppet-manifests/src/modules/platform/manifests/filesystem.pp
+++ b/puppet-manifests/src/modules/platform/manifests/filesystem.pp
@@ -138,12 +138,16 @@ class platform::filesystem::docker::params (
 class platform::filesystem::docker
   inherits ::platform::filesystem::docker::params {
 
-  platform::filesystem { $lv_name:
-    lv_name => $lv_name,
-    lv_size => $lv_size,
-    mountpoint => $mountpoint,
-    fs_type => $fs_type,
-    fs_options => $fs_options
+  include ::platform::kubernetes::params
+
+  if $::platform::kubernetes::params::enabled {
+    platform::filesystem { $lv_name:
+      lv_name => $lv_name,
+      lv_size => $lv_size,
+      mountpoint => $mountpoint,
+      fs_type => $fs_type,
+      fs_options => $fs_options
+    }
   }
 }
 
diff --git a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
index cc678264f7..a5adb3fef6 100644
--- a/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
+++ b/sysinv/sysinv/sysinv/sysinv/conductor/manager.py
@@ -6368,19 +6368,17 @@ class ConductorManager(service.PeriodicService):
 
         if kubernetes_config:
             docker_lv_size = constants.KUBERNETES_DOCKER_STOR_SIZE
-        else:
-            docker_lv_size = constants.DEFAULT_DOCKER_STOR_SIZE
 
-        data = {
-            'name': constants.FILESYSTEM_NAME_DOCKER,
-            'size': docker_lv_size,
-            'logical_volume': constants.FILESYSTEM_LV_DICT[
-                constants.FILESYSTEM_NAME_DOCKER],
-            'replicated': False,
-        }
-        LOG.info("Creating FS:%s:%s %d" % (
-            data['name'], data['logical_volume'], data['size']))
-        self.dbapi.controller_fs_create(data)
+            data = {
+                'name': constants.FILESYSTEM_NAME_DOCKER,
+                'size': docker_lv_size,
+                'logical_volume': constants.FILESYSTEM_LV_DICT[
+                    constants.FILESYSTEM_NAME_DOCKER],
+                'replicated': False,
+            }
+            LOG.info("Creating FS:%s:%s %d" % (
+                data['name'], data['logical_volume'], data['size']))
+            self.dbapi.controller_fs_create(data)
 
         if (system_dc_role == constants.DISTRIBUTED_CLOUD_ROLE_SYSTEMCONTROLLER and
                 tsc.system_type != constants.TIS_AIO_BUILD):