diff --git a/.github/workflows/Build ThunderInterfaces on Linux.yml b/.github/workflows/Build ThunderInterfaces on Linux.yml
index e9bf614..657c4d5 100644
--- a/.github/workflows/Build ThunderInterfaces on Linux.yml	
+++ b/.github/workflows/Build ThunderInterfaces on Linux.yml	
@@ -13,7 +13,7 @@ jobs:
 
   ThunderInterfaces:
     needs: Thunder
-    uses: rdkcentral/ThunderInterfaces/.github/workflows/Linux build template.yml@master
+    uses: rdkcentral/ThunderInterfaces/.github/workflows/Linux build template.yml@development/actions-gcc-13 # change back to master
 
   ThunderClientLibraries:
     needs: ThunderInterfaces
diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index 6412411..7c9a9d9 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -28,8 +28,10 @@ jobs:
           echo "deb http://archive.ubuntu.com/ubuntu/ jammy-updates main universe restricted multiverse" | sudo tee -a /etc/apt/sources.list
           sudo dpkg --add-architecture i386
           sudo apt-get update
-          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev zlib1g-dev:i386 libssl-dev gcc-11-multilib g++-11-multilib
-          sudo pip install jsonref
+          sudo apt install python3-pip build-essential cmake ninja-build libusb-1.0-0-dev ${{matrix.architecture == '32' && 'zlib1g-dev:i386 libssl-dev:i386 gcc-13-multilib g++-13-multilib' || 'zlib1g-dev libssl-dev'}}
+          python3 -m venv venv
+          source venv/bin/activate
+          pip install jsonref
 
     - name: Download artifacts
       uses: actions/download-artifact@v4
@@ -70,6 +72,7 @@ jobs:
 # ----- Building & uploading -----
     - name: Build ThunderInterfaces
       run: |
+        source venv/bin/activate
         cmake -G Ninja -S ThunderInterfaces -B ${{matrix.build_type}}/build/ThunderInterfaces \
         -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \
         -DCMAKE_C_FLAGS="-Wall -Wextra -Wpedantic -Werror -m${{matrix.architecture}}" \