diff --git a/roles/install_easybuild/tasks/main.yml b/roles/install_easybuild/tasks/main.yml
index 5551e44..5c2eef0 100644
--- a/roles/install_easybuild/tasks/main.yml
+++ b/roles/install_easybuild/tasks/main.yml
@@ -32,8 +32,8 @@
   ansible.builtin.blockinfile:
     dest: "{{ ansible_env.HOME }}/.bashrc"
     block: |
-      if [ -f "{{ easybuild_modules_dir }}/modules.bashrc" ]; then
-        source "{{ easybuild_modules_dir }}/modules.bashrc"
+      if [[ -f "{{ easybuild_modules_dir }}/modules.bashrc" ]]; then
+          source "{{ easybuild_modules_dir }}/modules.bashrc"
       fi
     marker: "# {mark} ANSIBLE MANAGED BLOCK - Setup environment for Lua, Lmod & EasyBuild."
     insertafter: EOF
@@ -50,6 +50,7 @@
   #
   ansible.builtin.shell:
     cmd: |
+         set -o pipefail
          unset MODULEPATH
          source "{{ easybuild_modules_dir }}/modules.bashrc" >/dev/null 2>&1
          lua -v  2>&1 | grep -i Lua | sed 's|^.*Lua \([0-9\.]*\).*$|\1|'
@@ -108,6 +109,7 @@
   #
   ansible.builtin.shell:
     cmd: |
+         set -o pipefail
          unset MODULEPATH
          source "{{ easybuild_modules_dir }}/modules.bashrc" >/dev/null 2>&1
          lmod -v 2>&1 | sed '/^$/d' | sed 's|^.*Version \([0-9\.]*\).*$|\1|' | head -1
@@ -135,6 +137,7 @@
 - name: Check if EasyBuild is installed and if yes what version.
   ansible.builtin.shell:
     cmd: |
+         set -o pipefail
          source "{{ easybuild_modules_dir }}/modules.bashrc" >/dev/null 2>&1
          module load EasyBuild/{{ easybuild_version }}
          if eb --version 2>/dev/null | grep '^This is EasyBuild' >/dev/null 2>&1; then
diff --git a/single_role_playbooks/pre_deploy_checks.yml b/single_role_playbooks/pre_deploy_checks.yml
index febefd5..7e42a5b 100644
--- a/single_role_playbooks/pre_deploy_checks.yml
+++ b/single_role_playbooks/pre_deploy_checks.yml
@@ -29,7 +29,7 @@
       connection: local
     - name: 'Download dependencies from Ansible Galaxy on the Ansible control host.'
       ansible.builtin.command:
-        cmd: ansible-galaxy install -r requirements.yml --timeout 120
+        cmd: ansible-galaxy install -r requirements.yml{% if ansible_version.full is version_compare('2.13', '>=') %} --timeout 120{% endif %}
       run_once: true  # noqa run-once
       delegate_to: localhost
       connection: local
diff --git a/static_inventories/betabarrel_cluster.yml b/static_inventories/betabarrel_cluster.yml
index a4d0a3e..156aa48 100644
--- a/static_inventories/betabarrel_cluster.yml
+++ b/static_inventories/betabarrel_cluster.yml
@@ -3,7 +3,7 @@ all:
   children:
     jumphost:
       hosts:
-        porch:
+        bb-porch:
     deploy_admin_interface:
       hosts:
         betabarrel:
diff --git a/static_inventories/copperfist_cluster.yml b/static_inventories/copperfist_cluster.yml
index 100fe56..17fcf49 100644
--- a/static_inventories/copperfist_cluster.yml
+++ b/static_inventories/copperfist_cluster.yml
@@ -3,7 +3,7 @@ all:
   children:
     jumphost:
       hosts:
-        porch:
+        cf-porch:
     deploy_admin_interface:
       hosts:
         copperfist:
diff --git a/static_inventories/wingedhelix_cluster.yml b/static_inventories/wingedhelix_cluster.yml
index 755548e..d781a3d 100644
--- a/static_inventories/wingedhelix_cluster.yml
+++ b/static_inventories/wingedhelix_cluster.yml
@@ -3,7 +3,7 @@ all:
   children:
     jumphost:
       hosts:
-        porch:
+        wh-porch:
     deploy_admin_interface:
       hosts:
         wh-dai: