diff --git a/cookbooks/aws-parallelcluster-platform/attributes/platform.rb b/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
index e9190067f..e2c0f8687 100644
--- a/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
+++ b/cookbooks/aws-parallelcluster-platform/attributes/platform.rb
@@ -9,9 +9,10 @@
 # ArmPL
 default['conditions']['arm_pl_supported'] = arm_instance?
 
-# Enroot + Pyxis
+# Enroot
 default['cluster']['enroot']['version'] = '3.4.1'
-default['cluster']['pyxis']['version'] = '0.20.0'
+default['cluster']['enroot']['temporary_dir'] = '/run/enroot'
+default['cluster']['enroot']['persistent_dir'] = '/var/enroot'
 
 # NVidia
 default['cluster']['nvidia']['enabled'] = 'no'
diff --git a/cookbooks/aws-parallelcluster-platform/recipes/config.rb b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
index af2a2c704..153518a12 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/config.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/config.rb
@@ -26,6 +26,3 @@
 include_recipe 'aws-parallelcluster-platform::supervisord_config'
 fetch_config 'Fetch and load cluster configs'
 include_recipe 'aws-parallelcluster-platform::config_login' if node['cluster']['node_type'] == 'LoginNode'
-enroot 'Configure Enroot' do
-  action :configure
-end
diff --git a/cookbooks/aws-parallelcluster-platform/recipes/install/directories.rb b/cookbooks/aws-parallelcluster-platform/recipes/install/directories.rb
index e09164868..53096a8b4 100644
--- a/cookbooks/aws-parallelcluster-platform/recipes/install/directories.rb
+++ b/cookbooks/aws-parallelcluster-platform/recipes/install/directories.rb
@@ -21,6 +21,7 @@
 directory node['cluster']['license_dir']
 directory node['cluster']['configs_dir']
 directory node['cluster']['shared_dir']
+directory node['cluster']['examples_dir']
 directory node['cluster']['shared_dir_login_nodes']
 
 # Create ParallelCluster log folder
diff --git a/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb b/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
index 54a71a03d..d116fcc1e 100644
--- a/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
+++ b/cookbooks/aws-parallelcluster-platform/resources/enroot/partial/_enroot_common.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 #
-# Copyright:: 2013-2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright:: 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License").
 # You may not use this file except in compliance with the License.
@@ -18,50 +18,36 @@
 action :setup do
   return if on_docker?
   action_install_package
-end
-
-action :configure do
-  return if on_docker?
-  return unless enroot_installed
 
-  cookbook_file "/tmp/enroot.template.conf" do
-    source 'enroot/enroot.template.conf'
-    cookbook 'aws-parallelcluster-platform'
+  template "/etc/enroot/enroot.conf" do
+    source 'enroot/enroot.conf.erb'
     owner 'root'
     group 'root'
-    mode '0755'
-    action :create_if_missing
+    mode '0644'
   end
 
-  bash "Configure enroot" do
-    user 'root'
-    code <<-ENROOT_CONFIGURE
-      set -e
-      ENROOT_CONFIG_RELEASE=pyxis
-      SHARED_DIR=#{node['cluster']['shared_dir']}
-      NONROOT_USER=#{node['cluster']['cluster_user']}
-      mkdir -p ${SHARED_DIR}/enroot
-      chown ${NONROOT_USER} ${SHARED_DIR}/enroot
-      ENROOT_CACHE_PATH=${SHARED_DIR}/enroot envsubst < /tmp/enroot.template.conf > /tmp/enroot.conf
-      mv /tmp/enroot.conf /etc/enroot/enroot.conf
-      chmod 0644 /etc/enroot/enroot.conf
-
-      mkdir -p /tmp/enroot
-      chmod 1777 /tmp/enroot
-      mkdir -p /tmp/enroot/data
-      chmod 1777 /tmp/enroot/data
-
-      chmod 1777 ${SHARED_DIR}/enroot
+  directory node['cluster']['enroot']['persistent_dir'] do
+    owner 'root'
+    group 'root'
+    mode '1777'
+    recursive true
+  end
 
-      mkdir -p ${SHARED_DIR}/pyxis/
-      chown ${NONROOT_USER} ${SHARED_DIR}/pyxis/
-      sed -i '${s/$/ runtime_path=${SHARED_DIR}\\/pyxis/}' /opt/slurm/etc/plugstack.conf.d/pyxis.conf
-      SHARED_DIR=${SHARED_DIR} envsubst < /opt/slurm/etc/plugstack.conf.d/pyxis.conf > /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf
-      mv /opt/slurm/etc/plugstack.conf.d/pyxis.tmp.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+  directory node['cluster']['enroot']['temporary_dir'] do
+    owner 'root'
+    group 'root'
+    mode '1777'
+    recursive true
+  end
 
-    ENROOT_CONFIGURE
-    retries 3
-    retry_delay 5
+  # We assume the Enroot temporary dir to be a temporary folder in /run.
+  # Folders in /run must be defined in /usr/lib/tmpfiles.d, otherwise they get
+  # deleted on node boot.
+  template "/usr/lib/tmpfiles.d/enroot.conf" do
+    source 'enroot/tmpfiles/enroot.conf.erb'
+    owner 'root'
+    group 'root'
+    mode '0644'
   end
 end
 
diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/directories_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/directories_spec.rb
index 56e65af56..f91cdf51b 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/directories_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/unit/recipes/directories_spec.rb
@@ -36,6 +36,10 @@
         is_expected.to create_directory(node['cluster']['shared_dir'])
       end
 
+      it 'creates examples directory' do
+        is_expected.to create_directory(node['cluster']['examples_dir'])
+      end
+
       it 'creates log directory' do
         is_expected.to create_directory(node['cluster']['log_base_dir']).with(
           owner: 'root',
diff --git a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/enroot_spec.rb b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/enroot_spec.rb
index 026c64839..4663fe7bb 100644
--- a/cookbooks/aws-parallelcluster-platform/spec/unit/resources/enroot_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/spec/unit/resources/enroot_spec.rb
@@ -9,17 +9,9 @@ def self.setup(chef_run)
       end
     end
   end
-
-  def self.configure(chef_run)
-    chef_run.converge_dsl('aws-parallelcluster-platform') do
-      enroot 'configure' do
-        action :configure
-      end
-    end
-  end
 end
 
-describe 'enroot:package_version' do
+describe 'aws-parallelcluster-platform::enroot:package_version' do
   for_all_oses do |platform, version|
     context "on #{platform}#{version}" do
       cached(:chef_run) do
@@ -39,7 +31,7 @@ def self.configure(chef_run)
   end
 end
 
-describe 'enroot:arch_suffix' do
+describe 'aws-parallelcluster-platform::enroot:arch_suffix' do
   for_all_oses do |platform, version|
     context "on #{platform}#{version} - arm" do
       cached(:chef_run) do
@@ -81,15 +73,73 @@ def self.configure(chef_run)
   end
 end
 
-describe 'enroot:setup' do
+describe 'aws-parallelcluster-platform::enroot:setup' do
   for_all_oses do |platform, version|
     context "on #{platform}#{version}" do
+      cached(:enroot_persistent_dir) { '/path/to/enroot/persistent/dir' }
+      cached(:enroot_temporary_dir) { '/path/to/enroot/temporary/dir' }
+
       let(:chef_run) do
         runner(platform: platform, version: version, step_into: ['enroot']) do |node|
           node.override['cluster']['enroot']['version'] = package_version
+          node.override['cluster']['enroot']['persistent_dir'] = enroot_persistent_dir
+          node.override['cluster']['enroot']['temporary_dir'] = enroot_temporary_dir
         end
       end
 
+      before do
+        ConvergeEnroot.setup(chef_run)
+      end
+
+      it 'creates the Enroot configuration' do
+        is_expected.to create_template('/etc/enroot/enroot.conf').with(
+          source: 'enroot/enroot.conf.erb',
+          owner: 'root',
+          group: 'root',
+          mode: '0644'
+        )
+      end
+
+      # it 'the Enroot configuration has the correct content' do
+      #   is_expected.to render_file('/etc/enroot/enroot.conf')
+      #     .with_content("ENROOT_RUNTIME_PATH         #{enroot_temporary_dir}/runtime/user-$(id -u)")
+      #     .with_content("ENROOT_DATA_PATH            #{enroot_temporary_dir}/data/user-$(id -u)")
+      #     .with_content("ENROOT_CONFIG_PATH          #{enroot_persistent_dir}/config/user-$(id -u)")
+      #     .with_content("ENROOT_CACHE_PATH           #{enroot_persistent_dir}/cache/group-$(id -g)")
+      # end
+
+      it 'creates the Enroot persistent directory' do
+        is_expected.to create_directory(enroot_persistent_dir).with(
+          owner: 'root',
+          group: 'root',
+          mode: '1777',
+          recursive: true
+        )
+      end
+
+      it 'creates the Enroot temporary directory' do
+        is_expected.to create_directory(enroot_temporary_dir).with(
+          owner: 'root',
+          group: 'root',
+          mode: '1777',
+          recursive: true
+        )
+      end
+
+      it 'creates the Enroot tmpfiles.d configuration' do
+        is_expected.to create_template('/usr/lib/tmpfiles.d/enroot.conf').with(
+          source: 'enroot/tmpfiles/enroot.conf.erb',
+          owner: 'root',
+          group: 'root',
+          mode: '0644'
+        )
+      end
+
+      # it 'the Enroot tmpfile.d configuration has the correct content' do
+      #   is_expected.to render_file('/usr/lib/tmpfiles.d/enroot.conf')
+      #     .with_content("D #{enroot_temporary_dir} 0777 root root")
+      # end
+
       context 'when nvidia is enabled' do
         before do
           stubs_for_provider('enroot') do |resource|
@@ -128,44 +178,3 @@ def self.configure(chef_run)
     end
   end
 end
-
-describe 'enroot:configure' do
-  for_all_oses do |platform, version|
-    context "on #{platform}#{version}" do
-      let(:chef_run) do
-        runner(platform: platform, version: version, step_into: ['enroot'])
-      end
-
-      context 'when enroot is installed' do
-        before do
-          stubs_for_provider('enroot') do |resource|
-            allow(resource).to receive(:enroot_installed).and_return(true)
-          end
-          ConvergeEnroot.configure(chef_run)
-        end
-        it 'run configure enroot script' do
-          is_expected.to run_bash('Configure enroot')
-            .with(retries: 3)
-            .with(retry_delay: 5)
-            .with(user: 'root')
-        end
-      end
-
-      context 'when enroot is not installed' do
-        before do
-          stubs_for_provider('enroot') do |resource|
-            allow(resource).to receive(:enroot_installed).and_return(false)
-          end
-          ConvergeEnroot.configure(chef_run)
-        end
-
-        it 'does not run configure enroot script' do
-          is_expected.not_to run_bash('Configure enroot')
-            .with(retries: 3)
-            .with(retry_delay: 5)
-            .with(user: 'root')
-        end
-      end
-    end
-  end
-end
diff --git a/cookbooks/aws-parallelcluster-platform/files/enroot/enroot.template.conf b/cookbooks/aws-parallelcluster-platform/templates/enroot/enroot.conf.erb
similarity index 82%
rename from cookbooks/aws-parallelcluster-platform/files/enroot/enroot.template.conf
rename to cookbooks/aws-parallelcluster-platform/templates/enroot/enroot.conf.erb
index a069e062e..e9cecb726 100644
--- a/cookbooks/aws-parallelcluster-platform/files/enroot/enroot.template.conf
+++ b/cookbooks/aws-parallelcluster-platform/templates/enroot/enroot.conf.erb
@@ -1,9 +1,9 @@
 #ENROOT_LIBRARY_PATH        /usr/lib/enroot
 #ENROOT_SYSCONF_PATH        /etc/enroot
-ENROOT_RUNTIME_PATH        /tmp/enroot/user-$(id -u)
-ENROOT_CONFIG_PATH         ${ENROOT_CONFIG_PATH}
-ENROOT_CACHE_PATH          ${ENROOT_CACHE_PATH}
-ENROOT_DATA_PATH           /tmp/enroot/data/user-$(id -u)
+ENROOT_RUNTIME_PATH         <%= node['cluster']['enroot']['temporary_dir'] %>/runtime/user-$(id -u)
+ENROOT_DATA_PATH            <%= node['cluster']['enroot']['temporary_dir'] %>/data/user-$(id -u)
+ENROOT_CONFIG_PATH          <%= node['cluster']['enroot']['persistent_dir'] %>/config/user-$(id -u)
+ENROOT_CACHE_PATH           <%= node['cluster']['enroot']['persistent_dir'] %>/cache/group-$(id -g)
 #ENROOT_TEMP_PATH           ${TMPDIR:-/tmp}
 
 # Gzip program used to uncompress digest layers.
@@ -68,4 +68,4 @@ ENROOT_RESTRICT_DEV        no
 #all_proxy
 #no_proxy
 #http_proxy
-#https_proxy
\ No newline at end of file
+#https_proxy
diff --git a/cookbooks/aws-parallelcluster-platform/templates/enroot/tmpfiles/enroot.conf.erb b/cookbooks/aws-parallelcluster-platform/templates/enroot/tmpfiles/enroot.conf.erb
new file mode 100644
index 000000000..c879dacec
--- /dev/null
+++ b/cookbooks/aws-parallelcluster-platform/templates/enroot/tmpfiles/enroot.conf.erb
@@ -0,0 +1 @@
+D <%= node['cluster']['enroot']['temporary_dir'] %> 0777 root root
diff --git a/cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb b/cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb
index 0dc1116b1..951abb419 100644
--- a/cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb
+++ b/cookbooks/aws-parallelcluster-platform/test/controls/enroot_spec.rb
@@ -14,16 +14,36 @@
 
   expected_enroot_version = node['cluster']['enroot']['version']
 
-  describe "gdrcopy version is expected to be #{expected_enroot_version}" do
+  describe "enroot version is expected to be #{expected_enroot_version}" do
     subject { command('enroot version').stdout.strip() }
     it { should eq expected_enroot_version }
   end
+
+  persistent_dirs = %w[/etc/enroot /var/enroot]
+  persistent_dirs.each do |path|
+    describe directory(path) do
+      it { should exist }
+      its('owner') { should eq 'root' }
+      its('group') { should eq 'root' }
+      its('mode') { should cmp '01777' }
+    end
+  end
+
+  temporary_dirs = [ "/run/enroot" ]
+  temporary_dirs.each do |path|
+    describe directory(path) do
+      it { should exist }
+      its('owner') { should eq 'root' }
+      its('group') { should eq 'root' }
+      its('mode') { should cmp '01777' }
+    end
+  end
 end
 
 control 'tag:config_enroot_enabled_on_graphic_instances' do
   only_if { !os_properties.on_docker? && ['yes', true].include?(node['cluster']['nvidia']['enabled']) }
 
-  describe file("/opt/parallelcluster/shared/enroot") do
+  describe file("/var/enroot/cache-group-1000") do
     it { should exist }
     its('group') { should eq 'root' }
   end unless os_properties.redhat_on_docker?
diff --git a/cookbooks/aws-parallelcluster-shared/attributes/cluster.rb b/cookbooks/aws-parallelcluster-shared/attributes/cluster.rb
index 430d10dfe..def13a134 100644
--- a/cookbooks/aws-parallelcluster-shared/attributes/cluster.rb
+++ b/cookbooks/aws-parallelcluster-shared/attributes/cluster.rb
@@ -4,6 +4,7 @@
 default['cluster']['license_dir'] = "#{node['cluster']['base_dir']}/licenses"
 default['cluster']['configs_dir'] = "#{node['cluster']['base_dir']}/configs"
 default['cluster']['shared_dir'] = "#{node['cluster']['base_dir']}/shared"
+default['cluster']['examples_dir'] = "#{node['cluster']['base_dir']}/examples"
 default['cluster']['shared_dir_login_nodes'] = "#{node['cluster']['base_dir']}/shared_login_nodes"
 default['cluster']['log_base_dir'] = '/var/log/parallelcluster'
 default['cluster']['etc_dir'] = '/etc/parallelcluster'
diff --git a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
index a075694cd..7f960bd99 100644
--- a/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
+++ b/cookbooks/aws-parallelcluster-slurm/attributes/slurm_attributes.rb
@@ -18,3 +18,10 @@
 
 # Slurmdbd
 default['cluster']['slurmdbd_service_enabled'] = "true"
+
+# Spank
+default['cluster']['slurm']['spank_config_dir'] = "#{node['cluster']['slurm']['install_dir']}/etc/plugstack.conf.d"
+
+# Pyxis
+default['cluster']['pyxis']['version'] = '0.20.0'
+default['cluster']['pyxis']['runtime_path'] = '/run/pyxis'
\ No newline at end of file
diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
index 42785b11a..b623f6083 100644
--- a/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
+++ b/cookbooks/aws-parallelcluster-slurm/recipes/install/install_pyxis.rb
@@ -4,7 +4,7 @@
 # Cookbook:: aws-parallelcluster-slurm
 # Recipe:: install_pyxis
 #
-# Copyright:: Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright:: 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
 # License. A copy of the License is located at
@@ -21,6 +21,9 @@
 pyxis_url = "#{node['cluster']['artifacts_s3_url']}/dependencies/pyxis/v#{pyxis_version}.tar.gz"
 pyxis_tarball = "#{node['cluster']['sources_dir']}/pyxis-#{pyxis_version}.tar.gz"
 
+spank_examples_dir = "#{node['cluster']['examples_dir']}/spank"
+pyxis_examples_dir = "#{node['cluster']['examples_dir']}/pyxis"
+
 remote_file pyxis_tarball do
   source pyxis_url
   mode '0644'
@@ -35,12 +38,59 @@
     set -e
     tar xf #{pyxis_tarball} -C /tmp
     cd /tmp/pyxis-#{pyxis_version}
-    CPPFLAGS='-I /opt/slurm/include/' make
-    CPPFLAGS='-I /opt/slurm/include/' make install
-    mkdir -p /opt/slurm/etc/plugstack.conf.d
-    echo -e 'include /opt/slurm/etc/plugstack.conf.d/*' | tee /opt/slurm/etc/plugstack.conf
-    ln -fs /usr/local/share/pyxis/pyxis.conf /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+    CPPFLAGS='-I #{node['cluster']['slurm']['install_dir']}/include/' make
+    CPPFLAGS='-I #{node['cluster']['slurm']['install_dir']}/include/' make install
   PYXIS_INSTALL
   retries 3
   retry_delay 5
 end
+
+# Spank configurations
+
+directory node['cluster']['slurm']['spank_config_dir'] do
+  user 'root'
+  group 'root'
+  mode '0755'
+  recursive true
+end
+
+directory spank_examples_dir
+
+template "#{spank_examples_dir}/plugstack.conf" do
+  source 'pyxis/plugstack.conf.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+end
+
+# Pyxis configurations
+
+directory node['cluster']['pyxis']['runtime_path'] do
+  user 'root'
+  group 'root'
+  mode '1777'
+  recursive true
+end
+
+# We assume the Pyxis runtime path to be a temporary folder in /run.
+# Folders in /run must be defined in /usr/lib/tmpfiles.d, otherwise they get
+# deleted on node boot.
+template "/usr/lib/tmpfiles.d/pyxis.conf" do
+  source 'pyxis/tmpfiles/pyxis.conf.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+end
+
+link '/usr/local/share/pyxis/pyxis.conf' do
+  to "#{node['cluster']['slurm']['spank_config_dir']}/pyxis.conf"
+end
+
+directory pyxis_examples_dir
+
+template "#{pyxis_examples_dir}/pyxis.conf" do
+  source 'pyxis/pyxis.conf.erb'
+  owner 'root'
+  group 'root'
+  mode '0644'
+end
diff --git a/cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/install_pyxis_spec.rb b/cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/install_pyxis_spec.rb
new file mode 100644
index 000000000..c9a0e2d2e
--- /dev/null
+++ b/cookbooks/aws-parallelcluster-slurm/spec/unit/recipes/install_pyxis_spec.rb
@@ -0,0 +1,126 @@
+# frozen_string_literal: true
+
+# Copyright:: 2024 Amazon.com, Inc. and its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You may not use this file except in compliance with the
+# License. A copy of the License is located at
+#
+# http://aws.amazon.com/apache2.0/
+#
+# or in the "LICENSE.txt" file accompanying this file. This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+# OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'spec_helper'
+
+describe 'aws-parallelcluster-slurm::install_pyxis' do
+  for_all_oses do |platform, version|
+    context "on #{platform}#{version}" do
+      cached(:cluster_artifacts_s3_url) { 'https://REGION-aws-parallelcluster.s3.REGION.AWS_DOMAIN' }
+      cached(:cluster_sources_dir) { '/path/to/cluster/sources/dir' }
+      cached(:cluster_examples_dir) { '/path/to/cluster/examples/dir' }
+      cached(:slurm_install_dir) { '/path/to/slurm/install/dir' }
+      cached(:spank_config_dir) { '/path/to/spank/config/dir' }
+      cached(:pyxis_version) { '1.2.3' }
+      cached(:pyxis_runtime_dir) { '/path/to/pyxis/runtime/dir' }
+      cached(:chef_run) do
+        runner = runner(platform: platform, version: version) do |node|
+          RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
+
+          node.override['cluster']['artifacts_s3_url'] = cluster_artifacts_s3_url
+          node.override['cluster']['sources_dir'] = cluster_sources_dir
+          node.override['cluster']['examples_dir'] = cluster_examples_dir
+          node.override['cluster']['slurm']['install_dir'] = slurm_install_dir
+          node.override['cluster']['slurm']['spank_config_dir'] = spank_config_dir
+          node.override['cluster']['pyxis']['version'] = pyxis_version
+          node.override['cluster']['pyxis']['runtime_path'] = pyxis_runtime_dir
+        end
+        allow_any_instance_of(Object).to receive(:nvidia_enabled?).and_return(true)
+        runner.converge(described_recipe)
+      end
+
+      it 'downloads Pyxis tarball' do
+        is_expected.to create_if_missing_remote_file("#{cluster_sources_dir}/pyxis-#{pyxis_version}.tar.gz").with(
+          source: "#{cluster_artifacts_s3_url}/dependencies/pyxis/v#{pyxis_version}.tar.gz",
+          mode: '0644',
+          retries: 3,
+          retry_delay: 5
+        )
+      end
+
+      it 'install Pyxis' do
+        is_expected.to run_bash('Install pyxis').with(
+          user: 'root',
+          retries: 3,
+          retry_delay: 5,
+          code: <<-CODE
+    set -e
+    tar xf #{cluster_sources_dir}/pyxis-#{pyxis_version}.tar.gz -C /tmp
+    cd /tmp/pyxis-#{pyxis_version}
+    CPPFLAGS='-I #{slurm_install_dir}/include/' make
+    CPPFLAGS='-I #{slurm_install_dir}/include/' make install
+          CODE
+        )
+      end
+
+      it 'creates the Spank config directory' do
+        is_expected.to create_directory(spank_config_dir).with(
+          owner: 'root',
+          group: 'root',
+          mode: '0755',
+          recursive: true
+        )
+      end
+
+      it 'creates the Spank examples directory' do
+        is_expected.to create_directory("#{cluster_examples_dir}/spank")
+      end
+
+      it 'creates the Spank example configuration' do
+        is_expected.to create_template("#{cluster_examples_dir}/spank/plugstack.conf").with(
+          source: 'pyxis/plugstack.conf.erb',
+          owner: 'root',
+          group: 'root',
+          mode: '0644'
+        )
+      end
+
+      it 'creates the Pyxis runtime directory' do
+        is_expected.to create_directory(pyxis_runtime_dir).with(
+          owner: 'root',
+          group: 'root',
+          mode: '1777',
+          recursive: true
+        )
+      end
+
+      it 'creates the Pyxis tmpfiles.d configuration' do
+        is_expected.to create_template('/usr/lib/tmpfiles.d/pyxis.conf').with(
+          source: 'pyxis/tmpfiles/pyxis.conf.erb',
+          owner: 'root',
+          group: 'root',
+          mode: '0644'
+        )
+      end
+
+      it 'creates Pyxis config link' do
+        is_expected.to create_link('/usr/local/share/pyxis/pyxis.conf').with(
+          to: "#{spank_config_dir}/pyxis.conf"
+        )
+      end
+
+      it 'creates the Pyxis examples directory' do
+        is_expected.to create_directory("#{cluster_examples_dir}/pyxis")
+      end
+
+      it 'creates the Pyxis example configuration' do
+        is_expected.to create_template("#{cluster_examples_dir}/pyxis/pyxis.conf").with(
+          source: 'pyxis/pyxis.conf.erb',
+          owner: 'root',
+          group: 'root',
+          mode: '0644'
+        )
+      end
+    end
+  end
+end
diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/plugstack.conf.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/plugstack.conf.erb
new file mode 100644
index 000000000..abc166cf2
--- /dev/null
+++ b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/plugstack.conf.erb
@@ -0,0 +1,3 @@
+# THIS IS AN EXAMPLE OF Spank config file
+# When you want to enable please move this to /opt/slurm/etc/plugstack.conf
+include <%= node['cluster']['slurm']['spank_config_dir'] %>/*
diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/pyxis.conf.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/pyxis.conf.erb
new file mode 100644
index 000000000..a5b5db774
--- /dev/null
+++ b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/pyxis.conf.erb
@@ -0,0 +1,3 @@
+# THIS IS AN EXAMPLE OF pyxis.conf file
+# When you want to enable please move this to /opt/slurm/etc/plugstack.conf.d/pyxis.conf
+required /usr/local/lib/slurm/spank_pyxis.so runtime_path=<%= node['cluster']['pyxis']['runtime_path'] %>
diff --git a/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/tmpfiles/pyxis.conf.erb b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/tmpfiles/pyxis.conf.erb
new file mode 100644
index 000000000..b143a80df
--- /dev/null
+++ b/cookbooks/aws-parallelcluster-slurm/templates/default/pyxis/tmpfiles/pyxis.conf.erb
@@ -0,0 +1 @@
+D <%= node['cluster']['pyxis']['runtime_path'] %> 0777 root root
\ No newline at end of file
diff --git a/cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb b/cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb
index b00da2567..576b72cc5 100644
--- a/cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb
+++ b/cookbooks/aws-parallelcluster-slurm/test/controls/pyxis_spec.rb
@@ -14,7 +14,37 @@
 
   title 'Checks Pyxis has been installed'
 
-  describe file("/opt/slurm/etc/plugstack.conf.d/pyxis.conf") do
+  describe directory('/opt/slurm/etc') do
+    it { should exist }
+    its('mode') { should cmp '0755' }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+  end
+
+  base_dir = "/opt/parallelcluster/configs/examples"
+  dirs = [ base_dir, "#{base_dir}/spank", "#{base_dir}/pyxis" ]
+  dirs.each do |path|
+    describe directory(path) do
+      it { should exist }
+    end
+  end
+
+  describe directory('/run/pyxis') do
+    it { should exist }
+    its('owner') { should eq "#{node['cluster']['cluster_user']}" }
+  end
+
+  describe directory('/opt/slurm/etc/plugstack.conf.d') do
+    it { should exist }
+    its('owner') { should eq 'root' }
+    its('group') { should eq 'root' }
+  end
+
+  describe file("#{base_dir}/pyxis/pyxis.conf") do
+    it { should exist }
+  end
+
+  describe file("#{base_dir}/spank/plugstack.conf") do
     it { should exist }
   end
 end