diff --git a/.drone.yml b/.drone.yml
index 7d11e9f..ee32570 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -9,22 +9,40 @@ platform:
   arch: arm
 
 steps:
-- name: makepkg
-  image: agners/archlinuxarm
+- name: makepkg-core
+  image: serguzim/emgauwa-packager
   commands:
-  - pacman -Syu --noconfirm base-devel awk tar wiringpi
-  - sed -i 's/(( EUID == 0 ))/(( 1 == 0 ))/g' /usr/bin/makepkg
   - export CFLAGS="-marm -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s"
   - export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
   - cd core/
   - makepkg -s -f --cleanbuild --noconfirm
-  - cd ../core-testing
+- name: makepkg-core-testimg
+  image: serguzim/emgauwa-packager
+  commands:
+  - export CFLAGS="-marm -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s"
+  - export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
+  - cd core-testing/
   - makepkg -s -f --cleanbuild --noconfirm
-  - cd ../controller
+- name: makepkg-controller
+  image: serguzim/emgauwa-packager
+  commands:
+  - export CFLAGS="-marm -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s"
+  - export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
+  - cd controller/
   - makepkg -s -f --cleanbuild --noconfirm
-  - cd ../controller-testing
+- name: makepkg-controller-testing
+  image: serguzim/emgauwa-packager
+  commands:
+  - export CFLAGS="-marm -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s"
+  - export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
+  - cd controller-testing/
   - makepkg -s -f --cleanbuild --noconfirm
-  - cd ../webapp
+- name: makepkg-webapp
+  image: serguzim/emgauwa-packager
+  commands:
+  - export CFLAGS="-marm -mfpu=vfp -march=armv6zk+fp -mcpu=arm1176jzf-s -mtune=arm1176jzf-s"
+  - export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)"
+  - cd webapp/
   - makepkg -s -f --cleanbuild --noconfirm
 - name: upload_package
   image: serguzim/drone-webdav