diff --git a/weed/s3api/stats.go b/weed/s3api/stats.go
index ee52da11d..cd04b9970 100644
--- a/weed/s3api/stats.go
+++ b/weed/s3api/stats.go
@@ -3,6 +3,7 @@ package s3api
 import (
 	"github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants"
 	stats_collect "github.com/seaweedfs/seaweedfs/weed/stats"
+	"github.com/seaweedfs/seaweedfs/weed/util"
 	"net/http"
 	"strconv"
 	"time"
@@ -11,7 +12,7 @@ import (
 func track(f http.HandlerFunc, action string) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		bucket, _ := s3_constants.GetBucketAndObject(r)
-		w.Header().Set("Server", "SeaweedFS S3")
+		w.Header().Set("Server", "SeaweedFS "+util.VERSION)
 		recorder := stats_collect.NewStatusResponseWriter(w)
 		start := time.Now()
 		f(recorder, r)
diff --git a/weed/server/filer_server_handlers.go b/weed/server/filer_server_handlers.go
index 33f63f65a..69774ce27 100644
--- a/weed/server/filer_server_handlers.go
+++ b/weed/server/filer_server_handlers.go
@@ -75,7 +75,7 @@ func (fs *FilerServer) filerHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
+	w.Header().Set("Server", "SeaweedFS "+util.VERSION)
 
 	switch r.Method {
 	case http.MethodGet, http.MethodHead:
@@ -163,7 +163,7 @@ func (fs *FilerServer) readonlyFilerHandler(w http.ResponseWriter, r *http.Reque
 		return
 	}
 
-	w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
+	w.Header().Set("Server", "SeaweedFS "+util.VERSION)
 
 	switch r.Method {
 	case http.MethodGet, http.MethodHead:
@@ -224,7 +224,7 @@ func (fs *FilerServer) maybeCheckJwtAuthorization(r *http.Request, isWrite bool)
 }
 
 func (fs *FilerServer) filerHealthzHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Server", "SeaweedFS Filer "+util.VERSION)
+	w.Header().Set("Server", "SeaweedFS "+util.VERSION)
 	if _, err := fs.filer.Store.FindEntry(context.Background(), filer.TopicsDir); err != nil && err != filer_pb.ErrNotFound {
 		glog.Warningf("filerHealthzHandler FindEntry: %+v", err)
 		w.WriteHeader(http.StatusServiceUnavailable)