diff --git a/pkg/storage/driver/cfgmaps.go b/pkg/storage/driver/cfgmaps.go
index ce88c662b..546aa31f1 100644
--- a/pkg/storage/driver/cfgmaps.go
+++ b/pkg/storage/driver/cfgmaps.go
@@ -245,9 +245,9 @@ func newConfigMapsObject(key string, rls *rspb.Release, lbs labels) (*v1.ConfigM
 	}
 
 	// apply custom labels
-	lbs.fromMap(rls.Labels)
+	lbs.fromMap(filterSystemLabels(rls.Labels))
 
-	// apply labels
+	// apply system labels
 	lbs.set("name", rls.Name)
 	lbs.set("owner", owner)
 	lbs.set("status", rls.Info.Status.String())
diff --git a/pkg/storage/driver/secrets.go b/pkg/storage/driver/secrets.go
index 95a7e9032..7537763c1 100644
--- a/pkg/storage/driver/secrets.go
+++ b/pkg/storage/driver/secrets.go
@@ -227,9 +227,9 @@ func newSecretsObject(key string, rls *rspb.Release, lbs labels) (*v1.Secret, er
 	}
 
 	// apply custom labels
-	lbs.fromMap(rls.Labels)
+	lbs.fromMap(filterSystemLabels(rls.Labels))
 
-	// apply labels
+	// apply system labels
 	lbs.set("name", rls.Name)
 	lbs.set("owner", owner)
 	lbs.set("status", rls.Info.Status.String())