diff --git a/charts/postgres-operator/crds/postgresqls.yaml b/charts/postgres-operator/crds/postgresqls.yaml
index 4d7c2586a..568ad28ac 100644
--- a/charts/postgres-operator/crds/postgresqls.yaml
+++ b/charts/postgres-operator/crds/postgresqls.yaml
@@ -273,34 +273,26 @@ spec:
                   vars that enable load balancers are pointers because it is important to know if any of them is omitted from the Postgres manifest
                   in that case the var evaluates to nil and the value is taken from the operator config
                 type: boolean
+              enableMasterNodePort:
+                description: |-
+                  vars to enable and configure nodeport services
+                  set ports to 0 or nil to let kubernetes decide which port to use
+                  overrides loadbalancer configuration
+                type: boolean
               enableMasterPoolerLoadBalancer:
                 type: boolean
+              enableMasterPoolerNodePort:
+                type: boolean
               enableReplicaConnectionPooler:
                 type: boolean
               enableReplicaLoadBalancer:
                 type: boolean
-              enableReplicaPoolerLoadBalancer:
-                type: boolean
-              enableMasterNodePort:
-                type: boolean
-              masterNodePort:
-                type: integer
-                minimum: 0
-              enableMasterPoolerNodePort:
-                type: boolean
-              masterPoolerNodePort:
-                type: integer
-                minimum: 0
               enableReplicaNodePort:
                 type: boolean
-              replicaNodePort:
-                type: integer
-                minimum: 0
+              enableReplicaPoolerLoadBalancer:
+                type: boolean
               enableReplicaPoolerNodePort:
                 type: boolean
-              replicaPoolerNodePort:
-                type: integer
-                minimum: 0
               enableShmVolume:
                 type: boolean
               env:
@@ -3428,6 +3420,12 @@ spec:
                   pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
                   type: string
                 type: array
+              masterNodePort:
+                format: int32
+                type: integer
+              masterPoolerNodePort:
+                format: int32
+                type: integer
               masterServiceAnnotations:
                 additionalProperties:
                   type: string
@@ -3732,6 +3730,12 @@ spec:
               replicaLoadBalancer:
                 description: deprecated
                 type: boolean
+              replicaNodePort:
+                format: int32
+                type: integer
+              replicaPoolerNodePort:
+                format: int32
+                type: integer
               replicaServiceAnnotations:
                 additionalProperties:
                   type: string
diff --git a/manifests/postgresql.crd.yaml b/manifests/postgresql.crd.yaml
index b139c1db9..72d7153ba 100644
--- a/manifests/postgresql.crd.yaml
+++ b/manifests/postgresql.crd.yaml
@@ -274,14 +274,26 @@ spec:
                   vars that enable load balancers are pointers because it is important to know if any of them is omitted from the Postgres manifest
                   in that case the var evaluates to nil and the value is taken from the operator config
                 type: boolean
+              enableMasterNodePort:
+                description: |-
+                  vars to enable and configure nodeport services
+                  set ports to 0 or nil to let kubernetes decide which port to use
+                  overrides loadbalancer configuration
+                type: boolean
               enableMasterPoolerLoadBalancer:
                 type: boolean
+              enableMasterPoolerNodePort:
+                type: boolean
               enableReplicaConnectionPooler:
                 type: boolean
               enableReplicaLoadBalancer:
                 type: boolean
+              enableReplicaNodePort:
+                type: boolean
               enableReplicaPoolerLoadBalancer:
                 type: boolean
+              enableReplicaPoolerNodePort:
+                type: boolean
               enableShmVolume:
                 type: boolean
               env:
@@ -3409,6 +3421,12 @@ spec:
                   pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
                   type: string
                 type: array
+              masterNodePort:
+                format: int32
+                type: integer
+              masterPoolerNodePort:
+                format: int32
+                type: integer
               masterServiceAnnotations:
                 additionalProperties:
                   type: string
@@ -3713,6 +3731,12 @@ spec:
               replicaLoadBalancer:
                 description: deprecated
                 type: boolean
+              replicaNodePort:
+                format: int32
+                type: integer
+              replicaPoolerNodePort:
+                format: int32
+                type: integer
               replicaServiceAnnotations:
                 additionalProperties:
                   type: string
diff --git a/pkg/apis/acid.zalan.do/v1/postgresql.crd.yaml b/pkg/apis/acid.zalan.do/v1/postgresql.crd.yaml
index b139c1db9..72d7153ba 100644
--- a/pkg/apis/acid.zalan.do/v1/postgresql.crd.yaml
+++ b/pkg/apis/acid.zalan.do/v1/postgresql.crd.yaml
@@ -274,14 +274,26 @@ spec:
                   vars that enable load balancers are pointers because it is important to know if any of them is omitted from the Postgres manifest
                   in that case the var evaluates to nil and the value is taken from the operator config
                 type: boolean
+              enableMasterNodePort:
+                description: |-
+                  vars to enable and configure nodeport services
+                  set ports to 0 or nil to let kubernetes decide which port to use
+                  overrides loadbalancer configuration
+                type: boolean
               enableMasterPoolerLoadBalancer:
                 type: boolean
+              enableMasterPoolerNodePort:
+                type: boolean
               enableReplicaConnectionPooler:
                 type: boolean
               enableReplicaLoadBalancer:
                 type: boolean
+              enableReplicaNodePort:
+                type: boolean
               enableReplicaPoolerLoadBalancer:
                 type: boolean
+              enableReplicaPoolerNodePort:
+                type: boolean
               enableShmVolume:
                 type: boolean
               env:
@@ -3409,6 +3421,12 @@ spec:
                   pattern: '^\ *((Mon|Tue|Wed|Thu|Fri|Sat|Sun):(2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))-((2[0-3]|[01]?\d):([0-5]?\d)|(2[0-3]|[01]?\d):([0-5]?\d))\ *$'
                   type: string
                 type: array
+              masterNodePort:
+                format: int32
+                type: integer
+              masterPoolerNodePort:
+                format: int32
+                type: integer
               masterServiceAnnotations:
                 additionalProperties:
                   type: string
@@ -3713,6 +3731,12 @@ spec:
               replicaLoadBalancer:
                 description: deprecated
                 type: boolean
+              replicaNodePort:
+                format: int32
+                type: integer
+              replicaPoolerNodePort:
+                format: int32
+                type: integer
               replicaServiceAnnotations:
                 additionalProperties:
                   type: string