diff --git a/.github/workflows/cross-compile.yaml b/.github/workflows/cross-compile.yaml
index 6ba62dcf9..93e1f4885 100644
--- a/.github/workflows/cross-compile.yaml
+++ b/.github/workflows/cross-compile.yaml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [ 1.19.x, 1.20.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
@@ -56,7 +56,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [ 1.20.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
@@ -85,7 +85,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [ 1.20.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
@@ -115,7 +115,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [ 1.20.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
@@ -145,7 +145,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [ 1.20.x ]
+        go-version: [ 1.21.x ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
diff --git a/.github/workflows/jobs.yaml b/.github/workflows/jobs.yaml
index 3b01504a7..8b2eb11f4 100644
--- a/.github/workflows/jobs.yaml
+++ b/.github/workflows/jobs.yaml
@@ -22,7 +22,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -65,7 +65,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -110,7 +110,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -133,7 +133,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
     steps:
       # To build minio image, we need to clone the repository first
       - name: Clone github.com/minio/minio
@@ -168,7 +168,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -208,7 +208,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -256,7 +256,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -303,7 +303,7 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -350,7 +350,7 @@ jobs:
     timeout-minutes: 15
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -393,7 +393,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -436,7 +436,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -479,7 +479,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -521,7 +521,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -564,7 +564,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -610,7 +610,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -656,7 +656,7 @@ jobs:
     runs-on: [ubuntu-latest]
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -705,7 +705,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -742,7 +742,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -781,7 +781,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
 
     steps:
       - name: Check out code
@@ -870,7 +870,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
 
     steps:
       - name: Check out code
@@ -945,7 +945,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
 
     steps:
       - name: Check out code
@@ -1016,7 +1016,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -1135,7 +1135,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
@@ -1176,7 +1176,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        go-version: [1.20.x]
+        go-version: [1.21.x]
         os: [ubuntu-latest]
     steps:
       - name: Check out code
diff --git a/.github/workflows/vulncheck.yaml b/.github/workflows/vulncheck.yaml
index a2cbf57c7..3d050bf19 100644
--- a/.github/workflows/vulncheck.yaml
+++ b/.github/workflows/vulncheck.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.20.x
+          go-version: 1.21.0
           check-latest: true
       - name: Get official govulncheck
         run: go install golang.org/x/vuln/cmd/govulncheck@latest
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [ 1.20.x ]
+        go-version: [ 1.21.0 ]
         os: [ ubuntu-latest ]
     steps:
       - name: Check out code
diff --git a/restapi/admin_info.go b/restapi/admin_info.go
index 44b37973e..19a1d1f87 100644
--- a/restapi/admin_info.go
+++ b/restapi/admin_info.go
@@ -60,7 +60,7 @@ type UsageInfo struct {
 	Buckets          int64
 	Objects          int64
 	Usage            int64
-	DisksUsage       int64
+	DrivesUsage      int64
 	Servers          []*models.ServerProperties
 	EndpointNotReady bool
 	Backend          *models.BackendProperties
@@ -125,12 +125,12 @@ func GetAdminInfo(ctx context.Context, client MinioAdmin) (*UsageInfo, error) {
 		OfflineDrives:    int64(offlineDrives),
 	}
 	return &UsageInfo{
-		Buckets:    int64(serverInfo.Buckets.Count),
-		Objects:    int64(serverInfo.Objects.Count),
-		Usage:      int64(serverInfo.Usage.Size),
-		DisksUsage: usedSpace,
-		Servers:    serverArray,
-		Backend:    backendData,
+		Buckets:     int64(serverInfo.Buckets.Count),
+		Objects:     int64(serverInfo.Objects.Count),
+		Usage:       int64(serverInfo.Usage.Size),
+		DrivesUsage: usedSpace,
+		Servers:     serverArray,
+		Backend:     backendData,
 	}, nil
 }
 
@@ -173,7 +173,7 @@ type WidgetLabel struct {
 
 var labels = []WidgetLabel{
 	{Name: "instance"},
-	{Name: "disk"},
+	{Name: "drive"},
 	{Name: "server"},
 	{Name: "api"},
 }
@@ -443,7 +443,7 @@ var widgets = []Metric{
 	},
 	{
 		ID:            9,
-		Title:         "Total Online Disks",
+		Title:         "Total Online Drives",
 		Type:          "stat",
 		MaxDataPoints: 100,
 		GridPos: GridPos{
@@ -461,8 +461,8 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `minio_cluster_disk_online_total{$__query}`,
-				LegendFormat: "Total online disks in MinIO Cluster",
+				Expr:         `minio_cluster_drive_online_total{$__query}`,
+				LegendFormat: "Total online drives in MinIO Cluster",
 				Step:         60,
 			},
 		},
@@ -555,7 +555,7 @@ var widgets = []Metric{
 	},
 	{
 		ID:            78,
-		Title:         "Total Offline Disks",
+		Title:         "Total Offline Drives",
 		Type:          "stat",
 		MaxDataPoints: 100,
 		GridPos: GridPos{
@@ -573,7 +573,7 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `minio_cluster_disk_offline_total{$__query}`,
+				Expr:         `minio_cluster_drive_offline_total{$__query}`,
 				LegendFormat: "",
 				Step:         60,
 			},
@@ -759,8 +759,8 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `minio_node_disk_used_bytes{$__query}`,
-				LegendFormat: "Used Capacity [{{server}}:{{disk}}]",
+				Expr:         `minio_node_drive_used_bytes{$__query}`,
+				LegendFormat: "Used Capacity [{{server}}:{{drive}}]",
 			},
 		},
 	},
@@ -776,8 +776,8 @@ var widgets = []Metric{
 		},
 		Targets: []Target{
 			{
-				Expr:         `minio_cluster_disk_free_inodes{$__query}`,
-				LegendFormat: "Free Inodes [{{server}}:{{disk}}]",
+				Expr:         `minio_cluster_drive_free_inodes{$__query}`,
+				LegendFormat: "Free Inodes [{{server}}:{{drive}}]",
 			},
 		},
 	},