diff --git a/docker/postgres-kanister-tools/requirements.txt b/docker/postgres-kanister-tools/requirements.txt
index 9887c7d51b..e1e713f440 100644
--- a/docker/postgres-kanister-tools/requirements.txt
+++ b/docker/postgres-kanister-tools/requirements.txt
@@ -1,4 +1,4 @@
-awscli==1.35.20
+awscli==1.36.10
 pip==24.3.1
-setuptools==75.3.0
-wheel==0.44.0
+setuptools==75.6.0
+wheel==0.45.1
diff --git a/docker/postgresql/requirements.txt b/docker/postgresql/requirements.txt
index 5bfbb11d44..fdc1cfa954 100644
--- a/docker/postgresql/requirements.txt
+++ b/docker/postgresql/requirements.txt
@@ -1,5 +1,5 @@
-awscli==1.35.20
+awscli==1.36.10
 wal-e==1.1.1
 pip==24.3.1
-setuptools==75.3.0
-wheel==0.44.0
+setuptools==75.6.0
+wheel==0.45.1
diff --git a/pkg/blockstorage/azure/azuredisk.go b/pkg/blockstorage/azure/azuredisk.go
index 24ffe5cb09..e67d6ef07a 100644
--- a/pkg/blockstorage/azure/azuredisk.go
+++ b/pkg/blockstorage/azure/azuredisk.go
@@ -549,12 +549,12 @@ func (s *AdStorage) SnapshotsList(ctx context.Context, tags map[string]string) (
 			return nil, errkit.Wrap(err, "SnapshotsClient.List in SnapshotsList")
 		}
 		for _, snap := range page.Value {
-			k10Snap, err := s.SnapshotParse(ctx, *snap)
+			parsedSnap, err := s.SnapshotParse(ctx, *snap)
 			if err != nil {
 				log.WithError(err).Print("Incorrect Snaphost type", field.M{"SnapshotID": snap.ID})
 				continue
 			}
-			snaps = append(snaps, k10Snap)
+			snaps = append(snaps, parsedSnap)
 		}
 	}
 	snaps = blockstorage.FilterSnapshotsWithTags(snaps, blockstorage.SanitizeTags(tags))
diff --git a/pkg/blockstorage/tags/tags.go b/pkg/blockstorage/tags/tags.go
index ae99e2eec0..95dbb3faea 100644
--- a/pkg/blockstorage/tags/tags.go
+++ b/pkg/blockstorage/tags/tags.go
@@ -27,7 +27,7 @@ import (
 const (
 	// ClusterTagKey is used to tag resources with the cluster name
 	ClusterTagKey = "kanister.io/clustername"
-	// VersionTagKey is used to tag resources with the K10 version
+	// VersionTagKey is used to tag resources with a version
 	VersionTagKey = "kanister.io/version"
 	// AppNameTag is used to tag volumes with the app they belong to
 	AppNameTag = "kanister.io/appname"
diff --git a/pkg/objectstore/directory.go b/pkg/objectstore/directory.go
index f184c29449..d228230cc1 100644
--- a/pkg/objectstore/directory.go
+++ b/pkg/objectstore/directory.go
@@ -234,7 +234,7 @@ func (d *directory) Put(ctx context.Context, name string, r io.Reader, size int6
 	if d.path == "" {
 		return errors.New("invalid entry")
 	}
-	// K10 tags include '/'. Remove them, at least for S3
+	// Replace any '/' in tags with '-'.
 	sTags := sanitizeTags(tags)
 
 	objName := d.absPathName(name)