diff --git a/Makefile b/Makefile
index dc3a22f4e..cb52ca61a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 APPMGR_SRC := $(shell find appmgr/src) appmgr/Cargo.toml appmgr/Cargo.lock
+AGENT_SRC := $(shell find agent/src) $(shell find agent/config) agent/stack.yaml agent/package.yaml agent/build.sh
 
 .DELETE_ON_ERROR:
 
@@ -19,4 +20,7 @@ product_key:
 
 appmgr/target/armv7-unknown-linux-musleabihf/release/appmgr: $(APPMGR_SRC)
 	docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest cargo build --release --features=production
-	docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest arm-linux-gnueabi-strip target/armv7-unknown-linux-gnueabihf/release/appmgr
\ No newline at end of file
+	docker run --rm -it -v ~/.cargo/registry:/root/.cargo/registry -v "$(shell pwd)"/appmgr:/home/rust/src start9/rust-arm-cross:latest arm-linux-gnueabi-strip target/armv7-unknown-linux-gnueabihf/release/appmgr
+
+agent: $(AGENT_SRC)
+	(cd agent; ./build.sh)
diff --git a/agent/build.sh b/agent/build.sh
index 82cd44b54..b26b724e9 100755
--- a/agent/build.sh
+++ b/agent/build.sh
@@ -4,4 +4,3 @@ cat config/settings.yml | grep app-mgr-version-spec
 cat package.yaml | grep version
 
 stack --local-bin-path ./executables build --copy-bins #--flag start9-agent:disable-auth
-upx ./executables/agent