diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 017cd9791..20e493b93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,19 +26,19 @@ jobs:
     - name: Download sources and toolchain
       run: |
         git config --global --add safe.directory '*'
-        git clone -b "$PADAVAN_BRANCH" "$PADAVAN_REPO"
-        git -C padavan-ng checkout "$PADAVAN_COMMIT"
-        wget -qO- "$PADAVAN_TOOLCHAIN_URL" | tar -C padavan-ng --zstd -xf -
+        git clone -b "$PADAVAN_BRANCH" "$PADAVAN_REPO" $PADAVAN_ICP
+        git -C $PADAVAN_ICP checkout "$PADAVAN_COMMIT"
+        wget -qO- "$PADAVAN_TOOLCHAIN_URL" | tar -C $PADAVAN_ICP --zstd -xf -
 
     - name: Install themes
       run: |
         if [[ -n $PADAVAN_THEMES ]]; then
           git clone --depth 1 -b "$PADAVAN_THEMES_BRANCH" "$PADAVAN_THEMES_REPO" themes
-          cp -r themes/common-theme themes/jquery.js padavan-ng/trunk/user/www/n56u_ribbon_fixed
+          cp -r themes/common-theme themes/jquery.js $PADAVAN_ICP/trunk/user/www/n56u_ribbon_fixed
 
           for theme in $PADAVAN_THEMES; do
             echo "Installing $theme theme"
-            cp -r "themes/$theme-theme" padavan-ng/trunk/user/www/n56u_ribbon_fixed
+            cp -r "themes/$theme-theme" $PADAVAN_ICP/trunk/user/www/n56u_ribbon_fixed
           done
         fi
 
@@ -47,8 +47,8 @@ jobs:
 
     - name: Build firmware
       run: |
-        cp build.config padavan-ng/trunk/.config
-        cd padavan-ng/trunk
+        cp build.config $PADAVAN_ICP/trunk/.config
+        cd $PADAVAN_ICP/trunk
         ./clear_tree.sh
         ./build_firmware.sh
 
@@ -62,7 +62,7 @@ jobs:
 
     - name: Prepare artifacts
       run: |
-        cp "padavan-ng/trunk/images/$FW_FILE_NAME" .
+        cp "$PADAVAN_ICP/trunk/images/$FW_FILE_NAME" .
         echo "BUILD_TIMESTAMP=$(date '+%Y.%m.%d_%H.%M.%S')" >> $GITHUB_ENV
 
     - name: Upload artifacts
@@ -76,7 +76,7 @@ jobs:
 
     - name: Check firmware size
       run: |
-        partitions=padavan-ng/trunk/configs/boards/$CONFIG_VENDOR/$CONFIG_FIRMWARE_PRODUCT_ID/partitions.config
+        partitions=$PADAVAN_ICP/trunk/configs/boards/$CONFIG_VENDOR/$CONFIG_FIRMWARE_PRODUCT_ID/partitions.config
         max_fw_size="$(awk '/Firmware/ { getline; getline; sub(",", ""); print strtonum($2); }' "$partitions")"
         fw_size="$(stat -c %s "$FW_FILE_NAME")"
 
@@ -85,4 +85,4 @@ jobs:
           max_fw_size_fmtd="$(numfmt --grouping "$max_fw_size") bytes"
           echo "Firmware size ($fw_size_fmtd) exceeds max size ($max_fw_size_fmtd) for your target device"
           exit 1
-        fi
+        fi
\ No newline at end of file
diff --git a/variables b/variables
index cc45876a7..6e4b18400 100644
--- a/variables
+++ b/variables
@@ -1,6 +1,7 @@
 PADAVAN_REPO="https://gitlab.com/hadzhioglu/padavan-ng.git"
 PADAVAN_BRANCH="master"
 PADAVAN_COMMIT="HEAD"
+PADAVAN_ICP="padavan-ng"
 PADAVAN_TOOLCHAIN_URL="https://gitlab.com/api/v4/projects/hadzhioglu%2Fpadavan-ng/packages/generic/toolchain/latest/toolchain.tzst"
 
 PADAVAN_THEMES_REPO="https://gitlab.com/hadzhioglu/padavan-themes.git"