diff --git a/Makefile b/Makefile
index 349bd0f7..bbf4ce1e 100644
--- a/Makefile
+++ b/Makefile
@@ -112,11 +112,11 @@ upload: package
 
 .PHONY: build-image
 build-image:
-	$(MAKE) -C docker build
+	$(MAKE) -C docker build AGENT_VERSION=$(VERSION)
 
 .PHONY: push-image
 push-image:
-	$(MAKE) -C docker push
+	$(MAKE) -C docker push AGENT_VERSION=$(VERSION)
 
 .PHONY: clean
 # FIXME change to python based so we can run on windows
diff --git a/docker/Makefile b/docker/Makefile
index f44cbee0..23c655dc 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -18,7 +18,7 @@ D := docker
 
 P := grpc http kafka
 
-TARGETS := py3.7 py3.8 py3.9 py3.10 python3.11 py3.7-slim py3.8-slim py3.9-slim py3.10-slim python3.11-slim
+TARGETS := py3.7 py3.8 py3.9 py3.10 py3.11 py3.7-slim py3.8-slim py3.9-slim py3.10-slim py3.11-slim
 
 py3.7: BASE_PYTHON_IMAGE = python:3.7
 py3.8: BASE_PYTHON_IMAGE = python:3.8
@@ -33,8 +33,6 @@ py3.11-slim: BASE_PYTHON_IMAGE = python:3.11-slim
 
 PUSH_TARGETS := $(TARGETS:%=push-%)
 
-word-dash = $(word $2,$(subst -, ,$1))
-
 build: $(TARGETS)
 push: $(PUSH_TARGETS)
 
@@ -50,7 +48,7 @@ $(TARGETS):
 
 
 $(PUSH_TARGETS):
-	$(eval version := $(call word-dash,$@,2))
+	$(eval version := $(subst push-,,$@))
 	for p in $(P); do \
 		$(D) push apache/skywalking-python:${AGENT_VERSION}-$$p-${version}; \
 	done