diff --git a/fluffychat.yml b/fluffychat.yml
index f7ca587..cb57e66 100644
--- a/fluffychat.yml
+++ b/fluffychat.yml
@@ -8,19 +8,26 @@ platform:
   arch: amd64
 
 steps:
-- name: build
+- name: prepare
   image: archlinux:base-devel
   commands:
-  - pacman -Sy clang cmake ninja git java-environment glu unzip libglvnd python gtk3 --noconfirm
+  - pacman -Sy git java-environment glu unzip libglvnd python --noconfirm
   - useradd builduser -m
   - git clone https://aur.archlinux.org/flutter.git
   - chown -R builduser:builduser flutter
   - cd flutter && su builduser
   - PKGEXT=".pkg.tar" makepkg 
-  - exit
-  - pacman -U flutter-*-x86_64.pkg.tar --noconfirm
-  - cd ..
+
+- name: build
+  image: archlinux:base-devel
+  commands:
+  - pacman -Sy clang cmake ninja git unzip gtk3 --noconfirm
+  - pacman -U flutter/flutter-*-x86_64.pkg.tar --noconfirm
   - sh scripts/build-linux.sh
+
+- name: bundle
+  image: archlinux:base-devel
+  commands:
   - tar -a -jcf fluffychat-linux-x86.tgz build/linux/x64/release/bundle/*
 
 - name: release