diff --git a/Makefile b/Makefile
index cbbff7dd0..70dfc6b85 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ docker-build-runner: docker-build-go-base ## Build docker image for NeonVM runne
 		.
 
 .PHONY: docker-build-daemon
-docker-build-daemon: ## Build docker image for NeonVM daemon.
+docker-build-daemon: docker-build-go-base ## Build docker image for NeonVM daemon.
 	docker build \
 		--tag $(IMG_DAEMON) \
 		--file neonvm-daemon/Dockerfile \
diff --git a/neonvm-daemon/Dockerfile b/neonvm-daemon/Dockerfile
index 4b9944e0e..fffe67b71 100644
--- a/neonvm-daemon/Dockerfile
+++ b/neonvm-daemon/Dockerfile
@@ -1,4 +1,5 @@
-FROM golang:1.23-alpine AS builder
+ARG GO_BASE_IMG=autoscaling-go-base:dev
+FROM $GO_BASE_IMG AS builder
 
 # Build the Go binary
 COPY . .