diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f22b73a04..56030f19c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,13 +1,15 @@
 name: Build OpenMPTCProuter
 on: [push]
 
+env:
+  REPO_URL: https://github.com/ysurac/openmptcprouter
+  REPO_BRANCH: develop
+  OMR_TARGET: x86_64
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        OMR_TARGET: ['x86_64']
 
     steps:
     - name: Prepare
@@ -23,7 +25,6 @@ jobs:
     - name: Build toolchain
       working-directory: ./openmptcprouter
       env:
-        OMR_TARGET: ${{matrix.OMR_TARGET}}
         OMR_FEED_URL: https://github.com/ysurac/openmptcprouter-feeds
         OMR_FEED_SRC: develop
       run: |
@@ -33,9 +34,9 @@ jobs:
     - name: Build packages
       working-directory: ./openmptcprouter
       run: |
-        make IGNORE_ERRORS=m package/{compile,install,index} -j$(nproc)
+        make IGNORE_ERRORS=m -C $OMR_TARGET/source package/{compile,install,index} -j$(nproc)
     - name: Build image
       working-directory: ./openmptcprouter
       run: |
-        make IGNORE_ERRORS=m target/install -j$(nproc)
+        make IGNORE_ERRORS=m -C $OMR_TARGET/source target/install -j$(nproc)