diff --git a/cmd/addon-manager/main.go b/cmd/addon-manager/main.go
index c9b0d63d..bf002a9f 100644
--- a/cmd/addon-manager/main.go
+++ b/cmd/addon-manager/main.go
@@ -88,7 +88,7 @@ func main() {
 		config.AgentImageName,
 		"The name of the addon agent's image")
 	flag.BoolVar(&enableKubeApiProxy, "enable-kube-api-proxy", true, "Enable proxy to agent kube-apiserver")
-	flag.BoolVar(&enableServiceProxy, "enable-service-proxy", false, "Enable service proxy")
+	flag.BoolVar(&enableServiceProxy, "enable-service-proxy", true, "Enable service proxy")
 	flag.StringVar(&config.DefaultAddonInstallNamespace, "agent-install-namespace", config.DefaultAddonInstallNamespace,
 		"The default namespace to install the addon agents.")
 	flag.StringVar(&imagePullPolicy, "image-pull-policy", string(corev1.PullIfNotPresent), "The image pull policy for the addon manager")
diff --git a/pkg/proxyagent/agent/manifests/charts/addon-agent/templates/addon-agent-deployment.yaml b/pkg/proxyagent/agent/manifests/charts/addon-agent/templates/addon-agent-deployment.yaml
index 466d1028..f9d34881 100644
--- a/pkg/proxyagent/agent/manifests/charts/addon-agent/templates/addon-agent-deployment.yaml
+++ b/pkg/proxyagent/agent/manifests/charts/addon-agent/templates/addon-agent-deployment.yaml
@@ -145,7 +145,7 @@ spec:
               {{- break -}}
             {{- end -}}
           {{- end }}
-          image: {{ .Values.proxyAgentImage }} # build by the cluster-proxy-addon repo
+          image: {{ .Values.registry }}/{{ .Values.image }}:{{ .Values.tag }}
           imagePullPolicy: IfNotPresent
           command:
             - /cluster-proxy