diff --git a/puppet-manifests/src/manifests/aio.pp b/puppet-manifests/src/manifests/aio.pp
index 36fea1443..cdf4862fa 100644
--- a/puppet-manifests/src/manifests/aio.pp
+++ b/puppet-manifests/src/manifests/aio.pp
@@ -18,7 +18,7 @@ include ::platform::filesystem::controller
 include ::platform::firewall::calico::oam
 include ::platform::dhclient
 include ::platform::partitions
-include ::platform::lvm::controller
+include ::platform::lvm::aio
 include ::platform::network
 include ::platform::drbd
 include ::platform::exports
@@ -108,7 +108,6 @@ include ::platform::pciirqaffinity
 include ::platform::docker::login
 include ::platform::kubernetes::aio
 
-include ::platform::lvm::compute
 
 class { '::platform::config::aio::post':
   stage => post,
diff --git a/puppet-manifests/src/modules/platform/manifests/lvm.pp b/puppet-manifests/src/modules/platform/manifests/lvm.pp
index f70aec65c..962aa7642 100644
--- a/puppet-manifests/src/modules/platform/manifests/lvm.pp
+++ b/puppet-manifests/src/modules/platform/manifests/lvm.pp
@@ -140,6 +140,20 @@ class platform::lvm::compute::runtime {
   include ::platform::lvm::compute
 }
 
+###############
+# AIO
+###############
+
+class platform::lvm::aio
+  inherits ::platform::lvm::params {
+    include ::platform::lvm::controller
+    include ::platform::lvm::compute
+    Class['::platform::lvm::controller']
+    -> Class['::platform::lvm::compute']
+    -> Class['::platform::worker::storage']
+}
+
+
 ###############
 # Storage Hosts
 ###############