diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ae25875..82bc0075 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
         run: |
           # Setup Rust and toolchains
           ./setup.sh
+          source "$HOME/.cargo/env"
  
           # Build optee_os and optee_client for qemu_v8
           ./build_optee_libraries.sh $HOME
@@ -58,6 +59,7 @@ jobs:
         run: |
           # Setup Rust and toolchains
           ./setup.sh
+          source "$HOME/.cargo/env"
 
           # Build optee_os and optee_client for qemu_v8
           ./build_optee_libraries.sh $HOME
@@ -100,6 +102,7 @@ jobs:
         run: |
           # Setup Rust and toolchains
           ./setup.sh
+          source "$HOME/.cargo/env"
 
           # Setup std dependencies
           ./setup_std_dependencies.sh
@@ -132,6 +135,7 @@ jobs:
         run: |
           # Setup Rust and toolchains
           ./setup.sh
+          source "$HOME/.cargo/env"
 
           # Setup std dependencies
           ./setup_std_dependencies.sh
@@ -171,10 +175,9 @@ jobs:
         run: |
           mkdir -p ~/bin
           curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo && chmod a+x ~/bin/repo
-          export PATH=~/bin:$PATH
           mkdir -p ~/optee-qemuv8 && cd ~/optee-qemuv8 &&
-          repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
-          repo sync -j4 --no-clone-bundle
+          python3 ~/bin/repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
+          python3 ~/bin/repo sync -j4 --no-clone-bundle
       - name: Build images and run tests
         run: |
           cd ~/optee-qemuv8
@@ -199,10 +202,9 @@ jobs:
         run: |
           mkdir -p ~/bin
           curl https://storage.googleapis.com/git-repo-downloads/repo-1 > ~/bin/repo && chmod a+x ~/bin/repo
-          export PATH=~/bin:$PATH
           mkdir -p ~/optee-qemuv8 && cd ~/optee-qemuv8 &&
-          repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
-          repo sync -j4 --no-clone-bundle
+          python3 ~/bin/repo init -u https://github.com/OP-TEE/manifest.git -m qemu_v8.xml &&
+          python3 ~/bin/repo sync -j4 --no-clone-bundle
       - name: Build images and run tests
         run: |
           cd ~/optee-qemuv8