diff --git a/charts/postgres-operator-ui/Chart.yaml b/charts/postgres-operator-ui/Chart.yaml
index 467e19b45..1f0b09fe6 100644
--- a/charts/postgres-operator-ui/Chart.yaml
+++ b/charts/postgres-operator-ui/Chart.yaml
@@ -1,7 +1,7 @@
-apiVersion: v1
+apiVersion: v2
 name: postgres-operator-ui
-version: 1.8.0
-appVersion: 1.8.0
+version: 1.8.1
+appVersion: 1.8.1
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience
 keywords:
diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml
index 7afbf2354..90482fdbf 100644
--- a/charts/postgres-operator/Chart.yaml
+++ b/charts/postgres-operator/Chart.yaml
@@ -1,7 +1,7 @@
-apiVersion: v1
+apiVersion: v2
 name: postgres-operator
-version: 1.8.0
-appVersion: 1.8.0
+version: 1.8.1
+appVersion: 1.8.1
 home: https://github.com/zalando/postgres-operator
 description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes
 keywords:
diff --git a/pkg/apis/acid.zalan.do/v1/postgresql_type.go b/pkg/apis/acid.zalan.do/v1/postgresql_type.go
index 3d37dacfb..1e9245fb8 100644
--- a/pkg/apis/acid.zalan.do/v1/postgresql_type.go
+++ b/pkg/apis/acid.zalan.do/v1/postgresql_type.go
@@ -238,6 +238,7 @@ type ConnectionPooler struct {
 	*Resources `json:"resources,omitempty"`
 }
 
+// Stream defines properties for creating FabricEventStream resources
 type Stream struct {
 	ApplicationId string                 `json:"applicationId"`
 	Database      string                 `json:"database"`
@@ -246,6 +247,7 @@ type Stream struct {
 	BatchSize     *uint32                `json:"batchSize,omitempty"`
 }
 
+// StreamTable defines properties of outbox tables for FabricEventStreams
 type StreamTable struct {
 	EventType     string  `json:"eventType"`
 	IdColumn      *string `json:"idColumn,omitempty"`
diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go
index e6364c39c..b7f5c45c1 100644
--- a/pkg/util/users/users.go
+++ b/pkg/util/users/users.go
@@ -20,7 +20,7 @@ const (
 	alterRoleSetSQL      = `ALTER ROLE "%s" SET %s TO %s`
 	dropUserSQL          = `SET LOCAL synchronous_commit = 'local'; DROP ROLE "%s";`
 	grantToUserSQL       = `GRANT %s TO "%s"`
-	revokeFromUserSQL    = `REVOKE %s FROM %s`
+	revokeFromUserSQL    = `REVOKE "%s" FROM "%s"`
 	doBlockStmt          = `SET LOCAL synchronous_commit = 'local'; DO $$ BEGIN %s; END;$$;`
 	passwordTemplate     = "ENCRYPTED PASSWORD '%s'"
 	inRoleTemplate       = `IN ROLE %s`