diff --git a/Documentation/examples/1-gerritcluster.yaml b/Documentation/examples/1-gerritcluster.yaml
index 6f61545..be5f033 100644
--- a/Documentation/examples/1-gerritcluster.yaml
+++ b/Documentation/examples/1-gerritcluster.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/2-gerritcluster-with-replica.yaml b/Documentation/examples/2-gerritcluster-with-replica.yaml
index 4ace2d1..6c490dd 100644
--- a/Documentation/examples/2-gerritcluster-with-replica.yaml
+++ b/Documentation/examples/2-gerritcluster-with-replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/3-gerritcluster-istio.yaml b/Documentation/examples/3-gerritcluster-istio.yaml
index c0ceece..a0ad6bc 100644
--- a/Documentation/examples/3-gerritcluster-istio.yaml
+++ b/Documentation/examples/3-gerritcluster-istio.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/4-gerritcluster-ha-replica.yaml b/Documentation/examples/4-gerritcluster-ha-replica.yaml
index fc8af4a..308285d 100644
--- a/Documentation/examples/4-gerritcluster-ha-replica.yaml
+++ b/Documentation/examples/4-gerritcluster-ha-replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/5-gerritcluster-refdb.yaml b/Documentation/examples/5-gerritcluster-refdb.yaml
index 4bd3175..9773d47 100644
--- a/Documentation/examples/5-gerritcluster-refdb.yaml
+++ b/Documentation/examples/5-gerritcluster-refdb.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/6-gerritcluster-ha-primary.yaml b/Documentation/examples/6-gerritcluster-ha-primary.yaml
index 2e74d28..4b67609 100644
--- a/Documentation/examples/6-gerritcluster-ha-primary.yaml
+++ b/Documentation/examples/6-gerritcluster-ha-primary.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/examples/gerritcluster-3-nodes-pr-kafka-multisite.yaml b/Documentation/examples/gerritcluster-3-nodes-pr-kafka-multisite.yaml
index f6daccf..58bb493 100644
--- a/Documentation/examples/gerritcluster-3-nodes-pr-kafka-multisite.yaml
+++ b/Documentation/examples/gerritcluster-3-nodes-pr-kafka-multisite.yaml
@@ -16,7 +16,7 @@
 type: Opaque
 
 ---
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/Documentation/operator-api-reference.md b/Documentation/operator-api-reference.md
index 2c011eb..20dafe3 100644
--- a/Documentation/operator-api-reference.md
+++ b/Documentation/operator-api-reference.md
@@ -30,6 +30,7 @@
   - [RefDatabase](#refdatabase)
   - [SpannerRefDbConfig](#spannerrefdbconfig)
   - [ZookeeperRefDbConfig](#zookeeperrefdbconfig)
+  - [DynamoDbRefDbConfig](#dynamodbrefdbconfig)
   - [IndexConfig](#indexconfig)
   - [IndexType](#indextype)
   - [ElasticSearchConfig](#elasticsearchconfig)
@@ -86,7 +87,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: GerritCluster
 
 ---
@@ -103,7 +104,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
@@ -173,6 +174,11 @@
     zookeeper:
       connectString: ""
       rootNode: ""
+    dynamoDb:
+      region: ""
+      endpoint: ""
+      lockTableName: ""
+      refsDbTableName: ""
 
   index:
     type: LUCENE
@@ -420,7 +426,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: Gerrit
 
 ---
@@ -437,7 +443,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Gerrit
 metadata:
   name: gerrit
@@ -631,6 +637,11 @@
     zookeeper:
       connectString: ""
       rootNode: ""
+    dynamoDb:
+      region: ""
+      endpoint: ""
+      lockTableName: ""
+      refsDbTableName: ""
 
   index:
     type: LUCENE
@@ -646,7 +657,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: Receiver
 
 ---
@@ -663,7 +674,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Receiver
 metadata:
   name: receiver
@@ -774,7 +785,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: GitGarbageCollection
 
 ---
@@ -791,7 +802,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GitGarbageCollection
 metadata:
   name: gitgc
@@ -835,7 +846,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: GerritNetwork
 
 ---
@@ -851,7 +862,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit-network
@@ -884,7 +895,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: IncomingReplicationTask
 
 ---
@@ -900,7 +911,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: IncomingReplicationTask
 metadata:
   name: incoming-repl-task
@@ -959,7 +970,7 @@
 ---
 
 **Group**: gerritoperator.google.com \
-**Version**: v1beta15 \
+**Version**: v1beta16 \
 **Kind**: GerritIndexer
 
 ---
@@ -975,7 +986,7 @@
 Example:
 
 ```yaml
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritIndexer
 metadata:
   name: gerrit-indexer
@@ -1166,17 +1177,19 @@
 
 | Field | Type | Description |
 |---|---|---|
-| `database` | [`RefDatabase`](#refdatabase) | Which database to use for the global refdb. Choices: `NONE`, `SPANNER`, `ZOOKEEPER`. (default: `NONE`) |
-| `spanner` | [`SpannerRefDbConfig`](#spannerrefdbconfig) | Configuration of spanner. Only used if spanner was configured to be used for the global refdb. |
+| `database`  | [`RefDatabase`](#refdatabase) | Which database to use for the global refdb. Choices: `NONE`, `SPANNER`, `ZOOKEEPER`, `DYNAMODB`. (default: `NONE`) |
+| `spanner`   | [`SpannerRefDbConfig`](#spannerrefdbconfig) | Configuration of spanner. Only used if spanner was configured to be used for the global refdb. |
 | `zookeeper` | [`ZookeeperRefDbConfig`](#zookeeperrefdbconfig) | Configuration of zookeeper. Only used, if zookeeper was configured to be used for the global refdb. |
+| `dynamoDb`  | [`DynamoDbRefDbConfig`](#dynamodbrefdbconfig) | Configuration of dynamoDb. Only used, if dynamoDb was configured to be used for the global refdb. |
 
 ## RefDatabase
 
-| Value | Description|
+| Value       | Description                                                                                                |
 |---|---|
-| `NONE` | No global refdb will be used. Not allowed, if a primary Gerrit with 2 or more instances will be installed. |
-| `SPANNER` | Spanner will be used as a global refdb |
-| `ZOOKEEPER` | Zookeeper will be used as a global refdb |
+| `NONE`      | No global refdb will be used. Not allowed, if a primary Gerrit with 2 or more instances will be installed. |
+| `SPANNER`   | Spanner will be used as a global refdb                                                                     |
+| `ZOOKEEPER` | Zookeeper will be used as a global refdb                                                                   |
+| `DYNAMODB`  | DynamoDb will be used as a global refdb                                                                    |
 
 ## SpannerRefDbConfig
 
@@ -1192,9 +1205,18 @@
 
 | Field | Type | Description |
 |---|---|---|
-| `connectString` | `String` | Hostname and port of the zookeeper instance to be used, e.g. `zookeeper.example.com:2181` |
+| `connectString` | `String` | Hostname and port of the zook§eeper instance to be used, e.g. `zookeeper.example.com:2181` |
 | `rootNode` | `String` | Root node that will be used to store the global refdb data. Will be set automatically, if `GerritCluster` is being used. |
 
+## DynamoDbRefDbConfig
+
+| Field | Type | Description|
+|---|---|---|
+| `region` | `String` | AWS region to connect to. Default: When not specified this value is provided via the default Region Provider Chain.|
+| `endpoint` | `String` | When defined, it will override the default dynamodb endpoint and connect to it, rather than connecting to AWS. This is useful when developing or testing, in order to connect locally.|
+| `locksTableName` | `String` | The name of the dynamoDB table used to store distribute locks. See [DynamoDB lock client](https://github.com/awslabs/amazon-dynamodb-lock-client)|
+| `refsDbTableName` | `String` | The name of the dynamoDB table used to store git refs and their associated sha1.|
+
 ## IndexConfig
 
 Note, that the operator will not deploy or operate the search index. It will only
diff --git a/Documentation/roadmap.md b/Documentation/roadmap.md
index cd2d506..5b11017 100644
--- a/Documentation/roadmap.md
+++ b/Documentation/roadmap.md
@@ -55,6 +55,7 @@
   implementation. The following implementations are supported:
   - [spanner-refdb](https://gerrit.googlesource.com/plugins/spanner-refdb)
   - [zookeeper-refdb](https://gerrit.googlesource.com/plugins/zookeeper-refdb)
+  - [dynamodb-refdb](https://gerrit.googlesource.com/plugins/aws-dynamodb-refdb/)
 
   \
   The Gerrit Operator does not set up the database used for the Global RefDB. It
diff --git a/crd/current/gerritclusters.gerritoperator.google.com-v1.yml b/crd/current/gerritclusters.gerritoperator.google.com-v1.yml
index a29f059..3c38017 100644
--- a/crd/current/gerritclusters.gerritoperator.google.com-v1.yml
+++ b/crd/current/gerritclusters.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritcluster
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
@@ -1570,10 +1570,22 @@
                 properties:
                   database:
                     enum:
+                    - DYNAMODB
                     - NONE
                     - SPANNER
                     - ZOOKEEPER
                     type: string
+                  dynamoDb:
+                    properties:
+                      endpoint:
+                        type: string
+                      locksTableName:
+                        type: string
+                      refsDbTableName:
+                        type: string
+                      region:
+                        type: string
+                    type: object
                   spanner:
                     properties:
                       database:
diff --git a/crd/current/gerritindexers.gerritoperator.google.com-v1.yml b/crd/current/gerritindexers.gerritoperator.google.com-v1.yml
index 73264f7..e0c16a7 100644
--- a/crd/current/gerritindexers.gerritoperator.google.com-v1.yml
+++ b/crd/current/gerritindexers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritindexer
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/current/gerritmaintenances.gerritoperator.google.com-v1.yml b/crd/current/gerritmaintenances.gerritoperator.google.com-v1.yml
index 59a7575..5690b33 100644
--- a/crd/current/gerritmaintenances.gerritoperator.google.com-v1.yml
+++ b/crd/current/gerritmaintenances.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: gerritmaintenance
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/current/gerritnetworks.gerritoperator.google.com-v1.yml b/crd/current/gerritnetworks.gerritoperator.google.com-v1.yml
index e358f0b..e1f1562 100644
--- a/crd/current/gerritnetworks.gerritoperator.google.com-v1.yml
+++ b/crd/current/gerritnetworks.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritnetwork
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/current/gerrits.gerritoperator.google.com-v1.yml b/crd/current/gerrits.gerritoperator.google.com-v1.yml
index b7554c9..5e857bd 100644
--- a/crd/current/gerrits.gerritoperator.google.com-v1.yml
+++ b/crd/current/gerrits.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerrit
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
@@ -663,10 +663,22 @@
                 properties:
                   database:
                     enum:
+                    - DYNAMODB
                     - NONE
                     - SPANNER
                     - ZOOKEEPER
                     type: string
+                  dynamoDb:
+                    properties:
+                      endpoint:
+                        type: string
+                      locksTableName:
+                        type: string
+                      refsDbTableName:
+                        type: string
+                      region:
+                        type: string
+                    type: object
                   spanner:
                     properties:
                       database:
diff --git a/crd/current/gitgcs.gerritoperator.google.com-v1.yml b/crd/current/gitgcs.gerritoperator.google.com-v1.yml
index 0891f90..3c38ca8 100644
--- a/crd/current/gitgcs.gerritoperator.google.com-v1.yml
+++ b/crd/current/gitgcs.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gitgarbagecollection
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/current/incomingreplicationtasks.gerritoperator.google.com-v1.yml b/crd/current/incomingreplicationtasks.gerritoperator.google.com-v1.yml
index 57f8975..dae9047 100644
--- a/crd/current/incomingreplicationtasks.gerritoperator.google.com-v1.yml
+++ b/crd/current/incomingreplicationtasks.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: incomingreplicationtask
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/current/receivers.gerritoperator.google.com-v1.yml b/crd/current/receivers.gerritoperator.google.com-v1.yml
index bb5e1e3..224fc54 100644
--- a/crd/current/receivers.gerritoperator.google.com-v1.yml
+++ b/crd/current/receivers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: receiver
   scope: Namespaced
   versions:
-  - name: v1beta15
+  - name: v1beta16
     schema:
       openAPIV3Schema:
         properties:
diff --git a/crd/deprecated/gerritclusters.gerritoperator.google.com-v1.yml b/crd/deprecated/gerritclusters.gerritoperator.google.com-v1.yml
index e93f819..31c484b 100644
--- a/crd/deprecated/gerritclusters.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gerritclusters.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritcluster
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -713,8 +713,6 @@
                                   properties:
                                     name:
                                       type: string
-                                    request:
-                                      type: string
                                   type: object
                                 type: array
                               limits:
@@ -917,6 +915,8 @@
                             type: string
                           type: object
                       type: object
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
@@ -1480,8 +1480,6 @@
                                 properties:
                                   name:
                                     type: string
-                                  request:
-                                    type: string
                                 type: object
                               type: array
                             limits:
@@ -1949,8 +1947,6 @@
                                           properties:
                                             name:
                                               type: string
-                                            request:
-                                              type: string
                                           type: object
                                         type: array
                                       limits:
@@ -2432,8 +2428,6 @@
                                       properties:
                                         name:
                                           type: string
-                                        request:
-                                          type: string
                                       type: object
                                     type: array
                                   limits:
diff --git a/crd/deprecated/gerritindexers.gerritoperator.google.com-v1.yml b/crd/deprecated/gerritindexers.gerritoperator.google.com-v1.yml
index 992e7d1..fe2574a 100644
--- a/crd/deprecated/gerritindexers.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gerritindexers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritindexer
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -375,8 +375,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/crd/deprecated/gerritmaintenances.gerritoperator.google.com-v1.yml b/crd/deprecated/gerritmaintenances.gerritoperator.google.com-v1.yml
index f4c05a1..800a9ff 100644
--- a/crd/deprecated/gerritmaintenances.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gerritmaintenances.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: gerritmaintenance
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -401,8 +401,6 @@
                                   properties:
                                     name:
                                       type: string
-                                    request:
-                                      type: string
                                   type: object
                                 type: array
                               limits:
diff --git a/crd/deprecated/gerritnetworks.gerritoperator.google.com-v1.yml b/crd/deprecated/gerritnetworks.gerritoperator.google.com-v1.yml
index 731ac86..d5ebe0f 100644
--- a/crd/deprecated/gerritnetworks.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gerritnetworks.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritnetwork
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -54,6 +54,8 @@
                             type: string
                           type: object
                       type: object
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
diff --git a/crd/deprecated/gerrits.gerritoperator.google.com-v1.yml b/crd/deprecated/gerrits.gerritoperator.google.com-v1.yml
index ca270af..a6942f2 100644
--- a/crd/deprecated/gerrits.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gerrits.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerrit
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -480,6 +480,8 @@
                       type: boolean
                     host:
                       type: string
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
@@ -691,8 +693,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/crd/deprecated/gitgcs.gerritoperator.google.com-v1.yml b/crd/deprecated/gitgcs.gerritoperator.google.com-v1.yml
index 73b744f..ff0cc93 100644
--- a/crd/deprecated/gitgcs.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/gitgcs.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gitgarbagecollection
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -366,8 +366,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/crd/deprecated/incomingreplicationtasks.gerritoperator.google.com-v1.yml b/crd/deprecated/incomingreplicationtasks.gerritoperator.google.com-v1.yml
index 0ecab2d..9469597 100644
--- a/crd/deprecated/incomingreplicationtasks.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/incomingreplicationtasks.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: incomingreplicationtask
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -412,8 +412,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/crd/deprecated/receivers.gerritoperator.google.com-v1.yml b/crd/deprecated/receivers.gerritoperator.google.com-v1.yml
index 948da7c..8343a1e 100644
--- a/crd/deprecated/receivers.gerritoperator.google.com-v1.yml
+++ b/crd/deprecated/receivers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: receiver
   scope: Namespaced
   versions:
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -383,6 +383,8 @@
                       type: boolean
                     host:
                       type: string
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
@@ -536,8 +538,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/helm-charts/gerrit-operator-crds/templates/gerritclusters.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gerritclusters.gerritoperator.google.com-v1.yml
index 72a5006..8dca827 100644
--- a/helm-charts/gerrit-operator-crds/templates/gerritclusters.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gerritclusters.gerritoperator.google.com-v1.yml
@@ -13,6 +13,2554 @@
     singular: gerritcluster
   scope: Namespaced
   versions:
+    - name: v1beta16
+      schema:
+        openAPIV3Schema:
+          properties:
+            spec:
+              properties:
+                containerImages:
+                  properties:
+                    busyBox:
+                      properties:
+                        registry:
+                          type: string
+                        tag:
+                          type: string
+                      type: object
+                    gerritImages:
+                      properties:
+                        org:
+                          type: string
+                        registry:
+                          type: string
+                        tag:
+                          type: string
+                      type: object
+                    imagePullPolicy:
+                      type: string
+                    imagePullSecrets:
+                      items:
+                        properties:
+                          name:
+                            type: string
+                        type: object
+                      type: array
+                  type: object
+                eventsBroker:
+                  properties:
+                    brokerType:
+                      enum:
+                        - KAFKA
+                        - NONE
+                      type: string
+                    kafkaConfig:
+                      properties:
+                        connectString:
+                          type: string
+                      type: object
+                  type: object
+                fluentBitSidecar:
+                  properties:
+                    config:
+                      type: string
+                    enabled:
+                      type: boolean
+                    image:
+                      type: string
+                  type: object
+                gerrits:
+                  items:
+                    properties:
+                      metadata:
+                        properties:
+                          annotations:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          creationTimestamp:
+                            type: string
+                          deletionGracePeriodSeconds:
+                            type: integer
+                          deletionTimestamp:
+                            type: string
+                          finalizers:
+                            items:
+                              type: string
+                            type: array
+                          generateName:
+                            type: string
+                          generation:
+                            type: integer
+                          labels:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          managedFields:
+                            items:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                fieldsType:
+                                  type: string
+                                fieldsV1:
+                                  type: object
+                                manager:
+                                  type: string
+                                operation:
+                                  type: string
+                                subresource:
+                                  type: string
+                                time:
+                                  type: string
+                              type: object
+                            type: array
+                          name:
+                            type: string
+                          namespace:
+                            type: string
+                          ownerReferences:
+                            items:
+                              properties:
+                                apiVersion:
+                                  type: string
+                                blockOwnerDeletion:
+                                  type: boolean
+                                controller:
+                                  type: boolean
+                                kind:
+                                  type: string
+                                name:
+                                  type: string
+                                uid:
+                                  type: string
+                              type: object
+                            type: array
+                          resourceVersion:
+                            type: string
+                          selfLink:
+                            type: string
+                          uid:
+                            type: string
+                        type: object
+                      spec:
+                        properties:
+                          affinity:
+                            properties:
+                              nodeAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        preference:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                          type: object
+                                        weight:
+                                          type: integer
+                                      type: object
+                                    type: array
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    properties:
+                                      nodeSelectorTerms:
+                                        items:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchFields:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                          type: object
+                                        type: array
+                                    type: object
+                                type: object
+                              podAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                            topologyKey:
+                                              type: string
+                                          type: object
+                                        weight:
+                                          type: integer
+                                      type: object
+                                    type: array
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                        topologyKey:
+                                          type: string
+                                      type: object
+                                    type: array
+                                type: object
+                              podAntiAffinity:
+                                properties:
+                                  preferredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        podAffinityTerm:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                            topologyKey:
+                                              type: string
+                                          type: object
+                                        weight:
+                                          type: integer
+                                      type: object
+                                    type: array
+                                  requiredDuringSchedulingIgnoredDuringExecution:
+                                    items:
+                                      properties:
+                                        labelSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                        matchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                        mismatchLabelKeys:
+                                          items:
+                                            type: string
+                                          type: array
+                                        namespaceSelector:
+                                          properties:
+                                            matchExpressions:
+                                              items:
+                                                properties:
+                                                  key:
+                                                    type: string
+                                                  operator:
+                                                    type: string
+                                                  values:
+                                                    items:
+                                                      type: string
+                                                    type: array
+                                                type: object
+                                              type: array
+                                            matchLabels:
+                                              additionalProperties:
+                                                type: string
+                                              type: object
+                                          type: object
+                                        namespaces:
+                                          items:
+                                            type: string
+                                          type: array
+                                        topologyKey:
+                                          type: string
+                                      type: object
+                                    type: array
+                                type: object
+                            type: object
+                          configFiles:
+                            additionalProperties:
+                              type: string
+                            type: object
+                          debug:
+                            properties:
+                              enabled:
+                                type: boolean
+                              suspend:
+                                type: boolean
+                            type: object
+                          envVars:
+                            items:
+                              properties:
+                                name:
+                                  type: string
+                                value:
+                                  type: string
+                                valueFrom:
+                                  properties:
+                                    configMapKeyRef:
+                                      properties:
+                                        key:
+                                          type: string
+                                        name:
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                    fieldRef:
+                                      properties:
+                                        apiVersion:
+                                          type: string
+                                        fieldPath:
+                                          type: string
+                                      type: object
+                                    resourceFieldRef:
+                                      properties:
+                                        containerName:
+                                          type: string
+                                        divisor:
+                                          anyOf:
+                                            - type: integer
+                                            - type: string
+                                          x-kubernetes-int-or-string: true
+                                        resource:
+                                          type: string
+                                      type: object
+                                    secretKeyRef:
+                                      properties:
+                                        key:
+                                          type: string
+                                        name:
+                                          type: string
+                                        optional:
+                                          type: boolean
+                                      type: object
+                                  type: object
+                              type: object
+                            type: array
+                          gracefulStopTimeout:
+                            type: integer
+                          libs:
+                            items:
+                              properties:
+                                data:
+                                  properties:
+                                    executable:
+                                      type: boolean
+                                    secretRef:
+                                      type: string
+                                  type: object
+                                name:
+                                  type: string
+                                sha1:
+                                  type: string
+                                url:
+                                  type: string
+                              type: object
+                            type: array
+                          livenessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                              failureThreshold:
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    type: integer
+                                  service:
+                                    type: string
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                type: object
+                              initialDelaySeconds:
+                                type: integer
+                              periodSeconds:
+                                type: integer
+                              successThreshold:
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              terminationGracePeriodSeconds:
+                                type: integer
+                              timeoutSeconds:
+                                type: integer
+                            type: object
+                          mode:
+                            enum:
+                              - PRIMARY
+                              - REPLICA
+                            type: string
+                          plugins:
+                            items:
+                              properties:
+                                data:
+                                  properties:
+                                    executable:
+                                      type: boolean
+                                    secretRef:
+                                      type: string
+                                  type: object
+                                installAsLibrary:
+                                  type: boolean
+                                name:
+                                  type: string
+                                sha1:
+                                  type: string
+                                url:
+                                  type: string
+                              type: object
+                            type: array
+                          priorityClassName:
+                            type: string
+                          readinessProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                              failureThreshold:
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    type: integer
+                                  service:
+                                    type: string
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                type: object
+                              initialDelaySeconds:
+                                type: integer
+                              periodSeconds:
+                                type: integer
+                              successThreshold:
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              terminationGracePeriodSeconds:
+                                type: integer
+                              timeoutSeconds:
+                                type: integer
+                            type: object
+                          replicas:
+                            type: integer
+                          resources:
+                            properties:
+                              claims:
+                                items:
+                                  properties:
+                                    name:
+                                      type: string
+                                  type: object
+                                type: array
+                              limits:
+                                additionalProperties:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                              requests:
+                                additionalProperties:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                                type: object
+                            type: object
+                          secretRef:
+                            type: string
+                          service:
+                            properties:
+                              httpPort:
+                                type: integer
+                              sshPort:
+                                type: integer
+                              type:
+                                type: string
+                            type: object
+                          serviceAccount:
+                            type: string
+                          site:
+                            properties:
+                              size:
+                                anyOf:
+                                  - type: integer
+                                  - type: string
+                                x-kubernetes-int-or-string: true
+                            type: object
+                          startupProbe:
+                            properties:
+                              exec:
+                                properties:
+                                  command:
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                              failureThreshold:
+                                type: integer
+                              grpc:
+                                properties:
+                                  port:
+                                    type: integer
+                                  service:
+                                    type: string
+                                type: object
+                              httpGet:
+                                properties:
+                                  host:
+                                    type: string
+                                  httpHeaders:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  path:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                  scheme:
+                                    type: string
+                                type: object
+                              initialDelaySeconds:
+                                type: integer
+                              periodSeconds:
+                                type: integer
+                              successThreshold:
+                                type: integer
+                              tcpSocket:
+                                properties:
+                                  host:
+                                    type: string
+                                  port:
+                                    anyOf:
+                                      - type: integer
+                                      - type: string
+                                    x-kubernetes-int-or-string: true
+                                type: object
+                              terminationGracePeriodSeconds:
+                                type: integer
+                              timeoutSeconds:
+                                type: integer
+                            type: object
+                          tolerations:
+                            items:
+                              properties:
+                                effect:
+                                  type: string
+                                key:
+                                  type: string
+                                operator:
+                                  type: string
+                                tolerationSeconds:
+                                  type: integer
+                                value:
+                                  type: string
+                              type: object
+                            type: array
+                          topologySpreadConstraints:
+                            items:
+                              properties:
+                                labelSelector:
+                                  properties:
+                                    matchExpressions:
+                                      items:
+                                        properties:
+                                          key:
+                                            type: string
+                                          operator:
+                                            type: string
+                                          values:
+                                            items:
+                                              type: string
+                                            type: array
+                                        type: object
+                                      type: array
+                                    matchLabels:
+                                      additionalProperties:
+                                        type: string
+                                      type: object
+                                  type: object
+                                matchLabelKeys:
+                                  items:
+                                    type: string
+                                  type: array
+                                maxSkew:
+                                  type: integer
+                                minDomains:
+                                  type: integer
+                                nodeAffinityPolicy:
+                                  type: string
+                                nodeTaintsPolicy:
+                                  type: string
+                                topologyKey:
+                                  type: string
+                                whenUnsatisfiable:
+                                  type: string
+                              type: object
+                            type: array
+                          updatePartition:
+                            type: integer
+                        type: object
+                    type: object
+                  type: array
+                index:
+                  properties:
+                    elasticsearch:
+                      properties:
+                        config:
+                          type: string
+                        server:
+                          type: string
+                      type: object
+                    type:
+                      enum:
+                        - ELASTICSEARCH
+                        - LUCENE
+                      type: string
+                  type: object
+                ingress:
+                  properties:
+                    ambassador:
+                      properties:
+                        createHost:
+                          type: boolean
+                        id:
+                          items:
+                            type: string
+                          type: array
+                      type: object
+                    annotations:
+                      additionalProperties:
+                        type: string
+                      type: object
+                    enabled:
+                      type: boolean
+                    host:
+                      type: string
+                    istio:
+                      properties:
+                        gatewaySelector:
+                          additionalProperties:
+                            type: string
+                          type: object
+                      type: object
+                    pathPrefix:
+                      type: string
+                    ssh:
+                      properties:
+                        enabled:
+                          type: boolean
+                      type: object
+                    tls:
+                      properties:
+                        enabled:
+                          type: boolean
+                        secret:
+                          type: string
+                      type: object
+                  type: object
+                receiver:
+                  properties:
+                    metadata:
+                      properties:
+                        annotations:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        creationTimestamp:
+                          type: string
+                        deletionGracePeriodSeconds:
+                          type: integer
+                        deletionTimestamp:
+                          type: string
+                        finalizers:
+                          items:
+                            type: string
+                          type: array
+                        generateName:
+                          type: string
+                        generation:
+                          type: integer
+                        labels:
+                          additionalProperties:
+                            type: string
+                          type: object
+                        managedFields:
+                          items:
+                            properties:
+                              apiVersion:
+                                type: string
+                              fieldsType:
+                                type: string
+                              fieldsV1:
+                                type: object
+                              manager:
+                                type: string
+                              operation:
+                                type: string
+                              subresource:
+                                type: string
+                              time:
+                                type: string
+                            type: object
+                          type: array
+                        name:
+                          type: string
+                        namespace:
+                          type: string
+                        ownerReferences:
+                          items:
+                            properties:
+                              apiVersion:
+                                type: string
+                              blockOwnerDeletion:
+                                type: boolean
+                              controller:
+                                type: boolean
+                              kind:
+                                type: string
+                              name:
+                                type: string
+                              uid:
+                                type: string
+                            type: object
+                          type: array
+                        resourceVersion:
+                          type: string
+                        selfLink:
+                          type: string
+                        uid:
+                          type: string
+                      type: object
+                    spec:
+                      properties:
+                        affinity:
+                          properties:
+                            nodeAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      preference:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchFields:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                        type: object
+                                      weight:
+                                        type: integer
+                                    type: object
+                                  type: array
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  properties:
+                                    nodeSelectorTerms:
+                                      items:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchFields:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                        type: object
+                                      type: array
+                                  type: object
+                              type: object
+                            podAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      podAffinityTerm:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                  type: object
+                                                type: array
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                  type: object
+                                                type: array
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                          topologyKey:
+                                            type: string
+                                        type: object
+                                      weight:
+                                        type: integer
+                                    type: object
+                                  type: array
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      labelSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                      matchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                      mismatchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                      namespaceSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                      namespaces:
+                                        items:
+                                          type: string
+                                        type: array
+                                      topologyKey:
+                                        type: string
+                                    type: object
+                                  type: array
+                              type: object
+                            podAntiAffinity:
+                              properties:
+                                preferredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      podAffinityTerm:
+                                        properties:
+                                          labelSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                  type: object
+                                                type: array
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                          matchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                          mismatchLabelKeys:
+                                            items:
+                                              type: string
+                                            type: array
+                                          namespaceSelector:
+                                            properties:
+                                              matchExpressions:
+                                                items:
+                                                  properties:
+                                                    key:
+                                                      type: string
+                                                    operator:
+                                                      type: string
+                                                    values:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                  type: object
+                                                type: array
+                                              matchLabels:
+                                                additionalProperties:
+                                                  type: string
+                                                type: object
+                                            type: object
+                                          namespaces:
+                                            items:
+                                              type: string
+                                            type: array
+                                          topologyKey:
+                                            type: string
+                                        type: object
+                                      weight:
+                                        type: integer
+                                    type: object
+                                  type: array
+                                requiredDuringSchedulingIgnoredDuringExecution:
+                                  items:
+                                    properties:
+                                      labelSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                      matchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                      mismatchLabelKeys:
+                                        items:
+                                          type: string
+                                        type: array
+                                      namespaceSelector:
+                                        properties:
+                                          matchExpressions:
+                                            items:
+                                              properties:
+                                                key:
+                                                  type: string
+                                                operator:
+                                                  type: string
+                                                values:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                              type: object
+                                            type: array
+                                          matchLabels:
+                                            additionalProperties:
+                                              type: string
+                                            type: object
+                                        type: object
+                                      namespaces:
+                                        items:
+                                          type: string
+                                        type: array
+                                      topologyKey:
+                                        type: string
+                                    type: object
+                                  type: array
+                              type: object
+                          type: object
+                        credentialSecretRef:
+                          type: string
+                        livenessProbe:
+                          properties:
+                            exec:
+                              properties:
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                              type: object
+                            failureThreshold:
+                              type: integer
+                            grpc:
+                              properties:
+                                port:
+                                  type: integer
+                                service:
+                                  type: string
+                              type: object
+                            httpGet:
+                              properties:
+                                host:
+                                  type: string
+                                httpHeaders:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                    type: object
+                                  type: array
+                                path:
+                                  type: string
+                                port:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  type: string
+                              type: object
+                            initialDelaySeconds:
+                              type: integer
+                            periodSeconds:
+                              type: integer
+                            successThreshold:
+                              type: integer
+                            tcpSocket:
+                              properties:
+                                host:
+                                  type: string
+                                port:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                              type: object
+                            terminationGracePeriodSeconds:
+                              type: integer
+                            timeoutSeconds:
+                              type: integer
+                          type: object
+                        maxSurge:
+                          anyOf:
+                            - type: integer
+                            - type: string
+                          x-kubernetes-int-or-string: true
+                        maxUnavailable:
+                          anyOf:
+                            - type: integer
+                            - type: string
+                          x-kubernetes-int-or-string: true
+                        priorityClassName:
+                          type: string
+                        readinessProbe:
+                          properties:
+                            exec:
+                              properties:
+                                command:
+                                  items:
+                                    type: string
+                                  type: array
+                              type: object
+                            failureThreshold:
+                              type: integer
+                            grpc:
+                              properties:
+                                port:
+                                  type: integer
+                                service:
+                                  type: string
+                              type: object
+                            httpGet:
+                              properties:
+                                host:
+                                  type: string
+                                httpHeaders:
+                                  items:
+                                    properties:
+                                      name:
+                                        type: string
+                                      value:
+                                        type: string
+                                    type: object
+                                  type: array
+                                path:
+                                  type: string
+                                port:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                                scheme:
+                                  type: string
+                              type: object
+                            initialDelaySeconds:
+                              type: integer
+                            periodSeconds:
+                              type: integer
+                            successThreshold:
+                              type: integer
+                            tcpSocket:
+                              properties:
+                                host:
+                                  type: string
+                                port:
+                                  anyOf:
+                                    - type: integer
+                                    - type: string
+                                  x-kubernetes-int-or-string: true
+                              type: object
+                            terminationGracePeriodSeconds:
+                              type: integer
+                            timeoutSeconds:
+                              type: integer
+                          type: object
+                        replicas:
+                          type: integer
+                        resources:
+                          properties:
+                            claims:
+                              items:
+                                properties:
+                                  name:
+                                    type: string
+                                type: object
+                              type: array
+                            limits:
+                              additionalProperties:
+                                anyOf:
+                                  - type: integer
+                                  - type: string
+                                x-kubernetes-int-or-string: true
+                              type: object
+                            requests:
+                              additionalProperties:
+                                anyOf:
+                                  - type: integer
+                                  - type: string
+                                x-kubernetes-int-or-string: true
+                              type: object
+                          type: object
+                        service:
+                          properties:
+                            httpPort:
+                              type: integer
+                            type:
+                              type: string
+                          type: object
+                        tolerations:
+                          items:
+                            properties:
+                              effect:
+                                type: string
+                              key:
+                                type: string
+                              operator:
+                                type: string
+                              tolerationSeconds:
+                                type: integer
+                              value:
+                                type: string
+                            type: object
+                          type: array
+                        topologySpreadConstraints:
+                          items:
+                            properties:
+                              labelSelector:
+                                properties:
+                                  matchExpressions:
+                                    items:
+                                      properties:
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        values:
+                                          items:
+                                            type: string
+                                          type: array
+                                      type: object
+                                    type: array
+                                  matchLabels:
+                                    additionalProperties:
+                                      type: string
+                                    type: object
+                                type: object
+                              matchLabelKeys:
+                                items:
+                                  type: string
+                                type: array
+                              maxSkew:
+                                type: integer
+                              minDomains:
+                                type: integer
+                              nodeAffinityPolicy:
+                                type: string
+                              nodeTaintsPolicy:
+                                type: string
+                              topologyKey:
+                                type: string
+                              whenUnsatisfiable:
+                                type: string
+                            type: object
+                          type: array
+                      type: object
+                  type: object
+                refdb:
+                  properties:
+                    database:
+                      enum:
+                        - DYNAMODB
+                        - NONE
+                        - SPANNER
+                        - ZOOKEEPER
+                      type: string
+                    dynamoDb:
+                      properties:
+                        endpoint:
+                          type: string
+                        locksTableName:
+                          type: string
+                        refsDbTableName:
+                          type: string
+                        region:
+                          type: string
+                      type: object
+                    spanner:
+                      properties:
+                        database:
+                          type: string
+                        instance:
+                          type: string
+                        projectName:
+                          type: string
+                      type: object
+                    zookeeper:
+                      properties:
+                        connectString:
+                          type: string
+                        rootNode:
+                          type: string
+                      type: object
+                  type: object
+                scheduledTasks:
+                  properties:
+                    gerritMaintenance:
+                      properties:
+                        projects:
+                          properties:
+                            gc:
+                              items:
+                                properties:
+                                  affinity:
+                                    properties:
+                                      nodeAffinity:
+                                        properties:
+                                          preferredDuringSchedulingIgnoredDuringExecution:
+                                            items:
+                                              properties:
+                                                preference:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchFields:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                  type: object
+                                                weight:
+                                                  type: integer
+                                              type: object
+                                            type: array
+                                          requiredDuringSchedulingIgnoredDuringExecution:
+                                            properties:
+                                              nodeSelectorTerms:
+                                                items:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchFields:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                  type: object
+                                                type: array
+                                            type: object
+                                        type: object
+                                      podAffinity:
+                                        properties:
+                                          preferredDuringSchedulingIgnoredDuringExecution:
+                                            items:
+                                              properties:
+                                                podAffinityTerm:
+                                                  properties:
+                                                    labelSelector:
+                                                      properties:
+                                                        matchExpressions:
+                                                          items:
+                                                            properties:
+                                                              key:
+                                                                type: string
+                                                              operator:
+                                                                type: string
+                                                              values:
+                                                                items:
+                                                                  type: string
+                                                                type: array
+                                                            type: object
+                                                          type: array
+                                                        matchLabels:
+                                                          additionalProperties:
+                                                            type: string
+                                                          type: object
+                                                      type: object
+                                                    matchLabelKeys:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    mismatchLabelKeys:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    namespaceSelector:
+                                                      properties:
+                                                        matchExpressions:
+                                                          items:
+                                                            properties:
+                                                              key:
+                                                                type: string
+                                                              operator:
+                                                                type: string
+                                                              values:
+                                                                items:
+                                                                  type: string
+                                                                type: array
+                                                            type: object
+                                                          type: array
+                                                        matchLabels:
+                                                          additionalProperties:
+                                                            type: string
+                                                          type: object
+                                                      type: object
+                                                    namespaces:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    topologyKey:
+                                                      type: string
+                                                  type: object
+                                                weight:
+                                                  type: integer
+                                              type: object
+                                            type: array
+                                          requiredDuringSchedulingIgnoredDuringExecution:
+                                            items:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                topologyKey:
+                                                  type: string
+                                              type: object
+                                            type: array
+                                        type: object
+                                      podAntiAffinity:
+                                        properties:
+                                          preferredDuringSchedulingIgnoredDuringExecution:
+                                            items:
+                                              properties:
+                                                podAffinityTerm:
+                                                  properties:
+                                                    labelSelector:
+                                                      properties:
+                                                        matchExpressions:
+                                                          items:
+                                                            properties:
+                                                              key:
+                                                                type: string
+                                                              operator:
+                                                                type: string
+                                                              values:
+                                                                items:
+                                                                  type: string
+                                                                type: array
+                                                            type: object
+                                                          type: array
+                                                        matchLabels:
+                                                          additionalProperties:
+                                                            type: string
+                                                          type: object
+                                                      type: object
+                                                    matchLabelKeys:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    mismatchLabelKeys:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    namespaceSelector:
+                                                      properties:
+                                                        matchExpressions:
+                                                          items:
+                                                            properties:
+                                                              key:
+                                                                type: string
+                                                              operator:
+                                                                type: string
+                                                              values:
+                                                                items:
+                                                                  type: string
+                                                                type: array
+                                                            type: object
+                                                          type: array
+                                                        matchLabels:
+                                                          additionalProperties:
+                                                            type: string
+                                                          type: object
+                                                      type: object
+                                                    namespaces:
+                                                      items:
+                                                        type: string
+                                                      type: array
+                                                    topologyKey:
+                                                      type: string
+                                                  type: object
+                                                weight:
+                                                  type: integer
+                                              type: object
+                                            type: array
+                                          requiredDuringSchedulingIgnoredDuringExecution:
+                                            items:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                topologyKey:
+                                                  type: string
+                                              type: object
+                                            type: array
+                                        type: object
+                                    type: object
+                                  args:
+                                    items:
+                                      type: string
+                                    type: array
+                                  exclude:
+                                    items:
+                                      type: string
+                                    type: array
+                                  gitOptions:
+                                    type: string
+                                  include:
+                                    items:
+                                      type: string
+                                    type: array
+                                  name:
+                                    type: string
+                                  resources:
+                                    properties:
+                                      claims:
+                                        items:
+                                          properties:
+                                            name:
+                                              type: string
+                                          type: object
+                                        type: array
+                                      limits:
+                                        additionalProperties:
+                                          anyOf:
+                                            - type: integer
+                                            - type: string
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                      requests:
+                                        additionalProperties:
+                                          anyOf:
+                                            - type: integer
+                                            - type: string
+                                          x-kubernetes-int-or-string: true
+                                        type: object
+                                    type: object
+                                  schedule:
+                                    type: string
+                                  tolerations:
+                                    items:
+                                      properties:
+                                        effect:
+                                          type: string
+                                        key:
+                                          type: string
+                                        operator:
+                                          type: string
+                                        tolerationSeconds:
+                                          type: integer
+                                        value:
+                                          type: string
+                                      type: object
+                                    type: array
+                                type: object
+                              type: array
+                          type: object
+                      type: object
+                    incomingReplication:
+                      items:
+                        properties:
+                          metadata:
+                            properties:
+                              annotations:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              creationTimestamp:
+                                type: string
+                              deletionGracePeriodSeconds:
+                                type: integer
+                              deletionTimestamp:
+                                type: string
+                              finalizers:
+                                items:
+                                  type: string
+                                type: array
+                              generateName:
+                                type: string
+                              generation:
+                                type: integer
+                              labels:
+                                additionalProperties:
+                                  type: string
+                                type: object
+                              managedFields:
+                                items:
+                                  properties:
+                                    apiVersion:
+                                      type: string
+                                    fieldsType:
+                                      type: string
+                                    fieldsV1:
+                                      type: object
+                                    manager:
+                                      type: string
+                                    operation:
+                                      type: string
+                                    subresource:
+                                      type: string
+                                    time:
+                                      type: string
+                                  type: object
+                                type: array
+                              name:
+                                type: string
+                              namespace:
+                                type: string
+                              ownerReferences:
+                                items:
+                                  properties:
+                                    apiVersion:
+                                      type: string
+                                    blockOwnerDeletion:
+                                      type: boolean
+                                    controller:
+                                      type: boolean
+                                    kind:
+                                      type: string
+                                    name:
+                                      type: string
+                                    uid:
+                                      type: string
+                                  type: object
+                                type: array
+                              resourceVersion:
+                                type: string
+                              selfLink:
+                                type: string
+                              uid:
+                                type: string
+                            type: object
+                          spec:
+                            properties:
+                              affinity:
+                                properties:
+                                  nodeAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            preference:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                              type: object
+                                            weight:
+                                              type: integer
+                                          type: object
+                                        type: array
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        properties:
+                                          nodeSelectorTerms:
+                                            items:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchFields:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                              type: object
+                                            type: array
+                                        type: object
+                                    type: object
+                                  podAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                topologyKey:
+                                                  type: string
+                                              type: object
+                                            weight:
+                                              type: integer
+                                          type: object
+                                        type: array
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                            topologyKey:
+                                              type: string
+                                          type: object
+                                        type: array
+                                    type: object
+                                  podAntiAffinity:
+                                    properties:
+                                      preferredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            podAffinityTerm:
+                                              properties:
+                                                labelSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                matchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                mismatchLabelKeys:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                namespaceSelector:
+                                                  properties:
+                                                    matchExpressions:
+                                                      items:
+                                                        properties:
+                                                          key:
+                                                            type: string
+                                                          operator:
+                                                            type: string
+                                                          values:
+                                                            items:
+                                                              type: string
+                                                            type: array
+                                                        type: object
+                                                      type: array
+                                                    matchLabels:
+                                                      additionalProperties:
+                                                        type: string
+                                                      type: object
+                                                  type: object
+                                                namespaces:
+                                                  items:
+                                                    type: string
+                                                  type: array
+                                                topologyKey:
+                                                  type: string
+                                              type: object
+                                            weight:
+                                              type: integer
+                                          type: object
+                                        type: array
+                                      requiredDuringSchedulingIgnoredDuringExecution:
+                                        items:
+                                          properties:
+                                            labelSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            matchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            mismatchLabelKeys:
+                                              items:
+                                                type: string
+                                              type: array
+                                            namespaceSelector:
+                                              properties:
+                                                matchExpressions:
+                                                  items:
+                                                    properties:
+                                                      key:
+                                                        type: string
+                                                      operator:
+                                                        type: string
+                                                      values:
+                                                        items:
+                                                          type: string
+                                                        type: array
+                                                    type: object
+                                                  type: array
+                                                matchLabels:
+                                                  additionalProperties:
+                                                    type: string
+                                                  type: object
+                                              type: object
+                                            namespaces:
+                                              items:
+                                                type: string
+                                              type: array
+                                            topologyKey:
+                                              type: string
+                                          type: object
+                                        type: array
+                                    type: object
+                                type: object
+                              config:
+                                properties:
+                                  remotes:
+                                    items:
+                                      properties:
+                                        fetch:
+                                          items:
+                                            properties:
+                                              localRepo:
+                                                type: string
+                                              refSpec:
+                                                type: string
+                                              remoteRepo:
+                                                type: string
+                                            required:
+                                              - remoteRepo
+                                            type: object
+                                          type: array
+                                        name:
+                                          type: string
+                                        timeout:
+                                          type: string
+                                        url:
+                                          type: string
+                                      required:
+                                        - name
+                                        - url
+                                      type: object
+                                    type: array
+                                required:
+                                  - remotes
+                                type: object
+                              resources:
+                                properties:
+                                  claims:
+                                    items:
+                                      properties:
+                                        name:
+                                          type: string
+                                      type: object
+                                    type: array
+                                  limits:
+                                    additionalProperties:
+                                      anyOf:
+                                        - type: integer
+                                        - type: string
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                  requests:
+                                    additionalProperties:
+                                      anyOf:
+                                        - type: integer
+                                        - type: string
+                                      x-kubernetes-int-or-string: true
+                                    type: object
+                                type: object
+                              schedule:
+                                type: string
+                              secretRef:
+                                type: string
+                              tolerations:
+                                items:
+                                  properties:
+                                    effect:
+                                      type: string
+                                    key:
+                                      type: string
+                                    operator:
+                                      type: string
+                                    tolerationSeconds:
+                                      type: integer
+                                    value:
+                                      type: string
+                                  type: object
+                                type: array
+                            required:
+                              - config
+                              - schedule
+                            type: object
+                        type: object
+                      type: array
+                  type: object
+                serverId:
+                  type: string
+                storage:
+                  properties:
+                    pluginCache:
+                      properties:
+                        enabled:
+                          type: boolean
+                      type: object
+                    sharedStorage:
+                      properties:
+                        externalPVC:
+                          properties:
+                            claimName:
+                              type: string
+                            enabled:
+                              type: boolean
+                          type: object
+                        selector:
+                          properties:
+                            matchExpressions:
+                              items:
+                                properties:
+                                  key:
+                                    type: string
+                                  operator:
+                                    type: string
+                                  values:
+                                    items:
+                                      type: string
+                                    type: array
+                                type: object
+                              type: array
+                            matchLabels:
+                              additionalProperties:
+                                type: string
+                              type: object
+                          type: object
+                        size:
+                          anyOf:
+                            - type: integer
+                            - type: string
+                          x-kubernetes-int-or-string: true
+                        volumeName:
+                          type: string
+                      type: object
+                    storageClasses:
+                      properties:
+                        nfsWorkaround:
+                          properties:
+                            chownOnStartup:
+                              type: boolean
+                            enabled:
+                              type: boolean
+                            idmapdConfig:
+                              type: string
+                          type: object
+                        readWriteMany:
+                          type: string
+                        readWriteOnce:
+                          type: string
+                      type: object
+                  type: object
+              type: object
+            status:
+              properties:
+                members:
+                  additionalProperties:
+                    items:
+                      type: string
+                    type: array
+                  type: object
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
     - name: v1beta15
       schema:
         openAPIV3Schema:
@@ -2554,2548 +5102,6 @@
               type: object
           type: object
       served: true
-      storage: true
-      subresources:
-        status: {}
-    - name: v1beta14
-      schema:
-        openAPIV3Schema:
-          properties:
-            spec:
-              properties:
-                containerImages:
-                  properties:
-                    busyBox:
-                      properties:
-                        registry:
-                          type: string
-                        tag:
-                          type: string
-                      type: object
-                    gerritImages:
-                      properties:
-                        org:
-                          type: string
-                        registry:
-                          type: string
-                        tag:
-                          type: string
-                      type: object
-                    imagePullPolicy:
-                      type: string
-                    imagePullSecrets:
-                      items:
-                        properties:
-                          name:
-                            type: string
-                        type: object
-                      type: array
-                  type: object
-                eventsBroker:
-                  properties:
-                    brokerType:
-                      enum:
-                        - KAFKA
-                        - NONE
-                      type: string
-                    kafkaConfig:
-                      properties:
-                        connectString:
-                          type: string
-                      type: object
-                  type: object
-                fluentBitSidecar:
-                  properties:
-                    config:
-                      type: string
-                    enabled:
-                      type: boolean
-                    image:
-                      type: string
-                  type: object
-                gerrits:
-                  items:
-                    properties:
-                      metadata:
-                        properties:
-                          annotations:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          creationTimestamp:
-                            type: string
-                          deletionGracePeriodSeconds:
-                            type: integer
-                          deletionTimestamp:
-                            type: string
-                          finalizers:
-                            items:
-                              type: string
-                            type: array
-                          generateName:
-                            type: string
-                          generation:
-                            type: integer
-                          labels:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          managedFields:
-                            items:
-                              properties:
-                                apiVersion:
-                                  type: string
-                                fieldsType:
-                                  type: string
-                                fieldsV1:
-                                  type: object
-                                manager:
-                                  type: string
-                                operation:
-                                  type: string
-                                subresource:
-                                  type: string
-                                time:
-                                  type: string
-                              type: object
-                            type: array
-                          name:
-                            type: string
-                          namespace:
-                            type: string
-                          ownerReferences:
-                            items:
-                              properties:
-                                apiVersion:
-                                  type: string
-                                blockOwnerDeletion:
-                                  type: boolean
-                                controller:
-                                  type: boolean
-                                kind:
-                                  type: string
-                                name:
-                                  type: string
-                                uid:
-                                  type: string
-                              type: object
-                            type: array
-                          resourceVersion:
-                            type: string
-                          selfLink:
-                            type: string
-                          uid:
-                            type: string
-                        type: object
-                      spec:
-                        properties:
-                          affinity:
-                            properties:
-                              nodeAffinity:
-                                properties:
-                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                    items:
-                                      properties:
-                                        preference:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchFields:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                          type: object
-                                        weight:
-                                          type: integer
-                                      type: object
-                                    type: array
-                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                    properties:
-                                      nodeSelectorTerms:
-                                        items:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchFields:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                          type: object
-                                        type: array
-                                    type: object
-                                type: object
-                              podAffinity:
-                                properties:
-                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                    items:
-                                      properties:
-                                        podAffinityTerm:
-                                          properties:
-                                            labelSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            matchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            mismatchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            namespaceSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            namespaces:
-                                              items:
-                                                type: string
-                                              type: array
-                                            topologyKey:
-                                              type: string
-                                          type: object
-                                        weight:
-                                          type: integer
-                                      type: object
-                                    type: array
-                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                    items:
-                                      properties:
-                                        labelSelector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        matchLabelKeys:
-                                          items:
-                                            type: string
-                                          type: array
-                                        mismatchLabelKeys:
-                                          items:
-                                            type: string
-                                          type: array
-                                        namespaceSelector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        namespaces:
-                                          items:
-                                            type: string
-                                          type: array
-                                        topologyKey:
-                                          type: string
-                                      type: object
-                                    type: array
-                                type: object
-                              podAntiAffinity:
-                                properties:
-                                  preferredDuringSchedulingIgnoredDuringExecution:
-                                    items:
-                                      properties:
-                                        podAffinityTerm:
-                                          properties:
-                                            labelSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            matchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            mismatchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            namespaceSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            namespaces:
-                                              items:
-                                                type: string
-                                              type: array
-                                            topologyKey:
-                                              type: string
-                                          type: object
-                                        weight:
-                                          type: integer
-                                      type: object
-                                    type: array
-                                  requiredDuringSchedulingIgnoredDuringExecution:
-                                    items:
-                                      properties:
-                                        labelSelector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        matchLabelKeys:
-                                          items:
-                                            type: string
-                                          type: array
-                                        mismatchLabelKeys:
-                                          items:
-                                            type: string
-                                          type: array
-                                        namespaceSelector:
-                                          properties:
-                                            matchExpressions:
-                                              items:
-                                                properties:
-                                                  key:
-                                                    type: string
-                                                  operator:
-                                                    type: string
-                                                  values:
-                                                    items:
-                                                      type: string
-                                                    type: array
-                                                type: object
-                                              type: array
-                                            matchLabels:
-                                              additionalProperties:
-                                                type: string
-                                              type: object
-                                          type: object
-                                        namespaces:
-                                          items:
-                                            type: string
-                                          type: array
-                                        topologyKey:
-                                          type: string
-                                      type: object
-                                    type: array
-                                type: object
-                            type: object
-                          configFiles:
-                            additionalProperties:
-                              type: string
-                            type: object
-                          debug:
-                            properties:
-                              enabled:
-                                type: boolean
-                              suspend:
-                                type: boolean
-                            type: object
-                          envVars:
-                            items:
-                              properties:
-                                name:
-                                  type: string
-                                value:
-                                  type: string
-                                valueFrom:
-                                  properties:
-                                    configMapKeyRef:
-                                      properties:
-                                        key:
-                                          type: string
-                                        name:
-                                          type: string
-                                        optional:
-                                          type: boolean
-                                      type: object
-                                    fieldRef:
-                                      properties:
-                                        apiVersion:
-                                          type: string
-                                        fieldPath:
-                                          type: string
-                                      type: object
-                                    resourceFieldRef:
-                                      properties:
-                                        containerName:
-                                          type: string
-                                        divisor:
-                                          anyOf:
-                                            - type: integer
-                                            - type: string
-                                          x-kubernetes-int-or-string: true
-                                        resource:
-                                          type: string
-                                      type: object
-                                    secretKeyRef:
-                                      properties:
-                                        key:
-                                          type: string
-                                        name:
-                                          type: string
-                                        optional:
-                                          type: boolean
-                                      type: object
-                                  type: object
-                              type: object
-                            type: array
-                          gracefulStopTimeout:
-                            type: integer
-                          libs:
-                            items:
-                              properties:
-                                data:
-                                  properties:
-                                    executable:
-                                      type: boolean
-                                    secretRef:
-                                      type: string
-                                  type: object
-                                name:
-                                  type: string
-                                sha1:
-                                  type: string
-                                url:
-                                  type: string
-                              type: object
-                            type: array
-                          livenessProbe:
-                            properties:
-                              exec:
-                                properties:
-                                  command:
-                                    items:
-                                      type: string
-                                    type: array
-                                type: object
-                              failureThreshold:
-                                type: integer
-                              grpc:
-                                properties:
-                                  port:
-                                    type: integer
-                                  service:
-                                    type: string
-                                type: object
-                              httpGet:
-                                properties:
-                                  host:
-                                    type: string
-                                  httpHeaders:
-                                    items:
-                                      properties:
-                                        name:
-                                          type: string
-                                        value:
-                                          type: string
-                                      type: object
-                                    type: array
-                                  path:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                  scheme:
-                                    type: string
-                                type: object
-                              initialDelaySeconds:
-                                type: integer
-                              periodSeconds:
-                                type: integer
-                              successThreshold:
-                                type: integer
-                              tcpSocket:
-                                properties:
-                                  host:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              terminationGracePeriodSeconds:
-                                type: integer
-                              timeoutSeconds:
-                                type: integer
-                            type: object
-                          mode:
-                            enum:
-                              - PRIMARY
-                              - REPLICA
-                            type: string
-                          plugins:
-                            items:
-                              properties:
-                                data:
-                                  properties:
-                                    executable:
-                                      type: boolean
-                                    secretRef:
-                                      type: string
-                                  type: object
-                                installAsLibrary:
-                                  type: boolean
-                                name:
-                                  type: string
-                                sha1:
-                                  type: string
-                                url:
-                                  type: string
-                              type: object
-                            type: array
-                          priorityClassName:
-                            type: string
-                          readinessProbe:
-                            properties:
-                              exec:
-                                properties:
-                                  command:
-                                    items:
-                                      type: string
-                                    type: array
-                                type: object
-                              failureThreshold:
-                                type: integer
-                              grpc:
-                                properties:
-                                  port:
-                                    type: integer
-                                  service:
-                                    type: string
-                                type: object
-                              httpGet:
-                                properties:
-                                  host:
-                                    type: string
-                                  httpHeaders:
-                                    items:
-                                      properties:
-                                        name:
-                                          type: string
-                                        value:
-                                          type: string
-                                      type: object
-                                    type: array
-                                  path:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                  scheme:
-                                    type: string
-                                type: object
-                              initialDelaySeconds:
-                                type: integer
-                              periodSeconds:
-                                type: integer
-                              successThreshold:
-                                type: integer
-                              tcpSocket:
-                                properties:
-                                  host:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              terminationGracePeriodSeconds:
-                                type: integer
-                              timeoutSeconds:
-                                type: integer
-                            type: object
-                          replicas:
-                            type: integer
-                          resources:
-                            properties:
-                              claims:
-                                items:
-                                  properties:
-                                    name:
-                                      type: string
-                                    request:
-                                      type: string
-                                  type: object
-                                type: array
-                              limits:
-                                additionalProperties:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                                type: object
-                              requests:
-                                additionalProperties:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                                type: object
-                            type: object
-                          secretRef:
-                            type: string
-                          service:
-                            properties:
-                              httpPort:
-                                type: integer
-                              sshPort:
-                                type: integer
-                              type:
-                                type: string
-                            type: object
-                          serviceAccount:
-                            type: string
-                          site:
-                            properties:
-                              size:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                x-kubernetes-int-or-string: true
-                            type: object
-                          startupProbe:
-                            properties:
-                              exec:
-                                properties:
-                                  command:
-                                    items:
-                                      type: string
-                                    type: array
-                                type: object
-                              failureThreshold:
-                                type: integer
-                              grpc:
-                                properties:
-                                  port:
-                                    type: integer
-                                  service:
-                                    type: string
-                                type: object
-                              httpGet:
-                                properties:
-                                  host:
-                                    type: string
-                                  httpHeaders:
-                                    items:
-                                      properties:
-                                        name:
-                                          type: string
-                                        value:
-                                          type: string
-                                      type: object
-                                    type: array
-                                  path:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                  scheme:
-                                    type: string
-                                type: object
-                              initialDelaySeconds:
-                                type: integer
-                              periodSeconds:
-                                type: integer
-                              successThreshold:
-                                type: integer
-                              tcpSocket:
-                                properties:
-                                  host:
-                                    type: string
-                                  port:
-                                    anyOf:
-                                      - type: integer
-                                      - type: string
-                                    x-kubernetes-int-or-string: true
-                                type: object
-                              terminationGracePeriodSeconds:
-                                type: integer
-                              timeoutSeconds:
-                                type: integer
-                            type: object
-                          tolerations:
-                            items:
-                              properties:
-                                effect:
-                                  type: string
-                                key:
-                                  type: string
-                                operator:
-                                  type: string
-                                tolerationSeconds:
-                                  type: integer
-                                value:
-                                  type: string
-                              type: object
-                            type: array
-                          topologySpreadConstraints:
-                            items:
-                              properties:
-                                labelSelector:
-                                  properties:
-                                    matchExpressions:
-                                      items:
-                                        properties:
-                                          key:
-                                            type: string
-                                          operator:
-                                            type: string
-                                          values:
-                                            items:
-                                              type: string
-                                            type: array
-                                        type: object
-                                      type: array
-                                    matchLabels:
-                                      additionalProperties:
-                                        type: string
-                                      type: object
-                                  type: object
-                                matchLabelKeys:
-                                  items:
-                                    type: string
-                                  type: array
-                                maxSkew:
-                                  type: integer
-                                minDomains:
-                                  type: integer
-                                nodeAffinityPolicy:
-                                  type: string
-                                nodeTaintsPolicy:
-                                  type: string
-                                topologyKey:
-                                  type: string
-                                whenUnsatisfiable:
-                                  type: string
-                              type: object
-                            type: array
-                          updatePartition:
-                            type: integer
-                        type: object
-                    type: object
-                  type: array
-                index:
-                  properties:
-                    elasticsearch:
-                      properties:
-                        config:
-                          type: string
-                        server:
-                          type: string
-                      type: object
-                    type:
-                      enum:
-                        - ELASTICSEARCH
-                        - LUCENE
-                      type: string
-                  type: object
-                ingress:
-                  properties:
-                    ambassador:
-                      properties:
-                        createHost:
-                          type: boolean
-                        id:
-                          items:
-                            type: string
-                          type: array
-                      type: object
-                    annotations:
-                      additionalProperties:
-                        type: string
-                      type: object
-                    enabled:
-                      type: boolean
-                    host:
-                      type: string
-                    istio:
-                      properties:
-                        gatewaySelector:
-                          additionalProperties:
-                            type: string
-                          type: object
-                      type: object
-                    ssh:
-                      properties:
-                        enabled:
-                          type: boolean
-                      type: object
-                    tls:
-                      properties:
-                        enabled:
-                          type: boolean
-                        secret:
-                          type: string
-                      type: object
-                  type: object
-                receiver:
-                  properties:
-                    metadata:
-                      properties:
-                        annotations:
-                          additionalProperties:
-                            type: string
-                          type: object
-                        creationTimestamp:
-                          type: string
-                        deletionGracePeriodSeconds:
-                          type: integer
-                        deletionTimestamp:
-                          type: string
-                        finalizers:
-                          items:
-                            type: string
-                          type: array
-                        generateName:
-                          type: string
-                        generation:
-                          type: integer
-                        labels:
-                          additionalProperties:
-                            type: string
-                          type: object
-                        managedFields:
-                          items:
-                            properties:
-                              apiVersion:
-                                type: string
-                              fieldsType:
-                                type: string
-                              fieldsV1:
-                                type: object
-                              manager:
-                                type: string
-                              operation:
-                                type: string
-                              subresource:
-                                type: string
-                              time:
-                                type: string
-                            type: object
-                          type: array
-                        name:
-                          type: string
-                        namespace:
-                          type: string
-                        ownerReferences:
-                          items:
-                            properties:
-                              apiVersion:
-                                type: string
-                              blockOwnerDeletion:
-                                type: boolean
-                              controller:
-                                type: boolean
-                              kind:
-                                type: string
-                              name:
-                                type: string
-                              uid:
-                                type: string
-                            type: object
-                          type: array
-                        resourceVersion:
-                          type: string
-                        selfLink:
-                          type: string
-                        uid:
-                          type: string
-                      type: object
-                    spec:
-                      properties:
-                        affinity:
-                          properties:
-                            nodeAffinity:
-                              properties:
-                                preferredDuringSchedulingIgnoredDuringExecution:
-                                  items:
-                                    properties:
-                                      preference:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchFields:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                        type: object
-                                      weight:
-                                        type: integer
-                                    type: object
-                                  type: array
-                                requiredDuringSchedulingIgnoredDuringExecution:
-                                  properties:
-                                    nodeSelectorTerms:
-                                      items:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchFields:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                        type: object
-                                      type: array
-                                  type: object
-                              type: object
-                            podAffinity:
-                              properties:
-                                preferredDuringSchedulingIgnoredDuringExecution:
-                                  items:
-                                    properties:
-                                      podAffinityTerm:
-                                        properties:
-                                          labelSelector:
-                                            properties:
-                                              matchExpressions:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    operator:
-                                                      type: string
-                                                    values:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                  type: object
-                                                type: array
-                                              matchLabels:
-                                                additionalProperties:
-                                                  type: string
-                                                type: object
-                                            type: object
-                                          matchLabelKeys:
-                                            items:
-                                              type: string
-                                            type: array
-                                          mismatchLabelKeys:
-                                            items:
-                                              type: string
-                                            type: array
-                                          namespaceSelector:
-                                            properties:
-                                              matchExpressions:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    operator:
-                                                      type: string
-                                                    values:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                  type: object
-                                                type: array
-                                              matchLabels:
-                                                additionalProperties:
-                                                  type: string
-                                                type: object
-                                            type: object
-                                          namespaces:
-                                            items:
-                                              type: string
-                                            type: array
-                                          topologyKey:
-                                            type: string
-                                        type: object
-                                      weight:
-                                        type: integer
-                                    type: object
-                                  type: array
-                                requiredDuringSchedulingIgnoredDuringExecution:
-                                  items:
-                                    properties:
-                                      labelSelector:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchLabels:
-                                            additionalProperties:
-                                              type: string
-                                            type: object
-                                        type: object
-                                      matchLabelKeys:
-                                        items:
-                                          type: string
-                                        type: array
-                                      mismatchLabelKeys:
-                                        items:
-                                          type: string
-                                        type: array
-                                      namespaceSelector:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchLabels:
-                                            additionalProperties:
-                                              type: string
-                                            type: object
-                                        type: object
-                                      namespaces:
-                                        items:
-                                          type: string
-                                        type: array
-                                      topologyKey:
-                                        type: string
-                                    type: object
-                                  type: array
-                              type: object
-                            podAntiAffinity:
-                              properties:
-                                preferredDuringSchedulingIgnoredDuringExecution:
-                                  items:
-                                    properties:
-                                      podAffinityTerm:
-                                        properties:
-                                          labelSelector:
-                                            properties:
-                                              matchExpressions:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    operator:
-                                                      type: string
-                                                    values:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                  type: object
-                                                type: array
-                                              matchLabels:
-                                                additionalProperties:
-                                                  type: string
-                                                type: object
-                                            type: object
-                                          matchLabelKeys:
-                                            items:
-                                              type: string
-                                            type: array
-                                          mismatchLabelKeys:
-                                            items:
-                                              type: string
-                                            type: array
-                                          namespaceSelector:
-                                            properties:
-                                              matchExpressions:
-                                                items:
-                                                  properties:
-                                                    key:
-                                                      type: string
-                                                    operator:
-                                                      type: string
-                                                    values:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                  type: object
-                                                type: array
-                                              matchLabels:
-                                                additionalProperties:
-                                                  type: string
-                                                type: object
-                                            type: object
-                                          namespaces:
-                                            items:
-                                              type: string
-                                            type: array
-                                          topologyKey:
-                                            type: string
-                                        type: object
-                                      weight:
-                                        type: integer
-                                    type: object
-                                  type: array
-                                requiredDuringSchedulingIgnoredDuringExecution:
-                                  items:
-                                    properties:
-                                      labelSelector:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchLabels:
-                                            additionalProperties:
-                                              type: string
-                                            type: object
-                                        type: object
-                                      matchLabelKeys:
-                                        items:
-                                          type: string
-                                        type: array
-                                      mismatchLabelKeys:
-                                        items:
-                                          type: string
-                                        type: array
-                                      namespaceSelector:
-                                        properties:
-                                          matchExpressions:
-                                            items:
-                                              properties:
-                                                key:
-                                                  type: string
-                                                operator:
-                                                  type: string
-                                                values:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                              type: object
-                                            type: array
-                                          matchLabels:
-                                            additionalProperties:
-                                              type: string
-                                            type: object
-                                        type: object
-                                      namespaces:
-                                        items:
-                                          type: string
-                                        type: array
-                                      topologyKey:
-                                        type: string
-                                    type: object
-                                  type: array
-                              type: object
-                          type: object
-                        credentialSecretRef:
-                          type: string
-                        livenessProbe:
-                          properties:
-                            exec:
-                              properties:
-                                command:
-                                  items:
-                                    type: string
-                                  type: array
-                              type: object
-                            failureThreshold:
-                              type: integer
-                            grpc:
-                              properties:
-                                port:
-                                  type: integer
-                                service:
-                                  type: string
-                              type: object
-                            httpGet:
-                              properties:
-                                host:
-                                  type: string
-                                httpHeaders:
-                                  items:
-                                    properties:
-                                      name:
-                                        type: string
-                                      value:
-                                        type: string
-                                    type: object
-                                  type: array
-                                path:
-                                  type: string
-                                port:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                                scheme:
-                                  type: string
-                              type: object
-                            initialDelaySeconds:
-                              type: integer
-                            periodSeconds:
-                              type: integer
-                            successThreshold:
-                              type: integer
-                            tcpSocket:
-                              properties:
-                                host:
-                                  type: string
-                                port:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            terminationGracePeriodSeconds:
-                              type: integer
-                            timeoutSeconds:
-                              type: integer
-                          type: object
-                        maxSurge:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          x-kubernetes-int-or-string: true
-                        maxUnavailable:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          x-kubernetes-int-or-string: true
-                        priorityClassName:
-                          type: string
-                        readinessProbe:
-                          properties:
-                            exec:
-                              properties:
-                                command:
-                                  items:
-                                    type: string
-                                  type: array
-                              type: object
-                            failureThreshold:
-                              type: integer
-                            grpc:
-                              properties:
-                                port:
-                                  type: integer
-                                service:
-                                  type: string
-                              type: object
-                            httpGet:
-                              properties:
-                                host:
-                                  type: string
-                                httpHeaders:
-                                  items:
-                                    properties:
-                                      name:
-                                        type: string
-                                      value:
-                                        type: string
-                                    type: object
-                                  type: array
-                                path:
-                                  type: string
-                                port:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                                scheme:
-                                  type: string
-                              type: object
-                            initialDelaySeconds:
-                              type: integer
-                            periodSeconds:
-                              type: integer
-                            successThreshold:
-                              type: integer
-                            tcpSocket:
-                              properties:
-                                host:
-                                  type: string
-                                port:
-                                  anyOf:
-                                    - type: integer
-                                    - type: string
-                                  x-kubernetes-int-or-string: true
-                              type: object
-                            terminationGracePeriodSeconds:
-                              type: integer
-                            timeoutSeconds:
-                              type: integer
-                          type: object
-                        replicas:
-                          type: integer
-                        resources:
-                          properties:
-                            claims:
-                              items:
-                                properties:
-                                  name:
-                                    type: string
-                                  request:
-                                    type: string
-                                type: object
-                              type: array
-                            limits:
-                              additionalProperties:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                x-kubernetes-int-or-string: true
-                              type: object
-                            requests:
-                              additionalProperties:
-                                anyOf:
-                                  - type: integer
-                                  - type: string
-                                x-kubernetes-int-or-string: true
-                              type: object
-                          type: object
-                        service:
-                          properties:
-                            httpPort:
-                              type: integer
-                            type:
-                              type: string
-                          type: object
-                        tolerations:
-                          items:
-                            properties:
-                              effect:
-                                type: string
-                              key:
-                                type: string
-                              operator:
-                                type: string
-                              tolerationSeconds:
-                                type: integer
-                              value:
-                                type: string
-                            type: object
-                          type: array
-                        topologySpreadConstraints:
-                          items:
-                            properties:
-                              labelSelector:
-                                properties:
-                                  matchExpressions:
-                                    items:
-                                      properties:
-                                        key:
-                                          type: string
-                                        operator:
-                                          type: string
-                                        values:
-                                          items:
-                                            type: string
-                                          type: array
-                                      type: object
-                                    type: array
-                                  matchLabels:
-                                    additionalProperties:
-                                      type: string
-                                    type: object
-                                type: object
-                              matchLabelKeys:
-                                items:
-                                  type: string
-                                type: array
-                              maxSkew:
-                                type: integer
-                              minDomains:
-                                type: integer
-                              nodeAffinityPolicy:
-                                type: string
-                              nodeTaintsPolicy:
-                                type: string
-                              topologyKey:
-                                type: string
-                              whenUnsatisfiable:
-                                type: string
-                            type: object
-                          type: array
-                      type: object
-                  type: object
-                refdb:
-                  properties:
-                    database:
-                      enum:
-                        - NONE
-                        - SPANNER
-                        - ZOOKEEPER
-                      type: string
-                    spanner:
-                      properties:
-                        database:
-                          type: string
-                        instance:
-                          type: string
-                        projectName:
-                          type: string
-                      type: object
-                    zookeeper:
-                      properties:
-                        connectString:
-                          type: string
-                        rootNode:
-                          type: string
-                      type: object
-                  type: object
-                scheduledTasks:
-                  properties:
-                    gerritMaintenance:
-                      properties:
-                        projects:
-                          properties:
-                            gc:
-                              items:
-                                properties:
-                                  affinity:
-                                    properties:
-                                      nodeAffinity:
-                                        properties:
-                                          preferredDuringSchedulingIgnoredDuringExecution:
-                                            items:
-                                              properties:
-                                                preference:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchFields:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                  type: object
-                                                weight:
-                                                  type: integer
-                                              type: object
-                                            type: array
-                                          requiredDuringSchedulingIgnoredDuringExecution:
-                                            properties:
-                                              nodeSelectorTerms:
-                                                items:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchFields:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                  type: object
-                                                type: array
-                                            type: object
-                                        type: object
-                                      podAffinity:
-                                        properties:
-                                          preferredDuringSchedulingIgnoredDuringExecution:
-                                            items:
-                                              properties:
-                                                podAffinityTerm:
-                                                  properties:
-                                                    labelSelector:
-                                                      properties:
-                                                        matchExpressions:
-                                                          items:
-                                                            properties:
-                                                              key:
-                                                                type: string
-                                                              operator:
-                                                                type: string
-                                                              values:
-                                                                items:
-                                                                  type: string
-                                                                type: array
-                                                            type: object
-                                                          type: array
-                                                        matchLabels:
-                                                          additionalProperties:
-                                                            type: string
-                                                          type: object
-                                                      type: object
-                                                    matchLabelKeys:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    mismatchLabelKeys:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    namespaceSelector:
-                                                      properties:
-                                                        matchExpressions:
-                                                          items:
-                                                            properties:
-                                                              key:
-                                                                type: string
-                                                              operator:
-                                                                type: string
-                                                              values:
-                                                                items:
-                                                                  type: string
-                                                                type: array
-                                                            type: object
-                                                          type: array
-                                                        matchLabels:
-                                                          additionalProperties:
-                                                            type: string
-                                                          type: object
-                                                      type: object
-                                                    namespaces:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    topologyKey:
-                                                      type: string
-                                                  type: object
-                                                weight:
-                                                  type: integer
-                                              type: object
-                                            type: array
-                                          requiredDuringSchedulingIgnoredDuringExecution:
-                                            items:
-                                              properties:
-                                                labelSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                matchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                mismatchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                namespaceSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                namespaces:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                topologyKey:
-                                                  type: string
-                                              type: object
-                                            type: array
-                                        type: object
-                                      podAntiAffinity:
-                                        properties:
-                                          preferredDuringSchedulingIgnoredDuringExecution:
-                                            items:
-                                              properties:
-                                                podAffinityTerm:
-                                                  properties:
-                                                    labelSelector:
-                                                      properties:
-                                                        matchExpressions:
-                                                          items:
-                                                            properties:
-                                                              key:
-                                                                type: string
-                                                              operator:
-                                                                type: string
-                                                              values:
-                                                                items:
-                                                                  type: string
-                                                                type: array
-                                                            type: object
-                                                          type: array
-                                                        matchLabels:
-                                                          additionalProperties:
-                                                            type: string
-                                                          type: object
-                                                      type: object
-                                                    matchLabelKeys:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    mismatchLabelKeys:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    namespaceSelector:
-                                                      properties:
-                                                        matchExpressions:
-                                                          items:
-                                                            properties:
-                                                              key:
-                                                                type: string
-                                                              operator:
-                                                                type: string
-                                                              values:
-                                                                items:
-                                                                  type: string
-                                                                type: array
-                                                            type: object
-                                                          type: array
-                                                        matchLabels:
-                                                          additionalProperties:
-                                                            type: string
-                                                          type: object
-                                                      type: object
-                                                    namespaces:
-                                                      items:
-                                                        type: string
-                                                      type: array
-                                                    topologyKey:
-                                                      type: string
-                                                  type: object
-                                                weight:
-                                                  type: integer
-                                              type: object
-                                            type: array
-                                          requiredDuringSchedulingIgnoredDuringExecution:
-                                            items:
-                                              properties:
-                                                labelSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                matchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                mismatchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                namespaceSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                namespaces:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                topologyKey:
-                                                  type: string
-                                              type: object
-                                            type: array
-                                        type: object
-                                    type: object
-                                  args:
-                                    items:
-                                      type: string
-                                    type: array
-                                  exclude:
-                                    items:
-                                      type: string
-                                    type: array
-                                  gitOptions:
-                                    type: string
-                                  include:
-                                    items:
-                                      type: string
-                                    type: array
-                                  name:
-                                    type: string
-                                  resources:
-                                    properties:
-                                      claims:
-                                        items:
-                                          properties:
-                                            name:
-                                              type: string
-                                            request:
-                                              type: string
-                                          type: object
-                                        type: array
-                                      limits:
-                                        additionalProperties:
-                                          anyOf:
-                                            - type: integer
-                                            - type: string
-                                          x-kubernetes-int-or-string: true
-                                        type: object
-                                      requests:
-                                        additionalProperties:
-                                          anyOf:
-                                            - type: integer
-                                            - type: string
-                                          x-kubernetes-int-or-string: true
-                                        type: object
-                                    type: object
-                                  schedule:
-                                    type: string
-                                  tolerations:
-                                    items:
-                                      properties:
-                                        effect:
-                                          type: string
-                                        key:
-                                          type: string
-                                        operator:
-                                          type: string
-                                        tolerationSeconds:
-                                          type: integer
-                                        value:
-                                          type: string
-                                      type: object
-                                    type: array
-                                type: object
-                              type: array
-                          type: object
-                      type: object
-                    incomingReplication:
-                      items:
-                        properties:
-                          metadata:
-                            properties:
-                              annotations:
-                                additionalProperties:
-                                  type: string
-                                type: object
-                              creationTimestamp:
-                                type: string
-                              deletionGracePeriodSeconds:
-                                type: integer
-                              deletionTimestamp:
-                                type: string
-                              finalizers:
-                                items:
-                                  type: string
-                                type: array
-                              generateName:
-                                type: string
-                              generation:
-                                type: integer
-                              labels:
-                                additionalProperties:
-                                  type: string
-                                type: object
-                              managedFields:
-                                items:
-                                  properties:
-                                    apiVersion:
-                                      type: string
-                                    fieldsType:
-                                      type: string
-                                    fieldsV1:
-                                      type: object
-                                    manager:
-                                      type: string
-                                    operation:
-                                      type: string
-                                    subresource:
-                                      type: string
-                                    time:
-                                      type: string
-                                  type: object
-                                type: array
-                              name:
-                                type: string
-                              namespace:
-                                type: string
-                              ownerReferences:
-                                items:
-                                  properties:
-                                    apiVersion:
-                                      type: string
-                                    blockOwnerDeletion:
-                                      type: boolean
-                                    controller:
-                                      type: boolean
-                                    kind:
-                                      type: string
-                                    name:
-                                      type: string
-                                    uid:
-                                      type: string
-                                  type: object
-                                type: array
-                              resourceVersion:
-                                type: string
-                              selfLink:
-                                type: string
-                              uid:
-                                type: string
-                            type: object
-                          spec:
-                            properties:
-                              affinity:
-                                properties:
-                                  nodeAffinity:
-                                    properties:
-                                      preferredDuringSchedulingIgnoredDuringExecution:
-                                        items:
-                                          properties:
-                                            preference:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchFields:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                              type: object
-                                            weight:
-                                              type: integer
-                                          type: object
-                                        type: array
-                                      requiredDuringSchedulingIgnoredDuringExecution:
-                                        properties:
-                                          nodeSelectorTerms:
-                                            items:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchFields:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                              type: object
-                                            type: array
-                                        type: object
-                                    type: object
-                                  podAffinity:
-                                    properties:
-                                      preferredDuringSchedulingIgnoredDuringExecution:
-                                        items:
-                                          properties:
-                                            podAffinityTerm:
-                                              properties:
-                                                labelSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                matchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                mismatchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                namespaceSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                namespaces:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                topologyKey:
-                                                  type: string
-                                              type: object
-                                            weight:
-                                              type: integer
-                                          type: object
-                                        type: array
-                                      requiredDuringSchedulingIgnoredDuringExecution:
-                                        items:
-                                          properties:
-                                            labelSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            matchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            mismatchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            namespaceSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            namespaces:
-                                              items:
-                                                type: string
-                                              type: array
-                                            topologyKey:
-                                              type: string
-                                          type: object
-                                        type: array
-                                    type: object
-                                  podAntiAffinity:
-                                    properties:
-                                      preferredDuringSchedulingIgnoredDuringExecution:
-                                        items:
-                                          properties:
-                                            podAffinityTerm:
-                                              properties:
-                                                labelSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                matchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                mismatchLabelKeys:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                namespaceSelector:
-                                                  properties:
-                                                    matchExpressions:
-                                                      items:
-                                                        properties:
-                                                          key:
-                                                            type: string
-                                                          operator:
-                                                            type: string
-                                                          values:
-                                                            items:
-                                                              type: string
-                                                            type: array
-                                                        type: object
-                                                      type: array
-                                                    matchLabels:
-                                                      additionalProperties:
-                                                        type: string
-                                                      type: object
-                                                  type: object
-                                                namespaces:
-                                                  items:
-                                                    type: string
-                                                  type: array
-                                                topologyKey:
-                                                  type: string
-                                              type: object
-                                            weight:
-                                              type: integer
-                                          type: object
-                                        type: array
-                                      requiredDuringSchedulingIgnoredDuringExecution:
-                                        items:
-                                          properties:
-                                            labelSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            matchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            mismatchLabelKeys:
-                                              items:
-                                                type: string
-                                              type: array
-                                            namespaceSelector:
-                                              properties:
-                                                matchExpressions:
-                                                  items:
-                                                    properties:
-                                                      key:
-                                                        type: string
-                                                      operator:
-                                                        type: string
-                                                      values:
-                                                        items:
-                                                          type: string
-                                                        type: array
-                                                    type: object
-                                                  type: array
-                                                matchLabels:
-                                                  additionalProperties:
-                                                    type: string
-                                                  type: object
-                                              type: object
-                                            namespaces:
-                                              items:
-                                                type: string
-                                              type: array
-                                            topologyKey:
-                                              type: string
-                                          type: object
-                                        type: array
-                                    type: object
-                                type: object
-                              config:
-                                properties:
-                                  remotes:
-                                    items:
-                                      properties:
-                                        fetch:
-                                          items:
-                                            properties:
-                                              localRepo:
-                                                type: string
-                                              refSpec:
-                                                type: string
-                                              remoteRepo:
-                                                type: string
-                                            required:
-                                              - remoteRepo
-                                            type: object
-                                          type: array
-                                        name:
-                                          type: string
-                                        timeout:
-                                          type: string
-                                        url:
-                                          type: string
-                                      required:
-                                        - name
-                                        - url
-                                      type: object
-                                    type: array
-                                required:
-                                  - remotes
-                                type: object
-                              resources:
-                                properties:
-                                  claims:
-                                    items:
-                                      properties:
-                                        name:
-                                          type: string
-                                        request:
-                                          type: string
-                                      type: object
-                                    type: array
-                                  limits:
-                                    additionalProperties:
-                                      anyOf:
-                                        - type: integer
-                                        - type: string
-                                      x-kubernetes-int-or-string: true
-                                    type: object
-                                  requests:
-                                    additionalProperties:
-                                      anyOf:
-                                        - type: integer
-                                        - type: string
-                                      x-kubernetes-int-or-string: true
-                                    type: object
-                                type: object
-                              schedule:
-                                type: string
-                              secretRef:
-                                type: string
-                              tolerations:
-                                items:
-                                  properties:
-                                    effect:
-                                      type: string
-                                    key:
-                                      type: string
-                                    operator:
-                                      type: string
-                                    tolerationSeconds:
-                                      type: integer
-                                    value:
-                                      type: string
-                                  type: object
-                                type: array
-                            required:
-                              - config
-                              - schedule
-                            type: object
-                        type: object
-                      type: array
-                  type: object
-                serverId:
-                  type: string
-                storage:
-                  properties:
-                    pluginCache:
-                      properties:
-                        enabled:
-                          type: boolean
-                      type: object
-                    sharedStorage:
-                      properties:
-                        externalPVC:
-                          properties:
-                            claimName:
-                              type: string
-                            enabled:
-                              type: boolean
-                          type: object
-                        selector:
-                          properties:
-                            matchExpressions:
-                              items:
-                                properties:
-                                  key:
-                                    type: string
-                                  operator:
-                                    type: string
-                                  values:
-                                    items:
-                                      type: string
-                                    type: array
-                                type: object
-                              type: array
-                            matchLabels:
-                              additionalProperties:
-                                type: string
-                              type: object
-                          type: object
-                        size:
-                          anyOf:
-                            - type: integer
-                            - type: string
-                          x-kubernetes-int-or-string: true
-                        volumeName:
-                          type: string
-                      type: object
-                    storageClasses:
-                      properties:
-                        nfsWorkaround:
-                          properties:
-                            chownOnStartup:
-                              type: boolean
-                            enabled:
-                              type: boolean
-                            idmapdConfig:
-                              type: string
-                          type: object
-                        readWriteMany:
-                          type: string
-                        readWriteOnce:
-                          type: string
-                      type: object
-                  type: object
-              type: object
-            status:
-              properties:
-                members:
-                  additionalProperties:
-                    items:
-                      type: string
-                    type: array
-                  type: object
-              type: object
-          type: object
-      served: true
       storage: false
       subresources:
         status: {}
diff --git a/helm-charts/gerrit-operator-crds/templates/gerritindexers.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gerritindexers.gerritoperator.google.com-v1.yml
index 62a60ca..19730c0 100644
--- a/helm-charts/gerrit-operator-crds/templates/gerritindexers.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gerritindexers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritindexer
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -489,7 +489,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -851,8 +851,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/helm-charts/gerrit-operator-crds/templates/gerritmaintenances.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gerritmaintenances.gerritoperator.google.com-v1.yml
index 1ac5c49..bbcfd42 100644
--- a/helm-charts/gerrit-operator-crds/templates/gerritmaintenances.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gerritmaintenances.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: gerritmaintenance
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -557,7 +557,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -947,8 +947,6 @@
                                   properties:
                                     name:
                                       type: string
-                                    request:
-                                      type: string
                                   type: object
                                 type: array
                               limits:
diff --git a/helm-charts/gerrit-operator-crds/templates/gerritnetworks.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gerritnetworks.gerritoperator.google.com-v1.yml
index 177f2d4..037573a 100644
--- a/helm-charts/gerrit-operator-crds/templates/gerritnetworks.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gerritnetworks.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerritnetwork
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -141,7 +141,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -182,6 +182,8 @@
                             type: string
                           type: object
                       type: object
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
diff --git a/helm-charts/gerrit-operator-crds/templates/gerrits.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gerrits.gerritoperator.google.com-v1.yml
index 19100eb..fc3b2c8 100644
--- a/helm-charts/gerrit-operator-crds/templates/gerrits.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gerrits.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gerrit
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -663,10 +663,22 @@
                   properties:
                     database:
                       enum:
+                        - DYNAMODB
                         - NONE
                         - SPANNER
                         - ZOOKEEPER
                       type: string
+                    dynamoDb:
+                      properties:
+                        endpoint:
+                          type: string
+                        locksTableName:
+                          type: string
+                        refsDbTableName:
+                          type: string
+                        region:
+                          type: string
+                      type: object
                     spanner:
                       properties:
                         database:
@@ -693,8 +705,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
@@ -937,7 +947,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -1404,6 +1414,8 @@
                       type: boolean
                     host:
                       type: string
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
diff --git a/helm-charts/gerrit-operator-crds/templates/gitgcs.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/gitgcs.gerritoperator.google.com-v1.yml
index 5762728..fc0e627 100644
--- a/helm-charts/gerrit-operator-crds/templates/gitgcs.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/gitgcs.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: gitgarbagecollection
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -424,7 +424,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -777,8 +777,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/helm-charts/gerrit-operator-crds/templates/incomingreplicationtasks.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/incomingreplicationtasks.gerritoperator.google.com-v1.yml
index 1f2aff0..5e2bc81 100644
--- a/helm-charts/gerrit-operator-crds/templates/incomingreplicationtasks.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/incomingreplicationtasks.gerritoperator.google.com-v1.yml
@@ -11,7 +11,7 @@
     singular: incomingreplicationtask
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -570,7 +570,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -971,8 +971,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/helm-charts/gerrit-operator-crds/templates/receivers.gerritoperator.google.com-v1.yml b/helm-charts/gerrit-operator-crds/templates/receivers.gerritoperator.google.com-v1.yml
index e91e3c4..2182d31 100644
--- a/helm-charts/gerrit-operator-crds/templates/receivers.gerritoperator.google.com-v1.yml
+++ b/helm-charts/gerrit-operator-crds/templates/receivers.gerritoperator.google.com-v1.yml
@@ -13,7 +13,7 @@
     singular: receiver
   scope: Namespaced
   versions:
-    - name: v1beta15
+    - name: v1beta16
       schema:
         openAPIV3Schema:
           properties:
@@ -689,7 +689,7 @@
       storage: true
       subresources:
         status: {}
-    - name: v1beta14
+    - name: v1beta15
       schema:
         openAPIV3Schema:
           properties:
@@ -1059,6 +1059,8 @@
                       type: boolean
                     host:
                       type: string
+                    pathPrefix:
+                      type: string
                     ssh:
                       properties:
                         enabled:
@@ -1212,8 +1214,6 @@
                         properties:
                           name:
                             type: string
-                          request:
-                            type: string
                         type: object
                       type: array
                     limits:
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/Constants.java b/operator/src/main/java/com/google/gerrit/k8s/operator/Constants.java
index 20c2b4c..6b7b830 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/Constants.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/Constants.java
@@ -17,7 +17,7 @@
 import com.google.inject.AbstractModule;
 
 public class Constants extends AbstractModule {
-  public static final String VERSION = "v1beta15";
+  public static final String VERSION = "v1beta16";
 
   // The resource kind always has to be plural for use in webhooks
   public static final String GERRIT_CLUSTER_KIND = "gerritclusters";
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/admission/servlet/GerritAdmissionWebhook.java b/operator/src/main/java/com/google/gerrit/k8s/operator/admission/servlet/GerritAdmissionWebhook.java
index 8273652..87acbdd 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/admission/servlet/GerritAdmissionWebhook.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/admission/servlet/GerritAdmissionWebhook.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.k8s.operator.admission.servlet;
 
+import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.DYNAMODB;
 import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.SPANNER;
 import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.ZOOKEEPER;
 
@@ -93,6 +94,9 @@
         case SPANNER:
           refDbName = SPANNER.toString().toLowerCase(Locale.US);
           break;
+        case DYNAMODB:
+          refDbName = DYNAMODB.toString().toLowerCase(Locale.US);
+          break;
         default:
           break;
       }
@@ -131,6 +135,8 @@
         return refDbConfig.getZookeeper() == null;
       case SPANNER:
         return refDbConfig.getSpanner() == null;
+      case DYNAMODB:
+        return refDbConfig.getDynamoDb() == null;
       default:
         return false;
     }
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/DynamoRefDbConfig.java b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/DynamoRefDbConfig.java
new file mode 100644
index 0000000..d84b492
--- /dev/null
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/DynamoRefDbConfig.java
@@ -0,0 +1,25 @@
+// Copyright (C) 2025 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.k8s.operator.api.model.shared;
+
+import lombok.Data;
+
+@Data
+public class DynamoRefDbConfig {
+  private String region;
+  private String endpoint;
+  private String locksTableName;
+  private String refsDbTableName;
+}
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/GlobalRefDbConfig.java b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/GlobalRefDbConfig.java
index 0ae4334..bd9f6c2 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/GlobalRefDbConfig.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/api/model/shared/GlobalRefDbConfig.java
@@ -20,6 +20,7 @@
   private RefDatabase database = RefDatabase.NONE;
   private ZookeeperRefDbConfig zookeeper;
   private SpannerRefDbConfig spanner;
+  private DynamoRefDbConfig dynamoDb;
 
   public RefDatabase getDatabase() {
     return database;
@@ -45,9 +46,17 @@
     this.spanner = spanner;
   }
 
+  public DynamoRefDbConfig getDynamoDb() {
+    return dynamoDb;
+  }
+
+  public void setDynamoDb(DynamoRefDbConfig dynamoDb) {
+    this.dynamoDb = dynamoDb;
+  }
+
   @Override
   public int hashCode() {
-    return Objects.hash(database, spanner, zookeeper);
+    return Objects.hash(database, spanner, zookeeper, dynamoDb);
   }
 
   @Override
@@ -58,7 +67,8 @@
     GlobalRefDbConfig other = (GlobalRefDbConfig) obj;
     return database == other.database
         && Objects.equals(spanner, other.spanner)
-        && Objects.equals(zookeeper, other.zookeeper);
+        && Objects.equals(zookeeper, other.zookeeper)
+        && Objects.equals(dynamoDb, other.dynamoDb);
   }
 
   @Override
@@ -69,6 +79,8 @@
         + zookeeper
         + ", spanner="
         + spanner
+        + ", dynamodb="
+        + dynamoDb
         + "]";
   }
 
@@ -76,5 +88,6 @@
     NONE,
     ZOOKEEPER,
     SPANNER,
+    DYNAMODB
   }
 }
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/DynamoDbRefDbPluginConfigBuilder.java b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/DynamoDbRefDbPluginConfigBuilder.java
new file mode 100644
index 0000000..b173409
--- /dev/null
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/DynamoDbRefDbPluginConfigBuilder.java
@@ -0,0 +1,70 @@
+// Copyright (C) 2025 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.k8s.operator.gerrit.config;
+
+import com.google.common.collect.ImmutableList;
+import com.google.gerrit.k8s.operator.api.model.gerrit.Gerrit;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DynamoDbRefDbPluginConfigBuilder extends ConfigBuilder {
+  public DynamoDbRefDbPluginConfigBuilder(Gerrit gerrit) {
+    super(
+        gerrit.getSpec().getConfigFiles().getOrDefault("aws-dynamodb-refdb.config", ""),
+        ImmutableList.copyOf(collectRequiredOptions(gerrit)));
+  }
+
+  private static List<RequiredOption<?>> collectRequiredOptions(Gerrit gerrit) {
+    List<RequiredOption<?>> requiredOptions = new ArrayList<>();
+    String endpoint =
+            gerrit.getSpec().getRefdb().getDynamoDb().getEndpoint();
+
+    if (endpoint == null || endpoint.isEmpty()) {
+      endpoint =
+              "https://dynamodb."
+                      + gerrit.getSpec().getRefdb().getDynamoDb().getRegion()
+                      + ".amazonaws.com";
+    }
+    requiredOptions.add(
+        new RequiredOption<String>(
+            "ref-database",
+            "aws-dynamodb-refdb",
+            "region",
+            gerrit.getSpec().getRefdb().getDynamoDb().getRegion()));
+
+    requiredOptions.add(
+        new RequiredOption<String>(
+            "ref-database",
+            "aws-dynamodb-refdb",
+            "endpoint",
+            endpoint));
+
+    requiredOptions.add(
+        new RequiredOption<String>(
+            "ref-database",
+            "aws-dynamodb-refdb",
+            "locksTableName",
+            gerrit.getSpec().getRefdb().getDynamoDb().getLocksTableName()));
+
+    requiredOptions.add(
+        new RequiredOption<String>(
+            "ref-database",
+            "aws-dynamodb-refdb",
+            "refsDbTableName",
+            gerrit.getSpec().getRefdb().getDynamoDb().getRefsDbTableName()));
+
+    return requiredOptions;
+  }
+}
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/GerritConfigBuilder.java b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/GerritConfigBuilder.java
index d221b28..63a8ad8 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/GerritConfigBuilder.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/config/GerritConfigBuilder.java
@@ -220,6 +220,9 @@
       case SPANNER:
         mandatoryPlugins.add("spanner-refdb");
         break;
+      case DYNAMODB:
+        mandatoryPlugins.add("aws-dynamodb-refdb");
+        break;
       default:
         throw new IllegalStateException("Unknown refdb database type: " + refDb);
     }
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritConfigMap.java b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritConfigMap.java
index 219bd13..0286a89 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritConfigMap.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritConfigMap.java
@@ -19,6 +19,7 @@
 import com.google.gerrit.k8s.operator.OperatorContext;
 import com.google.gerrit.k8s.operator.api.model.gerrit.Gerrit;
 import com.google.gerrit.k8s.operator.cluster.GerritClusterLabelFactory;
+import com.google.gerrit.k8s.operator.gerrit.config.DynamoDbRefDbPluginConfigBuilder;
 import com.google.gerrit.k8s.operator.gerrit.config.GerritConfigBuilder;
 import com.google.gerrit.k8s.operator.gerrit.config.HighAvailabilityPluginConfigBuilder;
 import com.google.gerrit.k8s.operator.gerrit.config.MultisitePluginConfigBuilder;
@@ -73,6 +74,11 @@
         configFiles.put(
             "spanner-refdb.config", new SpannerRefDbPluginConfigBuilder(gerrit).build().toText());
         break;
+      case DYNAMODB:
+        configFiles.put(
+            "aws-dynamodb-refdb.config",
+            new DynamoDbRefDbPluginConfigBuilder(gerrit).build().toText());
+        break;
       default:
         break;
     }
diff --git a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritInitConfigMap.java b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritInitConfigMap.java
index e255aaa..dbc41ed 100644
--- a/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritInitConfigMap.java
+++ b/operator/src/main/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritInitConfigMap.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.k8s.operator.gerrit.dependent;
 
 import static com.google.gerrit.k8s.operator.api.model.cluster.GerritCluster.PLUGIN_CACHE_MOUNT_PATH;
+import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.DYNAMODB;
 import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.SPANNER;
 import static com.google.gerrit.k8s.operator.api.model.shared.GlobalRefDbConfig.RefDatabase.ZOOKEEPER;
 
@@ -76,6 +77,9 @@
       case SPANNER:
         config.setRefdb(SPANNER.toString().toLowerCase(Locale.US));
         break;
+      case DYNAMODB:
+        config.setRefdb("aws-"+DYNAMODB.toString().toLowerCase(Locale.US));
+        break;
       default:
         break;
     }
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_maintenance.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_maintenance.yaml
index 3f30d8a..d0951f9 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_maintenance.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_maintenance.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritMaintenance
 metadata:
   name: gerrit-gerrit-maintenance
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_primary.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_primary.yaml
index 128c56d..5f02651 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_primary.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_primary.yaml
@@ -1,9 +1,9 @@
-apiVersion: gerritoperator.google.com/v1beta15
+apiVersion: gerritoperator.google.com/v1beta16
 kind: Gerrit
 metadata:
   name: gerrit
   annotations:
-    gerritoperator.google.com/apiVersion: gerritoperator.google.com/v1beta15
+    gerritoperator.google.com/apiVersion: gerritoperator.google.com/v1beta16
 spec:
   configFiles: {}
   containerImages:
@@ -39,6 +39,7 @@
     database: NONE
     spanner: null
     zookeeper: null
+    dynamoDb: null
   replicas: 2
   secretRef: gerrit-secure-config
   serverId: server-1
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_replica.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_replica.yaml
index a5b7656..e434ad1 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_replica.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/dependent/gerrit_replica.yaml
@@ -1,9 +1,9 @@
-apiVersion: gerritoperator.google.com/v1beta15
+apiVersion: gerritoperator.google.com/v1beta16
 kind: Gerrit
 metadata:
   name: gerrit-replica
   annotations:
-    gerritoperator.google.com/apiVersion: gerritoperator.google.com/v1beta15
+    gerritoperator.google.com/apiVersion: gerritoperator.google.com/v1beta16
 spec:
   configFiles: {}
   containerImages:
@@ -37,6 +37,7 @@
     database: NONE
     spanner: null
     zookeeper: null
+    dynamoDb: null
   replicas: 2
   secretRef: gerrit-secure-config
   serverId:  server-1
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/gerritcluster_primary_replica.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/gerritcluster_primary_replica.yaml
index 1e11e0c..cb916c0 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/gerritcluster_primary_replica.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/cluster/gerritcluster_primary_replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_es_primary.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_es_primary.yaml
index 120924c..0a4c4cd 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_es_primary.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_es_primary.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Gerrit
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_ha_primary.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_ha_primary.yaml
index 294f7dc..d6906f2 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_ha_primary.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_ha_primary.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Gerrit
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_single_primary.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_single_primary.yaml
index bf78e02..541258f 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_single_primary.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gerrit/gerrit_single_primary.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Gerrit
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_default.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_default.yaml
index b6a7826..5c0bdc3 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_default.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_default.yaml
@@ -14,7 +14,7 @@
   annotations:
     app.kubernetes.io/managed-by: gerrit-operator
   ownerReferences:
-  - apiVersion: gerritoperator.google.com/v1beta15
+  - apiVersion: gerritoperator.google.com/v1beta16
     kind: GitGarbageCollection
     name: gitgc
     uid: abcd1234
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_nfs_workaround.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_nfs_workaround.yaml
index dc4e312..fd1af7a 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_nfs_workaround.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_nfs_workaround.yaml
@@ -14,7 +14,7 @@
   annotations:
     app.kubernetes.io/managed-by: gerrit-operator
   ownerReferences:
-  - apiVersion: gerritoperator.google.com/v1beta15
+  - apiVersion: gerritoperator.google.com/v1beta16
     kind: GitGarbageCollection
     name: gitgc
     uid: abcd1234
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_options_enabled.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_options_enabled.yaml
index be56398..1a55fc5 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_options_enabled.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_all_options_enabled.yaml
@@ -14,7 +14,7 @@
   annotations:
     app.kubernetes.io/managed-by: gerrit-operator
   ownerReferences:
-  - apiVersion: gerritoperator.google.com/v1beta15
+  - apiVersion: gerritoperator.google.com/v1beta16
     kind: GitGarbageCollection
     name: gitgc
     uid: abcd1234
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_default.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_default.yaml
index 5ce3065..1899e32 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_default.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_default.yaml
@@ -14,7 +14,7 @@
   annotations:
     app.kubernetes.io/managed-by: gerrit-operator
   ownerReferences:
-  - apiVersion: gerritoperator.google.com/v1beta15
+  - apiVersion: gerritoperator.google.com/v1beta16
     kind: GitGarbageCollection
     name: gitgc
     uid: abcd1234
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_options_enabled.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_options_enabled.yaml
index 9f6948b..0f4651c 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_options_enabled.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/dependent/cronjob_selected_options_enabled.yaml
@@ -14,7 +14,7 @@
   annotations:
     app.kubernetes.io/managed-by: gerrit-operator
   ownerReferences:
-  - apiVersion: gerritoperator.google.com/v1beta15
+  - apiVersion: gerritoperator.google.com/v1beta16
     kind: GitGarbageCollection
     name: gitgc
     uid: abcd1234
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_minimal.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_minimal.yaml
index 8fc4da9..075dbae 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_minimal.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_minimal.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_nfs_workaround.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_nfs_workaround.yaml
index 0d0b7d2..986798c 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_nfs_workaround.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gerritcluster_nfs_workaround.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_default.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_default.yaml
index d6ad39b..3d649a2 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_default.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_default.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GitGarbageCollection
 metadata:
   name: gitgc
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_options_enabled.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_options_enabled.yaml
index 040cb6f..52aba5a 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_options_enabled.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_all_options_enabled.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GitGarbageCollection
 metadata:
   name: gitgc
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_default.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_default.yaml
index 18c479c..f35f781 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_default.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_default.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GitGarbageCollection
 metadata:
   name: gitgc
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_options_enabled.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_options_enabled.yaml
index 704b2a5..e7c0ee1 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_options_enabled.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/gitgc/gitgc_selected_options_enabled.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GitGarbageCollection
 metadata:
   name: gitgc
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_es.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_es.yaml
index 463ec78..97e5a30 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_es.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_es.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_minimal.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_minimal.yaml
index 551e28d..01cdb9a 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_minimal.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/gerritcluster_minimal.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer.yaml
index 8fb4eb4..3837e45 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritIndexer
 metadata:
   name: gerrit-indexer
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer_es.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer_es.yaml
index a1be3fe..6f18b49 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer_es.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/indexer/indexer_es.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritIndexer
 metadata:
   name: gerrit-indexer
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/maintenance/gerrit-maintenance.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/maintenance/gerrit-maintenance.yaml
index 3f30d8a..d0951f9 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/maintenance/gerrit-maintenance.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/maintenance/gerrit-maintenance.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritMaintenance
 metadata:
   name: gerrit-gerrit-maintenance
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary.yaml
index 00eedac..5581e5e 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica.yaml
index 1bf3c8c..45e7e61 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_ssh.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_ssh.yaml
index 7b62096..50fd437 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_ssh.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_ssh.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_tls.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_tls.yaml
index 85ec162..963be49 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_tls.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_replica_tls.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_ssh.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_ssh.yaml
index 7671e53..c3be283 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_ssh.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_primary_ssh.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica.yaml
index bd324cf..69ed3e9 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_ssh.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_ssh.yaml
index 5a521fa..7b84fda 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_ssh.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_ssh.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_tls.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_tls.yaml
index 17a13e4..8a12110 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_tls.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_receiver_replica_tls.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica.yaml
index 73252f8..a6bde98 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica_ssh.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica_ssh.yaml
index 6ab75da..bbf946a 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica_ssh.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/network/gerritnetwork_replica_ssh.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritNetwork
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver.yaml
index a37faa8..409e5b1 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Receiver
 metadata:
   name: receiver
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver_minimal.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver_minimal.yaml
index bfb81ac..b96ed29 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver_minimal.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/receiver/receiver_minimal.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: Receiver
 metadata:
   name: receiver
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/gerritcluster_incomingrepl.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/gerritcluster_incomingrepl.yaml
index 0916fd5..068ac6b 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/gerritcluster_incomingrepl.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/gerritcluster_incomingrepl.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: GerritCluster
 metadata:
   name: gerrit
diff --git a/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/incomingrepltask.yaml b/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/incomingrepltask.yaml
index 925fe7c..24147a4 100644
--- a/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/incomingrepltask.yaml
+++ b/operator/src/test/resources/com/google/gerrit/k8s/operator/tasks/incomingrepl/incomingrepltask.yaml
@@ -1,4 +1,4 @@
-apiVersion: "gerritoperator.google.com/v1beta15"
+apiVersion: "gerritoperator.google.com/v1beta16"
 kind: IncomingReplicationTask
 metadata:
   name: incoming-replication-test