diff --git a/cookbooks/aws-parallelcluster-environment/attributes/environment.rb b/cookbooks/aws-parallelcluster-environment/attributes/environment.rb
index fbc3dc416..ff7d42501 100644
--- a/cookbooks/aws-parallelcluster-environment/attributes/environment.rb
+++ b/cookbooks/aws-parallelcluster-environment/attributes/environment.rb
@@ -77,3 +77,5 @@
 default['cluster']['spack_shared_dir'] = "#{node['cluster']['shared_dir']}/spack"
 default['cluster']['spack']['version'] = '0.20.2'
 default['cluster']['spack']['sha256'] = '62f87ab6ca332118f2812a255edcf4be4977623d067b9396251ce8c44b158e49'
+
+default['cluster']['lustre']['enabled'] = 'yes'
diff --git a/cookbooks/aws-parallelcluster-environment/libraries/fsx.rb b/cookbooks/aws-parallelcluster-environment/libraries/fsx.rb
index dc5909f41..40f4871a7 100644
--- a/cookbooks/aws-parallelcluster-environment/libraries/fsx.rb
+++ b/cookbooks/aws-parallelcluster-environment/libraries/fsx.rb
@@ -8,3 +8,7 @@ def aws_domain_for_fsx(region)
     CLASSIC_AWS_DOMAIN
   end
 end
+
+def lustre_enabled?
+  ['yes', true].include?(node['cluster']['lustre']['enabled'])
+end
diff --git a/cookbooks/aws-parallelcluster-environment/recipes/install.rb b/cookbooks/aws-parallelcluster-environment/recipes/install.rb
index a369754a8..ab82c8ccd 100644
--- a/cookbooks/aws-parallelcluster-environment/recipes/install.rb
+++ b/cookbooks/aws-parallelcluster-environment/recipes/install.rb
@@ -19,7 +19,9 @@
 cloudwatch 'Install amazon-cloudwatch-agent'
 efa 'Install EFA'
 raid 'Install RAID prerequisite packages'
-lustre 'Install FSx options'
+if lustre_enabled?
+  lustre 'Install FSx options'
+end
 efs 'Install efs-utils'
 stunnel 'Install stunnel'
 system_authentication "Install packages required for directory service integration"