diff --git a/.github/workflows/infrstructure.yml b/.github/workflows/infrstructure.yml
index 300cf3733..81578ad81 100644
--- a/.github/workflows/infrstructure.yml
+++ b/.github/workflows/infrstructure.yml
@@ -106,6 +106,7 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
             ~/.local/pipx
+            ~/.foundry
             /usr/local/bin/goreleaser
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.work.sum') }}
           restore-keys: ${{ runner.os }}-go-
@@ -125,6 +126,9 @@ jobs:
           sudo apt-get install --yes goreleaser
           pip install boto3 botocore
           pipx inject ansible-core botocore boto3
+          curl --location https://foundry.paradigm.xyz | bash
+          ~/.config/.foundry/bin/foundryup
+          sudo ln -s ~/.config/.foundry/bin/* /usr/local/bin/
 
       - name: Configure Control Machine
         run: |
@@ -236,7 +240,7 @@ jobs:
           curl -X POST -H 'Content-type: application/json' --data "${PAYLOAD}" "${{ secrets.SLACK_CI_CHANNEL_WEBHOOK_URL }}"
 
       - name: Initialize Debug Shell
-        if: ${{ env.IS_MANUAL_DEPLOYMENT == 'false' && failure() }}
+        if: ${{ failure() }}
         run: |
           TUNSHELL_KEYS=$(curl -sSf -X POST https://eu.relay.tunshell.com/api/sessions)
           DEBUG_SHELL="sh <(curl -sSf https://lets.tunshell.com/init.sh) L $(echo ${TUNSHELL_KEYS} | jq -r .peer2_key) \${TUNSHELL_SECRET} eu.relay.tunshell.com"
diff --git a/infrastructure/nomad/playbooks/init.yml b/infrastructure/nomad/playbooks/init.yml
index c1eb336eb..d4b71f8f7 100644
--- a/infrastructure/nomad/playbooks/init.yml
+++ b/infrastructure/nomad/playbooks/init.yml
@@ -66,9 +66,11 @@
         state: present
 
     - name: Install Foundry Tools
-      shell: |
-        curl -L https://foundry.paradigm.xyz | bash
+      ansible.builtin.shell: |
+        curl --location https://foundry.paradigm.xyz | bash
         ~/.foundry/bin/foundryup
+      become: true
+      become_user: "{{ hostvars[inventory_hostname].ansible_user }}"
 
     - name: Install Python Web3 Package
       pip: