diff --git a/Makefile b/Makefile
index 75ee98b3..050254a2 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ govendor-sync:
 src.build:
 	$(GO) build -v ./src/...
 	$(MKDIR_P) $(BUILD_FOLDER)/src/cmd/vortex/
-	$(GO) build -v -o $(BUILD_FOLDER)/src/cmd/vortex/vortex -ldflags="-X github.com/linkernetworks/vortex/src/version.version="$(SERVER_VERSION) ./src/cmd/vortex/...
+	$(GO) build -v -o $(BUILD_FOLDER)/src/cmd/vortex/vortex -ldflags="-X github.com/linkernetworks/vortex/src/version.version=$(SERVER_VERSION)" ./src/cmd/vortex/...
 
 .PHONY: src.test
 src.test:
diff --git a/deploy/helm/apps/vortex-server/templates/deployment.yaml b/deploy/helm/apps/vortex-server/templates/deployment.yaml
index 3ecff95a..d0fb8c7e 100644
--- a/deploy/helm/apps/vortex-server/templates/deployment.yaml
+++ b/deploy/helm/apps/vortex-server/templates/deployment.yaml
@@ -19,6 +19,6 @@ spec:
     spec:
       containers:
       - name: {{ .Chart.Name }}
-        image: sdnvortex/vortex:{{ .Values.global.tag }}
+        image: sdnvortex/vortex:{{ .Values.image.tag }}
         ports:
         - containerPort: 7890
diff --git a/deploy/helm/apps/vortex-server/values.yaml b/deploy/helm/apps/vortex-server/values.yaml
index 55267fd9..9192fd3a 100644
--- a/deploy/helm/apps/vortex-server/values.yaml
+++ b/deploy/helm/apps/vortex-server/values.yaml
@@ -4,7 +4,7 @@ global:
 
 replicaCount: 1
 image:
-  tag: develop
+  tag: v0.1.0
 
 service:
   ports:
@@ -13,4 +13,4 @@ service:
     nodePort: 32326
 
 auth:
-  enabled: false
\ No newline at end of file
+  enabled: false
diff --git a/deploy/kubernetes/apps/vortex/deployment.yaml b/deploy/kubernetes/apps/vortex/deployment.yaml
index 936d8349..9212e6cc 100644
--- a/deploy/kubernetes/apps/vortex/deployment.yaml
+++ b/deploy/kubernetes/apps/vortex/deployment.yaml
@@ -16,6 +16,6 @@ spec:
     spec:
       containers:
       - name: vortex-server
-        image: sdnvortex/vortex:develop
+        image: sdnvortex/vortex:v0.1.0
         ports:
         - containerPort: 7890