diff --git a/.github/workflows/Linux build template.yml b/.github/workflows/Linux build template.yml
index b2d7318..28765b5 100644
--- a/.github/workflows/Linux build template.yml	
+++ b/.github/workflows/Linux build template.yml	
@@ -12,6 +12,7 @@ jobs:
       matrix:
         build_type: [Debug, Release, MinSizeRel]
 
+# ----- Packages & artifacts -----
     name: Build type - ${{matrix.build_type}}
     steps:
     - name: Install necessary packages
@@ -27,12 +28,6 @@ jobs:
           pip install jsonref
           sudo apt install build-essential cmake ninja-build libusb-1.0-0-dev zlib1g-dev libssl-dev
 
-    - name: Checkout Thunder
-      uses: actions/checkout@v3
-      with:
-        path: Thunder
-        repository: rdkcentral/Thunder
-
     - name: Download artifacts
       uses: actions/download-artifact@v3
       with:
@@ -44,6 +39,7 @@ jobs:
         tar -xvzf ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
         rm ${{matrix.build_type}}/${{matrix.build_type}}.tar.gz
 
+# ----- Regex & checkout -----
     - name: Checkout ThunderLibraries
       uses: actions/checkout@v3
       with:
@@ -59,6 +55,7 @@ jobs:
         regex_flags: 'gim'
         search_string: ${{github.event.pull_request.body}}
 
+# ----- Building & uploading -----
     - name: Build ThunderLibraries
       run: |
         cmake -G Ninja -S ThunderLibraries -B ${{matrix.build_type}}/build/ThunderLibraries \