diff --git a/Cargo.lock b/Cargo.lock
index 7223abf..9bd2f0d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1881,8 +1881,8 @@ dependencies = [
 
 [[package]]
 name = "stackable-operator"
-version = "0.58.0"
-source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat/more-crd-docs#6ab64a88ea542dd0b5f0acec6448e3a30e3eabbb"
+version = "0.58.1"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.58.1#ab309d577e1937834f2adcbcd647822aa9c2ae43"
 dependencies = [
  "chrono",
  "clap",
@@ -1919,8 +1919,8 @@ dependencies = [
 
 [[package]]
 name = "stackable-operator-derive"
-version = "0.58.0"
-source = "git+https://github.com/stackabletech//operator-rs.git?branch=feat/more-crd-docs#6ab64a88ea542dd0b5f0acec6448e3a30e3eabbb"
+version = "0.58.1"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=0.58.1#ab309d577e1937834f2adcbcd647822aa9c2ae43"
 dependencies = [
  "darling",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index ea93272..fc47fa0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,10 +16,10 @@ futures = { version = "0.3", features = ["compat"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 snafu = "0.7"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.58.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.58.1" }
 strum = { version = "0.25", features = ["derive"] }
 tokio = { version = "1.29", features = ["full"] }
 tracing = "0.1"
 
-[patch."https://github.com/stackabletech/operator-rs.git"]
-stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/more-crd-docs" }
+# [patch."https://github.com/stackabletech/operator-rs.git"]
+# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/more-crd-docs" }
diff --git a/deploy/helm/commons-operator/crds/crds.yaml b/deploy/helm/commons-operator/crds/crds.yaml
index 9582aa4..8da56c9 100644
--- a/deploy/helm/commons-operator/crds/crds.yaml
+++ b/deploy/helm/commons-operator/crds/crds.yaml
@@ -57,7 +57,7 @@ spec:
                                   type: boolean
                                 services:
                                   default: []
-                                  description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participate in.
+                                  description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participates in.
                                   items:
                                     type: string
                                   type: array
@@ -142,7 +142,7 @@ spec:
                                             - secretClass
                                       properties:
                                         secretClass:
-                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a ca cert but don't have access to the key you can still use this method.
+                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
                                           type: string
                                         webPki:
                                           description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
@@ -159,7 +159,7 @@ spec:
                         - hostname
                       type: object
                     oidc:
-                      description: The OIDC provider can be used to configure OpenID connect.
+                      description: The OIDC provider can be used to configure OpenID Connect.
                       properties:
                         hostname:
                           description: Hostname of the identity provider, e.g. `my.keycloak.corp`.
@@ -220,7 +220,7 @@ spec:
                                             - secretClass
                                       properties:
                                         secretClass:
-                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a ca cert but don't have access to the key you can still use this method.
+                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
                                           type: string
                                         webPki:
                                           description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
@@ -323,7 +323,7 @@ spec:
                           type: boolean
                         services:
                           default: []
-                          description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participate in.
+                          description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participates in.
                           items:
                             type: string
                           type: array
@@ -371,7 +371,7 @@ spec:
                                     - secretClass
                               properties:
                                 secretClass:
-                                  description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a ca cert but don't have access to the key you can still use this method.
+                                  description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
                                   type: string
                                 webPki:
                                   description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.
@@ -459,7 +459,7 @@ spec:
                                   type: boolean
                                 services:
                                   default: []
-                                  description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participate in.
+                                  description: The service scope allows Pod objects to specify custom scopes. This should typically correspond to Service objects that the Pod participates in.
                                   items:
                                     type: string
                                   type: array
@@ -507,7 +507,7 @@ spec:
                                             - secretClass
                                       properties:
                                         secretClass:
-                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a ca cert but don't have access to the key you can still use this method.
+                                          description: Name of the [SecretClass](https://docs.stackable.tech/home/nightly/secret-operator/secretclass) which will provide the CA certificate. Note that a SecretClass does not need to have a key but can also work with just a CA certificate, so if you got provided with a CA cert but don't have access to the key you can still use this method.
                                           type: string
                                         webPki:
                                           description: Use TLS and the CA certificates trusted by the common web browsers to verify the server. This can be useful when you e.g. use public AWS S3 or other public available services.