diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 29ecac3..ac338c3 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -7,7 +7,6 @@
 # be requested for review when someone opens a pull request.
 # order is alphabetical for easier maintenance.
 #
-# Michael Edegware (medegw01)
 # Sean Gallacher (gallacher)
 # Trevor Dawe (tdawe)
 # Alexander Hoppe (hoppea2)
@@ -15,8 +14,12 @@
 # Aaron Tye (atye)
 # Florian Coulombel (coulof)
 # Shayna Finocchiaro (shaynafinocchiaro)
-# Logan Jones (lj-software)
 # Sharmila Ramamoorthy (sharmilarama)
+# Forrest Xia (forrestxia)
+# Yian Zong (YianZong)
+# Yiming Bao (baoy1)
+# Tao He (taohe1012)
+# Peter Cao (P-Cao)
 
 # for all files:
-* @medegw01 @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @lj-software @sharmilarama
+* @gallacher @tdawe @alikdell @atye @hoppea2 @coulof @shaynafinocchiaro @sharmilarama @forrestxia @YianZong @baoy1 @taohe1012 @P-Cao
diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml
index 09152f0..1e6a604 100644
--- a/.github/workflows/actions.yaml
+++ b/.github/workflows/actions.yaml
@@ -78,3 +78,5 @@ jobs:
         with:
           image-name: csm-topology
           severity-threshold: HIGH
+        env:
+          DOCKLE_HOST: "unix:///var/run/docker.sock"
diff --git a/internal/k8s/volume_finder_test.go b/internal/k8s/volume_finder_test.go
index 1bd4b34..28e775f 100644
--- a/internal/k8s/volume_finder_test.go
+++ b/internal/k8s/volume_finder_test.go
@@ -228,7 +228,7 @@ func Test_K8sPersistentVolumeFinder(t *testing.T) {
 									VolumeAttributes: map[string]string{
 										"Name":              "persistent-volume-name-3",
 										"AccessZone":        "System",
-										"AzServiceIP":       "10.0.0.1",
+										"AzServiceIP":       "192.0.0.1",
 										"ClusterName":       "pieisi93x",
 										"ID":                "15",
 										"Path":              "/ifs/data/csi/persistent-volume-name-3",
diff --git a/internal/service/service.go b/internal/service/service.go
index 5b315b5..205a654 100644
--- a/internal/service/service.go
+++ b/internal/service/service.go
@@ -243,6 +243,7 @@ func supportedColumnPair(volume k8s.VolumeInfo) map[string]string {
 		"CSI Driver":     volume.Driver,
 		"Storage Pool":   volume.StoragePoolName,
 		"Storage System": volume.StorageSystem,
+		"Storage Class":  volume.StorageClass,
 	}
 }
 func canAddRow(volume k8s.VolumeInfo, lookUp []map[string]string) bool {