diff --git a/lib/agent b/lib/agent
index 3d9c83f..04aa523 160000
--- a/lib/agent
+++ b/lib/agent
@@ -1 +1 @@
-Subproject commit 3d9c83f9f4edfb400c95a3e93e0f67f166d8be5b
+Subproject commit 04aa5236c2ad36f92ea9b1dd7849ce750c81c8f8
diff --git a/scripts/make-release.js b/scripts/make-release.js
index 4b1db6a..74a5375 100755
--- a/scripts/make-release.js
+++ b/scripts/make-release.js
@@ -13,22 +13,15 @@ const releaseName = `uhk-firmware-${version}`;
 const releaseDir = `${__dirname}/${releaseName}`;
 const modulesDir = `${releaseDir}/modules`;
 const releaseFile = `${__dirname}/${releaseName}.tar.bz2`;
-const leftFirmwareFile = `${__dirname}/../left/build/uhk60-left_release/uhk-left.bin`;
+const leftFirmwareFile = `${__dirname}/../left/build_make/uhk_left.bin`;
 const usbDir = `${__dirname}/../lib/agent/packages/usb`;
 
 const deviceSourceFirmwares = package.devices.map(device => `${__dirname}/../${device.source}`);
 const moduleSourceFirmwares = package.modules.map(module => `${__dirname}/../${module.source}`);
 rm('-rf', releaseDir, releaseFile, deviceSourceFirmwares, moduleSourceFirmwares);
 
-exec(`/opt/Freescale/KDS_v3/eclipse/kinetis-design-studio \
---launcher.suppressErrors \
--noSplash \
--application org.eclipse.cdt.managedbuilder.core.headlessbuild \
--import ${__dirname}/../left/build \
--import ${__dirname}/../right/build \
--cleanBuild uhk-left \
--cleanBuild uhk-right`
-);
+exec(`cd ${__dirname}/../left; make -j8`);
+exec(`cd ${__dirname}/../right; make -j8`);
 
 for (const device of package.devices) {
     const deviceDir = `${releaseDir}/devices/${device.name}`;
diff --git a/scripts/package.json b/scripts/package.json
index 09222a4..f503844 100644
--- a/scripts/package.json
+++ b/scripts/package.json
@@ -24,14 +24,14 @@
     {
       "deviceId": 1,
       "name": "uhk60-right",
-      "source": "right/build/uhk60-right_release/uhk-right.hex"
+      "source": "right/build_make/uhk_right.hex"
     }
   ],
   "modules": [
     {
       "moduleId": 1,
       "name": "uhk60-left",
-      "source": "left/build/uhk60-left_release/uhk-left.bin"
+      "source": "left/build_make/uhk_left.bin"
     }
   ]
 }