diff --git a/Cargo.lock b/Cargo.lock
index c4cc1af5..794066fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,7 +27,7 @@ dependencies = [
  "getrandom",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.35",
 ]
 
 [[package]]
@@ -147,18 +147,18 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.87"
+version = "0.1.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d556ec1359574147ec0c4fc5eb525f3f23263a592b1a9c07e0a75b427de55c97"
+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -168,14 +168,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
-name = "backoff"
-version = "0.4.0"
+name = "backon"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1"
+checksum = "49fef586913a57ff189f25c9b3d034356a5bf6b3fa9a7f067588fe1698ba1f5d"
 dependencies = [
- "getrandom",
- "instant",
- "rand",
+ "fastrand",
+ "gloo-timers",
+ "tokio",
 ]
 
 [[package]]
@@ -295,9 +295,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -305,9 +305,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.31"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -317,14 +317,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.28"
+version = "4.5.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -368,6 +368,15 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -449,7 +458,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -460,7 +469,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -471,14 +480,14 @@ checksum = "297806318ef30ad066b15792a8372858020ae3ca2e414ee6c2133b1eb9e9e945"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
 ]
@@ -501,7 +510,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -539,14 +548,14 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "either"
-version = "1.14.0"
+version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7914353092ddf589ad78f25c5c1c21b7f80b0ff8621e7c814c3485b5306da9d"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "encoding_rs"
@@ -583,7 +592,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -624,6 +633,12 @@ dependencies = [
  "regex-syntax 0.8.5",
 ]
 
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -632,9 +647,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.4"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d2fde1f7b3d48b8395d5f2de76c18a528bd6a9cdde438df747bfcba3e05d6f"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
 [[package]]
 name = "form_urlencoded"
@@ -707,7 +722,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -776,9 +791,9 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "git2"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
+checksum = "5220b8ba44c68a9a7f7a7659e864dd73692e417ef0211bea133c7b74e031eeb9"
 dependencies = [
  "bitflags",
  "libc",
@@ -793,6 +808,18 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -862,9 +889,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
 dependencies = [
  "bytes",
  "fnv",
@@ -883,12 +910,12 @@ dependencies = [
 
 [[package]]
 name = "http-body-util"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
 dependencies = [
  "bytes",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "pin-project-lite",
@@ -927,9 +954,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-http-proxy"
-version = "1.0.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d06dbdfbacf34d996c6fb540a71a684a7aae9056c71951163af8a8a4c07b9a4"
+checksum = "7ad4b0a1e37510028bc4ba81d0e38d239c39671b0f0ce9e02dfa93a8133f7c08"
 dependencies = [
  "bytes",
  "futures-util",
@@ -1134,7 +1161,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1166,9 +1193,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -1180,15 +1207,6 @@ version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "integer-encoding"
 version = "3.0.4"
@@ -1201,6 +1219,15 @@ version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
+[[package]]
+name = "itertools"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.15"
@@ -1239,9 +1266,9 @@ dependencies = [
 
 [[package]]
 name = "json-patch"
-version = "3.0.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08"
+checksum = "159294d661a039f7644cea7e4d844e6b25aaf71c1ffe9d73a96d768c24b0faf4"
 dependencies = [
  "jsonptr",
  "serde",
@@ -1264,9 +1291,9 @@ dependencies = [
 
 [[package]]
 name = "jsonptr"
-version = "0.6.3"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70"
+checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe"
 dependencies = [
  "serde",
  "serde_json",
@@ -1286,11 +1313,21 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "k8s-version"
+version = "0.1.2"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+dependencies = [
+ "darling",
+ "regex",
+ "snafu 0.8.5",
+]
+
 [[package]]
 name = "kube"
-version = "0.98.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32053dc495efad4d188c7b33cc7c02ef4a6e43038115348348876efd39a53cba"
+checksum = "9a4eb20010536b48abe97fec37d23d43069bcbe9686adcf9932202327bc5ca6e"
 dependencies = [
  "k8s-openapi",
  "kube-client",
@@ -1301,9 +1338,9 @@ dependencies = [
 
 [[package]]
 name = "kube-client"
-version = "0.98.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d34ad38cdfbd1fa87195d42569f57bb1dda6ba5f260ee32fef9570b7937a0c9"
+checksum = "7fc2ed952042df20d15ac2fe9614d0ec14b6118eab89633985d4b36e688dccf1"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -1324,7 +1361,6 @@ dependencies = [
  "kube-core",
  "pem",
  "rustls",
- "rustls-pemfile",
  "secrecy",
  "serde",
  "serde_json",
@@ -1339,9 +1375,9 @@ dependencies = [
 
 [[package]]
 name = "kube-core"
-version = "0.98.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97aa830b288a178a90e784d1b0f1539f2d200d2188c7b4a3146d9dc983d596f3"
+checksum = "ff0d0793db58e70ca6d689489183816cb3aa481673e7433dc618cf7e8007c675"
 dependencies = [
  "chrono",
  "form_urlencoded",
@@ -1357,34 +1393,34 @@ dependencies = [
 
 [[package]]
 name = "kube-derive"
-version = "0.98.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37745d8a4076b77e0b1952e94e358726866c8e14ec94baaca677d47dcdb98658"
+checksum = "c562f58dc9f7ca5feac8a6ee5850ca221edd6f04ce0dd2ee873202a88cd494c9"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
+ "serde",
  "serde_json",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "kube-runtime"
-version = "0.98.0"
+version = "0.99.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a41af186a0fe80c71a13a13994abdc3ebff80859ca6a4b8a6079948328c135b"
+checksum = "88f34cfab9b4bd8633062e0e85edb81df23cb09f159f2e31c60b069ae826ffdc"
 dependencies = [
  "ahash",
  "async-broadcast",
  "async-stream",
  "async-trait",
- "backoff",
+ "backon",
  "educe",
  "futures 0.3.31",
  "hashbrown",
  "hostname",
  "json-patch",
- "jsonptr",
  "k8s-openapi",
  "kube-client",
  "parking_lot",
@@ -1405,15 +1441,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.170"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.18.0+1.9.0"
+version = "0.18.1+1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
+checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
 dependencies = [
  "cc",
  "libc",
@@ -1423,9 +1459,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.21"
+version = "1.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df9b68e50e6e0b26f672573834882eb57759f6db9b3be2ea3c35c91188bb4eaa"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
 dependencies = [
  "cc",
  "libc",
@@ -1542,9 +1578,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
 
 [[package]]
 name = "openssl-probe"
@@ -1710,7 +1746,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1741,7 +1777,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -1770,18 +1806,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy",
+ "zerocopy 0.8.23",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.2.0"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
+checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
 dependencies = [
  "toml_edit",
 ]
@@ -1813,9 +1849,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.39"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
@@ -1911,9 +1947,9 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 
 [[package]]
 name = "ring"
-version = "0.17.11"
+version = "0.17.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da5349ae27d3887ca812fb375b45a4fbb36d8d12d2df394968cd86e35683fe73"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
@@ -1949,7 +1985,7 @@ dependencies = [
  "regex",
  "relative-path",
  "rustc_version",
- "syn 2.0.99",
+ "syn 2.0.100",
  "unicode-ident",
 ]
 
@@ -1970,13 +2006,12 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.23"
+version = "0.23.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47796c98c480fce5406ef69d1c76378375492c3b0a0de587be0c1d9feb12f395"
+checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
 dependencies = [
  "log",
  "once_cell",
- "ring",
  "rustls-pki-types",
  "rustls-webpki",
  "subtle",
@@ -2025,9 +2060,9 @@ checksum = "917ce264624a4b4db1c364dcc35bfca9ded014d0a958cd47ad3e960e988ea51c"
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "0aa4eeac2588ffff23e9d7a7e9b3f971c5fb5b7ebc9452745e0c232c64f83b2f"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -2077,7 +2112,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2139,9 +2174,9 @@ checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
 
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
@@ -2158,13 +2193,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2175,7 +2210,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2303,7 +2338,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2324,8 +2359,8 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "stackable-operator"
-version = "0.87.0"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d"
+version = "0.87.4"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
 dependencies = [
  "chrono",
  "clap",
@@ -2363,18 +2398,18 @@ dependencies = [
 [[package]]
 name = "stackable-operator-derive"
 version = "0.3.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
 dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
 name = "stackable-shared"
 version = "0.0.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#53ccc1e9eca2a5b35a8618593c548e8687fb150d"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
 dependencies = [
  "kube",
  "semver",
@@ -2383,22 +2418,6 @@ dependencies = [
  "snafu 0.8.5",
 ]
 
-[[package]]
-name = "stackable-superset-crd"
-version = "0.0.0-dev"
-dependencies = [
- "indoc",
- "product-config",
- "serde",
- "serde_json",
- "serde_yaml",
- "snafu 0.8.5",
- "stackable-operator",
- "strum",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "stackable-superset-operator"
 version = "0.0.0-dev"
@@ -2413,14 +2432,40 @@ dependencies = [
  "product-config",
  "rstest",
  "serde",
+ "serde_json",
+ "serde_yaml",
  "snafu 0.8.5",
  "stackable-operator",
- "stackable-superset-crd",
+ "stackable-versioned",
  "strum",
  "tokio",
  "tracing",
 ]
 
+[[package]]
+name = "stackable-versioned"
+version = "0.7.0"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+dependencies = [
+ "stackable-versioned-macros",
+]
+
+[[package]]
+name = "stackable-versioned-macros"
+version = "0.7.0"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+dependencies = [
+ "convert_case",
+ "darling",
+ "itertools",
+ "k8s-openapi",
+ "k8s-version",
+ "kube",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -2446,7 +2491,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2468,9 +2513,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.99"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2491,7 +2536,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2520,7 +2565,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2531,7 +2576,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2568,9 +2613,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.38"
+version = "0.3.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb041120f25f8fbe8fd2dbe4671c7c2ed74d83be2e7a77529bf7e0790ae3f472"
+checksum = "9d9c75b47bdff86fa3334a3db91356b8d7d86a9b839dab7d0bdc5c3d3a077618"
 dependencies = [
  "deranged",
  "itoa",
@@ -2583,15 +2628,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "765c97a5b985b7c11d7bc27fa927dc4fe6af3a6dfb021d28deb60d3bf51e76ef"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8093bc3e81c3bc5f7879de09619d06c9a5a5e45ca44dfeeb7225bae38005c5c"
+checksum = "29aa485584182073ed57fd5004aa09c371f021325014694e432313345865fd04"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2609,9 +2654,9 @@ dependencies = [
 
 [[package]]
 name = "tokio"
-version = "1.43.0"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2633,7 +2678,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2659,9 +2704,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
 dependencies = [
  "bytes",
  "futures-core",
@@ -2767,7 +2812,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -2864,6 +2909,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unicode-segmentation"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.6"
@@ -2967,7 +3018,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
  "wasm-bindgen-shared",
 ]
 
@@ -2989,7 +3040,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -3144,9 +3195,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
 dependencies = [
  "memchr",
 ]
@@ -3189,7 +3240,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
  "synstructure",
 ]
 
@@ -3199,8 +3250,16 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
- "byteorder",
- "zerocopy-derive",
+ "zerocopy-derive 0.7.35",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6"
+dependencies = [
+ "zerocopy-derive 0.8.23",
 ]
 
 [[package]]
@@ -3211,7 +3270,18 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.100",
 ]
 
 [[package]]
@@ -3231,7 +3301,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
  "synstructure",
 ]
 
@@ -3260,5 +3330,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.99",
+ "syn 2.0.100",
 ]
diff --git a/Cargo.nix b/Cargo.nix
index ae116d59..86e0d20d 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -32,21 +32,23 @@ rec {
   # "public" attributes that we attempt to keep stable with new versions of crate2nix.
   #
 
+  rootCrate = rec {
+    packageId = "stackable-superset-operator";
 
+    # Use this attribute to refer to the derivation building your root crate package.
+    # You can override the features with rootCrate.build.override { features = [ "default" "feature1" ... ]; }.
+    build = internal.buildRustCrateWithFeatures {
+      inherit packageId;
+    };
+
+    # Debug support which might change between releases.
+    # File a bug if you depend on any for non-debug work!
+    debug = internal.debugCrate { inherit packageId; };
+  };
   # Refer your crate build derivation by name here.
   # You can override the features with
   # workspaceMembers."${crateName}".build.override { features = [ "default" "feature1" ... ]; }.
   workspaceMembers = {
-    "stackable-superset-crd" = rec {
-      packageId = "stackable-superset-crd";
-      build = internal.buildRustCrateWithFeatures {
-        packageId = "stackable-superset-crd";
-      };
-
-      # Debug support which might change between releases.
-      # File a bug if you depend on any for non-debug work!
-      debug = internal.debugCrate { inherit packageId; };
-    };
     "stackable-superset-operator" = rec {
       packageId = "stackable-superset-operator";
       build = internal.buildRustCrateWithFeatures {
@@ -156,7 +158,7 @@ rec {
           }
           {
             name = "zerocopy";
-            packageId = "zerocopy";
+            packageId = "zerocopy 0.7.35";
             usesDefaultFeatures = false;
             features = [ "simd" ];
           }
@@ -453,7 +455,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" "visit-mut" ];
           }
         ];
@@ -461,9 +463,9 @@ rec {
       };
       "async-trait" = rec {
         crateName = "async-trait";
-        version = "0.1.87";
+        version = "0.1.88";
         edition = "2021";
-        sha256 = "15swwmyl4nx7w03rq6ibb4x2c8rzbx9fpiag1kn4fhapb49yqmnm";
+        sha256 = "1dgxvz7g75cmz6vqqz0mri4xazc6a8xfj1db6r9fxz29lzyd6fg5";
         procMacro = true;
         libName = "async_trait";
         authors = [
@@ -480,7 +482,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "clone-impls" "full" "parsing" "printing" "proc-macro" "visit-mut" ];
           }
@@ -497,39 +499,58 @@ rec {
         ];
 
       };
-      "backoff" = rec {
-        crateName = "backoff";
-        version = "0.4.0";
-        edition = "2018";
-        sha256 = "1h80d9xn5wngxdgza2m8w4x1kyhk0x6k9ydvsj50j2pcn6fdnbdn";
-        authors = [
-          "Tibor Benke <ihrwein@gmail.com>"
-        ];
+      "backon" = rec {
+        crateName = "backon";
+        version = "1.4.0";
+        edition = "2021";
+        sha256 = "0p8zpac1dzl8fl37z6psngv5nsim6k8b7j95kwcgymrsj63gbzj9";
         dependencies = [
           {
-            name = "getrandom";
-            packageId = "getrandom";
+            name = "fastrand";
+            packageId = "fastrand";
+            usesDefaultFeatures = false;
           }
           {
-            name = "instant";
-            packageId = "instant";
+            name = "gloo-timers";
+            packageId = "gloo-timers";
+            optional = true;
+            target = { target, features }: ("wasm32" == target."arch" or null);
           }
           {
-            name = "rand";
-            packageId = "rand";
+            name = "tokio";
+            packageId = "tokio";
+            optional = true;
+            target = { target, features }: (!("wasm32" == target."arch" or null));
+          }
+        ];
+        devDependencies = [
+          {
+            name = "tokio";
+            packageId = "tokio";
+            target = {target, features}: (!("wasm32" == target."arch" or null));
+            features = [ "time" "rt" "macros" "sync" "rt-multi-thread" ];
+          }
+          {
+            name = "tokio";
+            packageId = "tokio";
+            usesDefaultFeatures = false;
+            target = {target, features}: ("wasm32" == target."arch" or null);
+            features = [ "macros" "rt" "sync" ];
           }
         ];
         features = {
-          "async-std" = [ "futures" "async_std_1" ];
-          "async_std_1" = [ "dep:async_std_1" ];
-          "futures" = [ "futures-core" "pin-project-lite" ];
-          "futures-core" = [ "dep:futures-core" ];
-          "pin-project-lite" = [ "dep:pin-project-lite" ];
-          "tokio" = [ "futures" "tokio_1" ];
-          "tokio_1" = [ "dep:tokio_1" ];
-          "wasm-bindgen" = [ "instant/wasm-bindgen" "getrandom/js" ];
+          "default" = [ "std" "std-blocking-sleep" "tokio-sleep" "gloo-timers-sleep" ];
+          "embassy-sleep" = [ "embassy-time" ];
+          "embassy-time" = [ "dep:embassy-time" ];
+          "futures-timer" = [ "dep:futures-timer" ];
+          "futures-timer-sleep" = [ "futures-timer" ];
+          "gloo-timers" = [ "dep:gloo-timers" ];
+          "gloo-timers-sleep" = [ "gloo-timers/futures" ];
+          "std" = [ "fastrand/std" ];
+          "tokio" = [ "dep:tokio" ];
+          "tokio-sleep" = [ "tokio/time" ];
         };
-        resolvedDefaultFeatures = [ "default" ];
+        resolvedDefaultFeatures = [ "default" "gloo-timers" "gloo-timers-sleep" "std" "std-blocking-sleep" "tokio" "tokio-sleep" ];
       };
       "backtrace" = rec {
         crateName = "backtrace";
@@ -874,10 +895,10 @@ rec {
       };
       "clap" = rec {
         crateName = "clap";
-        version = "4.5.31";
+        version = "4.5.32";
         edition = "2021";
         crateBin = [];
-        sha256 = "0ryp6xjbdc9cbjjkafjl35j91pvv0ykislwqhr537bi9hkcv0yq2";
+        sha256 = "10vg2fbcsy0dwxdqpdqihxl8b935310lax6dc29d221nijpg7230";
         dependencies = [
           {
             name = "clap_builder";
@@ -916,9 +937,9 @@ rec {
       };
       "clap_builder" = rec {
         crateName = "clap_builder";
-        version = "4.5.31";
+        version = "4.5.32";
         edition = "2021";
-        sha256 = "0qyqd6kfcs41x29a95n15744jyv2v07srvwi6z9g7q3jl35y12am";
+        sha256 = "1j5cdwdry9anb8ljzqymb15byghz8jcpzafshbxysmb1cxzyz9r2";
         dependencies = [
           {
             name = "anstream";
@@ -955,9 +976,9 @@ rec {
       };
       "clap_derive" = rec {
         crateName = "clap_derive";
-        version = "4.5.28";
+        version = "4.5.32";
         edition = "2021";
-        sha256 = "1vgigkhljp3r8r5lwdrn1ij93nafmjwh8cx77nppb9plqsaysk5z";
+        sha256 = "1mqcag8qapb5yhygg2hi153kzmbf7w5hqp3nl3fvl5cn4yp6l5q9";
         procMacro = true;
         dependencies = [
           {
@@ -974,7 +995,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
         ];
@@ -1089,6 +1110,25 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
+      "convert_case" = rec {
+        crateName = "convert_case";
+        version = "0.8.0";
+        edition = "2021";
+        sha256 = "17zqy79xlr1n7nc0n1mlnw5qpp8l2nbxrk13jixrhlavrbna1ams";
+        authors = [
+          "rutrum <dave@rutrum.net>"
+        ];
+        dependencies = [
+          {
+            name = "unicode-segmentation";
+            packageId = "unicode-segmentation";
+          }
+        ];
+        features = {
+          "rand" = [ "dep:rand" ];
+          "random" = [ "rand" ];
+        };
+      };
       "core-foundation 0.10.0" = rec {
         crateName = "core-foundation";
         version = "0.10.0";
@@ -1315,7 +1355,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" "extra-traits" ];
           }
         ];
@@ -1345,7 +1385,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
 
@@ -1371,7 +1411,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" "visit-mut" ];
           }
         ];
@@ -1379,9 +1419,9 @@ rec {
       };
       "deranged" = rec {
         crateName = "deranged";
-        version = "0.3.11";
+        version = "0.4.0";
         edition = "2021";
-        sha256 = "1d1ibqqnr5qdrpw8rclwrf1myn3wf0dygl04idf4j2s49ah6yaxl";
+        sha256 = "13h6skwk411wzhf1l9l7d3yz5y6vg9d7s3dwhhb4a942r88nm7lw";
         authors = [
           "Jacob Pratt <jacob@jhpratt.dev>"
         ];
@@ -1395,10 +1435,13 @@ rec {
         ];
         features = {
           "default" = [ "std" ];
+          "macros" = [ "dep:deranged-macros" ];
           "num" = [ "dep:num-traits" ];
           "powerfmt" = [ "dep:powerfmt" ];
           "quickcheck" = [ "dep:quickcheck" "alloc" ];
-          "rand" = [ "dep:rand" ];
+          "rand" = [ "rand08" "rand09" ];
+          "rand08" = [ "dep:rand08" ];
+          "rand09" = [ "dep:rand09" ];
           "serde" = [ "dep:serde" ];
           "std" = [ "alloc" ];
         };
@@ -1458,7 +1501,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
         features = {
@@ -1551,13 +1594,13 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
         devDependencies = [
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
         ];
@@ -1569,17 +1612,18 @@ rec {
       };
       "either" = rec {
         crateName = "either";
-        version = "1.14.0";
+        version = "1.15.0";
         edition = "2021";
-        sha256 = "17fs0r9mnj632k4ff8c6zyq80zqvqb0wa9cgsyd5iprd159l74dp";
+        sha256 = "069p1fknsmzn9llaizh77kip0pqmcwpdsykv2x30xpjyija5gis8";
         authors = [
           "bluss"
         ];
         features = {
-          "default" = [ "use_std" ];
+          "default" = [ "std" ];
           "serde" = [ "dep:serde" ];
+          "use_std" = [ "std" ];
         };
-        resolvedDefaultFeatures = [ "default" "use_std" ];
+        resolvedDefaultFeatures = [ "default" "std" "use_std" ];
       };
       "encoding_rs" = rec {
         crateName = "encoding_rs";
@@ -1659,7 +1703,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
         features = {
@@ -1774,6 +1818,22 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" "perf" "std" "unicode" ];
       };
+      "fastrand" = rec {
+        crateName = "fastrand";
+        version = "2.3.0";
+        edition = "2018";
+        sha256 = "1ghiahsw1jd68df895cy5h3gzwk30hndidn3b682zmshpgmrx41p";
+        authors = [
+          "Stjepan Glavina <stjepang@gmail.com>"
+        ];
+        features = {
+          "default" = [ "std" ];
+          "getrandom" = [ "dep:getrandom" ];
+          "js" = [ "std" "getrandom" ];
+          "std" = [ "alloc" ];
+        };
+        resolvedDefaultFeatures = [ "alloc" "std" ];
+      };
       "fnv" = rec {
         crateName = "fnv";
         version = "1.0.7";
@@ -1790,9 +1850,9 @@ rec {
       };
       "foldhash" = rec {
         crateName = "foldhash";
-        version = "0.1.4";
+        version = "0.1.5";
         edition = "2021";
-        sha256 = "0vsxw2iwpgs7yy6l7pndm7b8nllaq5vdxwnmjn1qpm5kyzhzvlm0";
+        sha256 = "1wisr1xlc2bj7hk4rgkcjkz3j2x4dhd1h9lwk7mj8p71qpdgbi6r";
         authors = [
           "Orson Peters <orsonpeters@gmail.com>"
         ];
@@ -1997,7 +2057,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
         ];
@@ -2217,9 +2277,9 @@ rec {
       };
       "git2" = rec {
         crateName = "git2";
-        version = "0.20.0";
+        version = "0.20.1";
         edition = "2018";
-        sha256 = "1zwav0r76njd9chqxh7wj4r4zfn08nzsisrg05liyd6cjf4piniz";
+        sha256 = "1fgf67h78yrw2gm1n8ghgr0jwsbkvmjfhnbng9zrm2n68jxbh82j";
         authors = [
           "Josh Triplett <josh@joshtriplett.org>"
           "Alex Crichton <alex@alexcrichton.com>"
@@ -2267,6 +2327,42 @@ rec {
         ];
 
       };
+      "gloo-timers" = rec {
+        crateName = "gloo-timers";
+        version = "0.3.0";
+        edition = "2021";
+        sha256 = "1519157n7xppkk6pdw5w52vy1llzn5iljkqd7q1h5609jv7l7cdv";
+        libName = "gloo_timers";
+        authors = [
+          "Rust and WebAssembly Working Group"
+        ];
+        dependencies = [
+          {
+            name = "futures-channel";
+            packageId = "futures-channel";
+            optional = true;
+          }
+          {
+            name = "futures-core";
+            packageId = "futures-core";
+            optional = true;
+          }
+          {
+            name = "js-sys";
+            packageId = "js-sys";
+          }
+          {
+            name = "wasm-bindgen";
+            packageId = "wasm-bindgen";
+          }
+        ];
+        features = {
+          "futures" = [ "futures-core" "futures-channel" ];
+          "futures-channel" = [ "dep:futures-channel" ];
+          "futures-core" = [ "dep:futures-core" ];
+        };
+        resolvedDefaultFeatures = [ "default" "futures" "futures-channel" "futures-core" ];
+      };
       "hashbrown" = rec {
         crateName = "hashbrown";
         version = "0.15.2";
@@ -2443,9 +2539,9 @@ rec {
       };
       "http" = rec {
         crateName = "http";
-        version = "1.2.0";
+        version = "1.3.1";
         edition = "2018";
-        sha256 = "1skglzdf98j5nzxlii540n11is0w4l80mi5sm3xrj716asps4v7i";
+        sha256 = "0r95i5h7dr1xadp1ac9453w0s62s27hzkam356nyx2d9mqqmva7l";
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
           "Carl Lerche <me@carllerche.com>"
@@ -2495,9 +2591,9 @@ rec {
       };
       "http-body-util" = rec {
         crateName = "http-body-util";
-        version = "0.1.2";
+        version = "0.1.3";
         edition = "2018";
-        sha256 = "0kslwazg4400qnc2azkrgqqci0fppv12waicnsy5d8hncvbjjd3r";
+        sha256 = "0jm6jv4gxsnlsi1kzdyffjrj8cfr3zninnxpw73mvkxy4qzdj8dh";
         libName = "http_body_util";
         authors = [
           "Carl Lerche <me@carllerche.com>"
@@ -2510,8 +2606,8 @@ rec {
             packageId = "bytes";
           }
           {
-            name = "futures-util";
-            packageId = "futures-util";
+            name = "futures-core";
+            packageId = "futures-core";
             usesDefaultFeatures = false;
           }
           {
@@ -2527,7 +2623,11 @@ rec {
             packageId = "pin-project-lite";
           }
         ];
-
+        features = {
+          "channel" = [ "dep:tokio" ];
+          "full" = [ "channel" ];
+        };
+        resolvedDefaultFeatures = [ "default" ];
       };
       "httparse" = rec {
         crateName = "httparse";
@@ -2651,9 +2751,9 @@ rec {
       };
       "hyper-http-proxy" = rec {
         crateName = "hyper-http-proxy";
-        version = "1.0.0";
+        version = "1.1.0";
         edition = "2021";
-        sha256 = "195r0x68m2mgcc8rawbc0plsm9w4lrqhlm7vqsbdjd6gpbgxn1jx";
+        sha256 = "023w7w9si4zs5phfj30g3dkkk713ipix10dsqj5h443mwfhv1m3s";
         libName = "hyper_http_proxy";
         authors = [
           "MetalBear Tech LTD <hi@metalbear.co>"
@@ -2843,7 +2943,7 @@ rec {
           "webpki-roots" = [ "dep:webpki-roots" ];
           "webpki-tokio" = [ "webpki-roots" ];
         };
-        resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "ring" "rustls-native-certs" "tls12" ];
+        resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "rustls-native-certs" "tls12" ];
       };
       "hyper-timeout" = rec {
         crateName = "hyper-timeout";
@@ -3456,7 +3556,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
 
@@ -3526,9 +3626,9 @@ rec {
       };
       "indexmap" = rec {
         crateName = "indexmap";
-        version = "2.7.1";
+        version = "2.8.0";
         edition = "2021";
-        sha256 = "0lmnm1zbr5gq3wic3d8a76gpvampridzwckfl97ckd5m08mrk74c";
+        sha256 = "0n3hkpzch6q3wgzh8g8hiyac6kk3vgd8nfsxy8mi80jvw47xam1r";
         dependencies = [
           {
             name = "equivalent";
@@ -3547,7 +3647,6 @@ rec {
           "default" = [ "std" ];
           "quickcheck" = [ "dep:quickcheck" ];
           "rayon" = [ "dep:rayon" ];
-          "rustc-rayon" = [ "dep:rustc-rayon" ];
           "serde" = [ "dep:serde" ];
         };
         resolvedDefaultFeatures = [ "default" "std" ];
@@ -3563,28 +3662,6 @@ rec {
         ];
 
       };
-      "instant" = rec {
-        crateName = "instant";
-        version = "0.1.13";
-        edition = "2018";
-        sha256 = "08h27kzvb5jw74mh0ajv0nv9ggwvgqm8ynjsn2sa9jsks4cjh970";
-        authors = [
-          "sebcrozet <developer@crozet.re>"
-        ];
-        dependencies = [
-          {
-            name = "cfg-if";
-            packageId = "cfg-if";
-          }
-        ];
-        features = {
-          "js-sys" = [ "dep:js-sys" ];
-          "stdweb" = [ "dep:stdweb" ];
-          "wasm-bindgen" = [ "js-sys" "wasm-bindgen_rs" "web-sys" ];
-          "wasm-bindgen_rs" = [ "dep:wasm-bindgen_rs" ];
-          "web-sys" = [ "dep:web-sys" ];
-        };
-      };
       "integer-encoding" = rec {
         crateName = "integer-encoding";
         version = "3.0.4";
@@ -3611,6 +3688,27 @@ rec {
         };
         resolvedDefaultFeatures = [ "default" ];
       };
+      "itertools" = rec {
+        crateName = "itertools";
+        version = "0.14.0";
+        edition = "2018";
+        sha256 = "118j6l1vs2mx65dqhwyssbrxpawa90886m3mzafdvyip41w2q69b";
+        authors = [
+          "bluss"
+        ];
+        dependencies = [
+          {
+            name = "either";
+            packageId = "either";
+            usesDefaultFeatures = false;
+          }
+        ];
+        features = {
+          "default" = [ "use_std" ];
+          "use_std" = [ "use_alloc" "either/use_std" ];
+        };
+        resolvedDefaultFeatures = [ "default" "use_alloc" "use_std" ];
+      };
       "itoa" = rec {
         crateName = "itoa";
         version = "1.0.15";
@@ -3694,9 +3792,9 @@ rec {
       };
       "json-patch" = rec {
         crateName = "json-patch";
-        version = "3.0.1";
+        version = "4.0.0";
         edition = "2021";
-        sha256 = "023gm1q5xhhnhz7jqk009yb5wpjl4gckawgzxs82bg5nmzbjcdw6";
+        sha256 = "1x7sn0j8qxkdm5rrvzhz3kvsl9bb9s24szpa9ijgffd0c7b994hm";
         libName = "json_patch";
         authors = [
           "Ivan Dubrov <dubrov.ivan@gmail.com>"
@@ -3768,12 +3866,13 @@ rec {
       };
       "jsonptr" = rec {
         crateName = "jsonptr";
-        version = "0.6.3";
+        version = "0.7.1";
         edition = "2021";
-        sha256 = "0w6xkr6ns46nm3136x7www1dczz45y2bl9bsxmb2b6r3vlkjpsjx";
+        sha256 = "1zk1wmr3c9v1bgqg68yl1yscnz4442zrbciv1g72pmx51dkcr8x5";
         authors = [
           "chance dinkins"
           "André Sá de Mello <codasm@pm.me>"
+          "Oliver Wangler <oliver@wngr.de>"
         ];
         dependencies = [
           {
@@ -3793,6 +3892,7 @@ rec {
           "default" = [ "std" "serde" "json" "resolve" "assign" "delete" ];
           "delete" = [ "resolve" ];
           "json" = [ "dep:serde_json" "serde" ];
+          "miette" = [ "dep:miette" "std" ];
           "serde" = [ "dep:serde" ];
           "std" = [ "serde/std" "serde_json?/std" ];
           "syn" = [ "dep:syn" ];
@@ -3853,11 +3953,45 @@ rec {
         };
         resolvedDefaultFeatures = [ "schemars" "v1_32" ];
       };
+      "k8s-version" = rec {
+        crateName = "k8s-version";
+        version = "0.1.2";
+        edition = "2021";
+        workspace_member = null;
+        src = pkgs.fetchgit {
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+        };
+        libName = "k8s_version";
+        authors = [
+          "Stackable GmbH <info@stackable.de>"
+        ];
+        dependencies = [
+          {
+            name = "darling";
+            packageId = "darling";
+            optional = true;
+          }
+          {
+            name = "regex";
+            packageId = "regex";
+          }
+          {
+            name = "snafu";
+            packageId = "snafu 0.8.5";
+          }
+        ];
+        features = {
+          "darling" = [ "dep:darling" ];
+        };
+        resolvedDefaultFeatures = [ "darling" ];
+      };
       "kube" = rec {
         crateName = "kube";
-        version = "0.98.0";
+        version = "0.99.0";
         edition = "2021";
-        sha256 = "1fiwllwzsvl7921k85c10d1nwjpg09ycqcvvihc4vbggjp23s19j";
+        sha256 = "0vnaqmxk40i2jgwxqsk8x75rn1j37p93gv3zx6mlhssk200b4kls";
         authors = [
           "clux <sszynrae@gmail.com>"
           "Natalie Klestrup Röijezon <nat@nullable.se>"
@@ -3903,7 +4037,7 @@ rec {
           "aws-lc-rs" = [ "kube-client?/aws-lc-rs" ];
           "client" = [ "kube-client/client" "config" ];
           "config" = [ "kube-client/config" ];
-          "default" = [ "client" "rustls-tls" ];
+          "default" = [ "client" "rustls-tls" "ring" ];
           "derive" = [ "kube-derive" "kube-core/schema" ];
           "gzip" = [ "kube-client/gzip" "client" ];
           "http-proxy" = [ "kube-client/http-proxy" "client" ];
@@ -3915,6 +4049,7 @@ rec {
           "oauth" = [ "kube-client/oauth" "client" ];
           "oidc" = [ "kube-client/oidc" "client" ];
           "openssl-tls" = [ "kube-client/openssl-tls" "client" ];
+          "ring" = [ "kube-client?/ring" ];
           "runtime" = [ "kube-runtime" ];
           "rustls-tls" = [ "kube-client/rustls-tls" "client" ];
           "socks5" = [ "kube-client/socks5" "client" ];
@@ -3927,9 +4062,9 @@ rec {
       };
       "kube-client" = rec {
         crateName = "kube-client";
-        version = "0.98.0";
+        version = "0.99.0";
         edition = "2021";
-        sha256 = "1jd06xwhnmzrzqrfwq7jlmmxl7dvaygmchjx363zmlgvrlwasd4x";
+        sha256 = "1wfciml6xcylhlwn72dbiq8vc57cs0a9dzn2bb8j1ps242ayvhkz";
         libName = "kube_client";
         authors = [
           "clux <sszynrae@gmail.com>"
@@ -4001,7 +4136,7 @@ rec {
             packageId = "hyper-rustls";
             optional = true;
             usesDefaultFeatures = false;
-            features = [ "http1" "logging" "native-tokio" "ring" "tls12" ];
+            features = [ "http1" "logging" "native-tokio" "tls12" ];
           }
           {
             name = "hyper-timeout";
@@ -4039,11 +4174,6 @@ rec {
             optional = true;
             usesDefaultFeatures = false;
           }
-          {
-            name = "rustls-pemfile";
-            packageId = "rustls-pemfile";
-            optional = true;
-          }
           {
             name = "secrecy";
             packageId = "secrecy";
@@ -4124,13 +4254,13 @@ rec {
         features = {
           "__non_core" = [ "tracing" "serde_yaml" "base64" ];
           "admission" = [ "kube-core/admission" ];
-          "aws-lc-rs" = [ "rustls?/aws-lc-rs" ];
+          "aws-lc-rs" = [ "hyper-rustls?/aws-lc-rs" ];
           "base64" = [ "dep:base64" ];
           "bytes" = [ "dep:bytes" ];
           "chrono" = [ "dep:chrono" ];
           "client" = [ "config" "__non_core" "hyper" "hyper-util" "http-body" "http-body-util" "tower" "tower-http" "hyper-timeout" "chrono" "jsonpath-rust" "bytes" "futures" "tokio" "tokio-util" "either" ];
           "config" = [ "__non_core" "pem" "home" ];
-          "default" = [ "client" ];
+          "default" = [ "client" "ring" ];
           "either" = [ "dep:either" ];
           "form_urlencoded" = [ "dep:form_urlencoded" ];
           "futures" = [ "dep:futures" ];
@@ -4154,10 +4284,9 @@ rec {
           "openssl" = [ "dep:openssl" ];
           "openssl-tls" = [ "openssl" "hyper-openssl" ];
           "pem" = [ "dep:pem" ];
-          "rand" = [ "dep:rand" ];
+          "ring" = [ "hyper-rustls?/ring" ];
           "rustls" = [ "dep:rustls" ];
-          "rustls-pemfile" = [ "dep:rustls-pemfile" ];
-          "rustls-tls" = [ "rustls" "rustls-pemfile" "hyper-rustls" "hyper-http-proxy?/rustls-tls-native-roots" ];
+          "rustls-tls" = [ "rustls" "hyper-rustls" "hyper-http-proxy?/rustls-tls-native-roots" ];
           "serde_yaml" = [ "dep:serde_yaml" ];
           "socks5" = [ "hyper-socks2" ];
           "tame-oauth" = [ "dep:tame-oauth" ];
@@ -4168,15 +4297,15 @@ rec {
           "tower-http" = [ "dep:tower-http" ];
           "tracing" = [ "dep:tracing" ];
           "webpki-roots" = [ "hyper-rustls/webpki-roots" ];
-          "ws" = [ "client" "tokio-tungstenite" "rand" "kube-core/ws" "tokio/macros" ];
+          "ws" = [ "client" "tokio-tungstenite" "kube-core/ws" "tokio/macros" ];
         };
-        resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "rustls" "rustls-pemfile" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ];
+        resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "rustls" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ];
       };
       "kube-core" = rec {
         crateName = "kube-core";
-        version = "0.98.0";
+        version = "0.99.0";
         edition = "2021";
-        sha256 = "1wwnsn1wk7bd2jiv9iw8446j0bczagqv1lc4wy88l5wa505q7alp";
+        sha256 = "0xf60y07xkqqqqyl7rvk2r4amcvch61r2j49ssk0rrsqvf9hf3gz";
         libName = "kube_core";
         authors = [
           "clux <sszynrae@gmail.com>"
@@ -4251,9 +4380,9 @@ rec {
       };
       "kube-derive" = rec {
         crateName = "kube-derive";
-        version = "0.98.0";
+        version = "0.99.0";
         edition = "2021";
-        sha256 = "0n46p76pvm3plsnbm57c2j76r1i6hwslxsaj345pxdvn8255sx1p";
+        sha256 = "1jclsj6ah0ijhzpd43ff0ipxs7i2r985ivm6r3m5zjppr66zaqn5";
         procMacro = true;
         libName = "kube_derive";
         authors = [
@@ -4274,23 +4403,35 @@ rec {
             name = "quote";
             packageId = "quote";
           }
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" ];
+          }
           {
             name = "serde_json";
             packageId = "serde_json";
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "extra-traits" ];
           }
         ];
+        devDependencies = [
+          {
+            name = "serde";
+            packageId = "serde";
+            features = [ "derive" ];
+          }
+        ];
 
       };
       "kube-runtime" = rec {
         crateName = "kube-runtime";
-        version = "0.98.0";
+        version = "0.99.0";
         edition = "2021";
-        sha256 = "0nqkihr4i687lswa99lwhn0gzsy3pm59j4rsl5qhrs0gd8cayhbs";
+        sha256 = "1p7z4vl9l1hbqqqjx7qmkyq3rwhxp3nqa3if0qrqdgdlp7x4rww8";
         libName = "kube_runtime";
         authors = [
           "clux <sszynrae@gmail.com>"
@@ -4315,8 +4456,8 @@ rec {
             packageId = "async-trait";
           }
           {
-            name = "backoff";
-            packageId = "backoff";
+            name = "backon";
+            packageId = "backon";
           }
           {
             name = "educe";
@@ -4342,10 +4483,6 @@ rec {
             name = "json-patch";
             packageId = "json-patch";
           }
-          {
-            name = "jsonptr";
-            packageId = "jsonptr";
-          }
           {
             name = "k8s-openapi";
             packageId = "k8s-openapi";
@@ -4428,9 +4565,9 @@ rec {
       };
       "libc" = rec {
         crateName = "libc";
-        version = "0.2.170";
+        version = "0.2.171";
         edition = "2021";
-        sha256 = "0a38q3avb6r6azxb7yfbjly5sbr8926z6c4sryyp33rgrf03cnw7";
+        sha256 = "1mipla3dy3l59pfa9xy4iw2vdgn8n30dzf4vdnasjflxdqhkg6f1";
         authors = [
           "The Rust Project Developers"
         ];
@@ -4444,10 +4581,10 @@ rec {
       };
       "libgit2-sys" = rec {
         crateName = "libgit2-sys";
-        version = "0.18.0+1.9.0";
+        version = "0.18.1+1.9.0";
         edition = "2018";
         links = "git2";
-        sha256 = "1v7zcw1kky338grxs70y7fwpy70g846bpa5yzvl9f5bybr31g8g1";
+        sha256 = "03i98nb84aa99bn7sxja11pllq6fghsaw4d3qwjxikgzhh7v5p71";
         libName = "libgit2_sys";
         libPath = "lib.rs";
         authors = [
@@ -4488,10 +4625,10 @@ rec {
       };
       "libz-sys" = rec {
         crateName = "libz-sys";
-        version = "1.1.21";
+        version = "1.1.22";
         edition = "2018";
         links = "z";
-        sha256 = "1ajfpf413j9m7kmf4fwvvgv5jxxm5s438f2pfbv2c2vf1vjni6yz";
+        sha256 = "07b5wxh0ska996kc0g2hanjhmb4di7ksm6ndljhr4pi0vykyfw4b";
         libName = "libz_sys";
         authors = [
           "Alex Crichton <alex@alexcrichton.com>"
@@ -4833,9 +4970,9 @@ rec {
       };
       "once_cell" = rec {
         crateName = "once_cell";
-        version = "1.20.3";
+        version = "1.21.1";
         edition = "2021";
-        sha256 = "0bp6rgrsri1vfdcahsimk08zdiilv14ppgcnpbiw8hqyp2j64m4l";
+        sha256 = "1g645fg3rk800ica72ypwajllgij38az3n831sm2rragrknhnnyp";
         authors = [
           "Aleksey Kladov <aleksey.kladov@gmail.com>"
         ];
@@ -5402,7 +5539,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
         features = {
@@ -5475,7 +5612,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "parsing" "printing" "clone-impls" "proc-macro" "full" "visit-mut" ];
           }
@@ -5528,9 +5665,9 @@ rec {
       };
       "ppv-lite86" = rec {
         crateName = "ppv-lite86";
-        version = "0.2.20";
+        version = "0.2.21";
         edition = "2021";
-        sha256 = "017ax9ssdnpww7nrl1hvqh2lzncpv04nnsibmnw9nxjnaqlpp5bp";
+        sha256 = "1abxx6qz5qnd43br1dd9b2savpihzjza8gb4fbzdql1gxp2f7sl5";
         libName = "ppv_lite86";
         authors = [
           "The CryptoCorrosion Contributors"
@@ -5538,8 +5675,8 @@ rec {
         dependencies = [
           {
             name = "zerocopy";
-            packageId = "zerocopy";
-            features = [ "simd" "derive" ];
+            packageId = "zerocopy 0.8.23";
+            features = [ "simd" ];
           }
         ];
         features = {
@@ -5549,9 +5686,9 @@ rec {
       };
       "proc-macro-crate" = rec {
         crateName = "proc-macro-crate";
-        version = "3.2.0";
+        version = "3.3.0";
         edition = "2021";
-        sha256 = "0yzsqnavb3lmrcsmbrdjfrky9vcbl46v59xi9avn0796rb3likwf";
+        sha256 = "0d9xlymplfi9yv3f5g4bp0d6qh70apnihvqcjllampx4f5lmikpd";
         libName = "proc_macro_crate";
         authors = [
           "Bastian Köcher <git@kchr.de>"
@@ -5560,6 +5697,8 @@ rec {
           {
             name = "toml_edit";
             packageId = "toml_edit";
+            usesDefaultFeatures = false;
+            features = [ "parse" ];
           }
         ];
 
@@ -5642,9 +5781,9 @@ rec {
       };
       "quote" = rec {
         crateName = "quote";
-        version = "1.0.39";
+        version = "1.0.40";
         edition = "2018";
-        sha256 = "00a8q2w3aacil4aqnndyv73k0x4lj55kp487k66nbq89x5693wf1";
+        sha256 = "1394cxjg6nwld82pzp2d4fp6pmaz32gai1zh9z5hvh0dawww118q";
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -5703,7 +5842,7 @@ rec {
           "std" = [ "rand_core/std" "rand_chacha/std" "alloc" "getrandom" "libc" ];
           "std_rng" = [ "rand_chacha" ];
         };
-        resolvedDefaultFeatures = [ "alloc" "default" "getrandom" "libc" "rand_chacha" "small_rng" "std" "std_rng" ];
+        resolvedDefaultFeatures = [ "alloc" "getrandom" "libc" "rand_chacha" "small_rng" "std" "std_rng" ];
       };
       "rand_chacha" = rec {
         crateName = "rand_chacha";
@@ -5973,10 +6112,10 @@ rec {
       };
       "ring" = rec {
         crateName = "ring";
-        version = "0.17.11";
+        version = "0.17.14";
         edition = "2021";
-        links = "ring_core_0_17_11_";
-        sha256 = "0wzyhdbf71ndd14kkpyj2a6nvczvli2mndzv2al7r26k4yp4jlys";
+        links = "ring_core_0_17_14_";
+        sha256 = "1dw32gv19ccq4hsx3ribhpdzri1vnrlcfqb2vj41xn4l49n9ws54";
         dependencies = [
           {
             name = "cfg-if";
@@ -6030,7 +6169,7 @@ rec {
           "std" = [ "alloc" ];
           "wasm32_unknown_unknown_js" = [ "getrandom/js" ];
         };
-        resolvedDefaultFeatures = [ "alloc" "default" "dev_urandom_fallback" ];
+        resolvedDefaultFeatures = [ "alloc" ];
       };
       "rstest" = rec {
         crateName = "rstest";
@@ -6111,7 +6250,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" "parsing" "extra-traits" "visit" "visit-mut" ];
           }
           {
@@ -6161,9 +6300,9 @@ rec {
       };
       "rustls" = rec {
         crateName = "rustls";
-        version = "0.23.23";
+        version = "0.23.25";
         edition = "2021";
-        sha256 = "15gk2bmry78cps3ya38a7cn4jxc36xv1r7gndr0fbz40qjc6qya7";
+        sha256 = "0g5idwxm04i71k3n66ml30zyfbgv6p85a7jky2i09v64i8cfjbl2";
         dependencies = [
           {
             name = "log";
@@ -6176,11 +6315,6 @@ rec {
             usesDefaultFeatures = false;
             features = [ "alloc" "race" ];
           }
-          {
-            name = "ring";
-            packageId = "ring";
-            optional = true;
-          }
           {
             name = "rustls-pki-types";
             packageId = "rustls-pki-types";
@@ -6212,10 +6346,10 @@ rec {
         ];
         features = {
           "aws-lc-rs" = [ "aws_lc_rs" ];
-          "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws_lc_rs" ];
+          "aws_lc_rs" = [ "dep:aws-lc-rs" "webpki/aws-lc-rs" "aws-lc-rs/aws-lc-sys" "aws-lc-rs/prebuilt-nasm" ];
           "brotli" = [ "dep:brotli" "dep:brotli-decompressor" "std" ];
           "default" = [ "aws_lc_rs" "logging" "std" "tls12" ];
-          "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" ];
+          "fips" = [ "aws_lc_rs" "aws-lc-rs?/fips" "webpki/aws-lc-rs-fips" ];
           "hashbrown" = [ "dep:hashbrown" ];
           "log" = [ "dep:log" ];
           "logging" = [ "log" ];
@@ -6226,7 +6360,7 @@ rec {
           "std" = [ "webpki/std" "pki-types/std" "once_cell/std" ];
           "zlib" = [ "dep:zlib-rs" ];
         };
-        resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ];
+        resolvedDefaultFeatures = [ "log" "logging" "std" "tls12" ];
       };
       "rustls-native-certs 0.7.3" = rec {
         crateName = "rustls-native-certs";
@@ -6328,9 +6462,9 @@ rec {
       };
       "rustls-webpki" = rec {
         crateName = "rustls-webpki";
-        version = "0.102.8";
+        version = "0.103.0";
         edition = "2021";
-        sha256 = "1sdy8ks86b7jpabpnb2px2s7f1sq8v0nqf6fnlvwzm4vfk41pjk4";
+        sha256 = "0brvz1j2q8qcbrs5555wgrdzpibiz6ryk9ypx4izzzw84nnfx90a";
         libName = "webpki";
         dependencies = [
           {
@@ -6352,12 +6486,13 @@ rec {
         ];
         features = {
           "alloc" = [ "ring?/alloc" "pki-types/alloc" ];
-          "aws_lc_rs" = [ "dep:aws-lc-rs" ];
-          "default" = [ "std" "ring" ];
+          "aws-lc-rs" = [ "dep:aws-lc-rs" "aws-lc-rs/aws-lc-sys" "aws-lc-rs/prebuilt-nasm" ];
+          "aws-lc-rs-fips" = [ "dep:aws-lc-rs" "aws-lc-rs/fips" ];
+          "default" = [ "std" ];
           "ring" = [ "dep:ring" ];
           "std" = [ "alloc" "pki-types/std" ];
         };
-        resolvedDefaultFeatures = [ "alloc" "ring" "std" ];
+        resolvedDefaultFeatures = [ "alloc" "std" ];
       };
       "rustversion" = rec {
         crateName = "rustversion";
@@ -6498,7 +6633,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "extra-traits" ];
           }
         ];
@@ -6674,9 +6809,9 @@ rec {
       };
       "serde" = rec {
         crateName = "serde";
-        version = "1.0.218";
+        version = "1.0.219";
         edition = "2018";
-        sha256 = "0q6z4bnrwagnms0bds4886711l6mc68s979i49zd3xnvkg8wkpz8";
+        sha256 = "1dl6nyxnsi82a197sd752128a4avm6mxnscywas1jq30srp2q3jz";
         authors = [
           "Erick Tryzelaar <erick.tryzelaar@gmail.com>"
           "David Tolnay <dtolnay@gmail.com>"
@@ -6729,9 +6864,9 @@ rec {
       };
       "serde_derive" = rec {
         crateName = "serde_derive";
-        version = "1.0.218";
+        version = "1.0.219";
         edition = "2015";
-        sha256 = "0azqd74xbpb1v5vf6w1fdbgmwp39ljjfj25cib5rgrzlj7hh75gh";
+        sha256 = "001azhjmj7ya52pmfiw4ppxm16nd44y15j2pf5gkcwrcgz7pc0jv";
         procMacro = true;
         authors = [
           "Erick Tryzelaar <erick.tryzelaar@gmail.com>"
@@ -6752,7 +6887,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "clone-impls" "derive" "parsing" "printing" "proc-macro" ];
           }
@@ -6784,7 +6919,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "clone-impls" "derive" "parsing" "printing" ];
           }
@@ -7157,7 +7292,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
         ];
@@ -7207,13 +7342,13 @@ rec {
       };
       "stackable-operator" = rec {
         crateName = "stackable-operator";
-        version = "0.87.0";
+        version = "0.87.4";
         edition = "2021";
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d";
-          sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
         };
         libName = "stackable_operator";
         authors = [
@@ -7372,8 +7507,8 @@ rec {
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d";
-          sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
         };
         procMacro = true;
         libName = "stackable_operator_derive";
@@ -7395,7 +7530,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
 
@@ -7407,8 +7542,8 @@ rec {
         workspace_member = null;
         src = pkgs.fetchgit {
           url = "https://github.com/stackabletech/operator-rs.git";
-          rev = "53ccc1e9eca2a5b35a8618593c548e8687fb150d";
-          sha256 = "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
         };
         libName = "stackable_shared";
         authors = [
@@ -7440,64 +7575,6 @@ rec {
           }
         ];
 
-      };
-      "stackable-superset-crd" = rec {
-        crateName = "stackable-superset-crd";
-        version = "0.0.0-dev";
-        edition = "2021";
-        src = lib.cleanSourceWith { filter = sourceFilter;  src = ./rust/crd; };
-        libName = "stackable_superset_crd";
-        authors = [
-          "Stackable GmbH <info@stackable.tech>"
-        ];
-        dependencies = [
-          {
-            name = "product-config";
-            packageId = "product-config";
-          }
-          {
-            name = "serde";
-            packageId = "serde";
-            features = [ "derive" ];
-          }
-          {
-            name = "serde_json";
-            packageId = "serde_json";
-          }
-          {
-            name = "snafu";
-            packageId = "snafu 0.8.5";
-          }
-          {
-            name = "stackable-operator";
-            packageId = "stackable-operator";
-          }
-          {
-            name = "strum";
-            packageId = "strum";
-            features = [ "derive" ];
-          }
-          {
-            name = "tracing";
-            packageId = "tracing";
-          }
-        ];
-        devDependencies = [
-          {
-            name = "indoc";
-            packageId = "indoc";
-          }
-          {
-            name = "serde_yaml";
-            packageId = "serde_yaml";
-          }
-          {
-            name = "tokio";
-            packageId = "tokio";
-            features = [ "full" ];
-          }
-        ];
-
       };
       "stackable-superset-operator" = rec {
         crateName = "stackable-superset-operator";
@@ -7549,6 +7626,10 @@ rec {
             packageId = "serde";
             features = [ "derive" ];
           }
+          {
+            name = "serde_json";
+            packageId = "serde_json";
+          }
           {
             name = "snafu";
             packageId = "snafu 0.8.5";
@@ -7558,8 +7639,9 @@ rec {
             packageId = "stackable-operator";
           }
           {
-            name = "stackable-superset-crd";
-            packageId = "stackable-superset-crd";
+            name = "stackable-versioned";
+            packageId = "stackable-versioned";
+            features = [ "k8s" ];
           }
           {
             name = "strum";
@@ -7584,13 +7666,126 @@ rec {
           }
         ];
         devDependencies = [
+          {
+            name = "indoc";
+            packageId = "indoc";
+          }
           {
             name = "rstest";
             packageId = "rstest";
           }
+          {
+            name = "serde_yaml";
+            packageId = "serde_yaml";
+          }
+          {
+            name = "tokio";
+            packageId = "tokio";
+            features = [ "full" ];
+          }
         ];
 
       };
+      "stackable-versioned" = rec {
+        crateName = "stackable-versioned";
+        version = "0.7.0";
+        edition = "2021";
+        workspace_member = null;
+        src = pkgs.fetchgit {
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+        };
+        libName = "stackable_versioned";
+        authors = [
+          "Stackable GmbH <info@stackable.de>"
+        ];
+        dependencies = [
+          {
+            name = "stackable-versioned-macros";
+            packageId = "stackable-versioned-macros";
+          }
+        ];
+        features = {
+          "full" = [ "k8s" ];
+          "k8s" = [ "stackable-versioned-macros/k8s" ];
+        };
+        resolvedDefaultFeatures = [ "k8s" ];
+      };
+      "stackable-versioned-macros" = rec {
+        crateName = "stackable-versioned-macros";
+        version = "0.7.0";
+        edition = "2021";
+        workspace_member = null;
+        src = pkgs.fetchgit {
+          url = "https://github.com/stackabletech/operator-rs.git";
+          rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
+          sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+        };
+        procMacro = true;
+        libName = "stackable_versioned_macros";
+        authors = [
+          "Stackable GmbH <info@stackable.de>"
+        ];
+        dependencies = [
+          {
+            name = "convert_case";
+            packageId = "convert_case";
+          }
+          {
+            name = "darling";
+            packageId = "darling";
+          }
+          {
+            name = "itertools";
+            packageId = "itertools";
+          }
+          {
+            name = "k8s-openapi";
+            packageId = "k8s-openapi";
+            optional = true;
+            usesDefaultFeatures = false;
+            features = [ "schemars" "v1_32" ];
+          }
+          {
+            name = "k8s-version";
+            packageId = "k8s-version";
+            features = [ "darling" ];
+          }
+          {
+            name = "kube";
+            packageId = "kube";
+            optional = true;
+            usesDefaultFeatures = false;
+            features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" ];
+          }
+          {
+            name = "proc-macro2";
+            packageId = "proc-macro2";
+          }
+          {
+            name = "quote";
+            packageId = "quote";
+          }
+          {
+            name = "syn";
+            packageId = "syn 2.0.100";
+          }
+        ];
+        devDependencies = [
+          {
+            name = "k8s-openapi";
+            packageId = "k8s-openapi";
+            usesDefaultFeatures = false;
+            features = [ "schemars" "v1_32" ];
+          }
+        ];
+        features = {
+          "full" = [ "k8s" ];
+          "k8s" = [ "dep:kube" "dep:k8s-openapi" ];
+        };
+        resolvedDefaultFeatures = [ "k8s" ];
+      };
       "strsim" = rec {
         crateName = "strsim";
         version = "0.11.1";
@@ -7653,7 +7848,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "parsing" ];
           }
         ];
@@ -7706,11 +7901,11 @@ rec {
         };
         resolvedDefaultFeatures = [ "clone-impls" "default" "derive" "full" "parsing" "printing" "proc-macro" "quote" ];
       };
-      "syn 2.0.99" = rec {
+      "syn 2.0.100" = rec {
         crateName = "syn";
-        version = "2.0.99";
+        version = "2.0.100";
         edition = "2021";
-        sha256 = "1hizbzkwa6wgi77x9ck45p3fshrwfmj448qfcjfzv3z1h5994bp0";
+        sha256 = "18623wdkns03blpv65xsjn8fipl9p9hj98vlrnhin7nqran496mh";
         authors = [
           "David Tolnay <dtolnay@gmail.com>"
         ];
@@ -7773,7 +7968,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "derive" "parsing" "printing" "clone-impls" "visit" "extra-traits" ];
           }
@@ -7840,7 +8035,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
 
@@ -7866,7 +8061,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
           }
         ];
 
@@ -7952,9 +8147,9 @@ rec {
       };
       "time" = rec {
         crateName = "time";
-        version = "0.3.38";
+        version = "0.3.40";
         edition = "2021";
-        sha256 = "0wplwc57kq7pkd97fyifps1lvmrfghf6gr6vsa7vx3szy8h1215v";
+        sha256 = "063n0wx3sp6w1dysp7c3kdmdimxqaq9vjgaa6finzy6zgfs7b74x";
         authors = [
           "Jacob Pratt <open-source@jhpratt.dev>"
           "Time contributors"
@@ -8032,9 +8227,9 @@ rec {
       };
       "time-core" = rec {
         crateName = "time-core";
-        version = "0.1.3";
+        version = "0.1.4";
         edition = "2021";
-        sha256 = "1vvn3vskn3dnvql1s0pvdlxazrjgvhksjzy2gcfw3dw5p6jrfp3n";
+        sha256 = "0z5h9fknvdvbs2k2s1chpi3ab3jvgkfhdnqwrvixjngm263s7sf9";
         libName = "time_core";
         authors = [
           "Jacob Pratt <open-source@jhpratt.dev>"
@@ -8044,9 +8239,9 @@ rec {
       };
       "time-macros" = rec {
         crateName = "time-macros";
-        version = "0.2.20";
+        version = "0.2.21";
         edition = "2021";
-        sha256 = "0p2w00wawnr2nzpdyi6a8mg5m6kcs0crdq4xhzvwafqwx31kn2g8";
+        sha256 = "017xcmc384r38d76j52h68hz0wf316m08l7xaznp680qhialiai9";
         procMacro = true;
         libName = "time_macros";
         authors = [
@@ -8098,9 +8293,9 @@ rec {
       };
       "tokio" = rec {
         crateName = "tokio";
-        version = "1.43.0";
+        version = "1.44.1";
         edition = "2021";
-        sha256 = "17pdm49ihlhfw3rpxix3kdh2ppl1yv7nwp1kxazi5r1xz97zlq9x";
+        sha256 = "06n90q5hh1yd844s6nf4j3fwbrkm2bnq533kp3a488l4bdhxm0pk";
         authors = [
           "Tokio Contributors <team@tokio.rs>"
         ];
@@ -8221,7 +8416,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
         ];
@@ -8309,9 +8504,9 @@ rec {
       };
       "tokio-util" = rec {
         crateName = "tokio-util";
-        version = "0.7.13";
+        version = "0.7.14";
         edition = "2021";
-        sha256 = "0y0h10a52c7hrldmr3410bp7j3fadq0jn9nf7awddgd2an6smz6p";
+        sha256 = "0d7hm1jrwpzryvni72fy5dg9blqs776wq5w38lwigk3g7swr15bb";
         libName = "tokio_util";
         authors = [
           "Tokio Contributors <team@tokio.rs>"
@@ -8410,7 +8605,7 @@ rec {
           "perf" = [ "dep:kstring" ];
           "serde" = [ "dep:serde" "toml_datetime/serde" "dep:serde_spanned" ];
         };
-        resolvedDefaultFeatures = [ "default" "display" "parse" ];
+        resolvedDefaultFeatures = [ "parse" ];
       };
       "tower" = rec {
         crateName = "tower";
@@ -8756,7 +8951,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             usesDefaultFeatures = false;
             features = [ "full" "parsing" "printing" "visit-mut" "clone-impls" "extra-traits" "proc-macro" ];
           }
@@ -9129,6 +9324,19 @@ rec {
         ];
 
       };
+      "unicode-segmentation" = rec {
+        crateName = "unicode-segmentation";
+        version = "1.12.0";
+        edition = "2018";
+        sha256 = "14qla2jfx74yyb9ds3d2mpwpa4l4lzb9z57c6d2ba511458z5k7n";
+        libName = "unicode_segmentation";
+        authors = [
+          "kwantam <kwantam@gmail.com>"
+          "Manish Goregaokar <manishsmail@gmail.com>"
+        ];
+        features = {
+        };
+      };
       "unicode-xid" = rec {
         crateName = "unicode-xid";
         version = "0.2.6";
@@ -9389,7 +9597,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "full" ];
           }
           {
@@ -9445,7 +9653,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "visit" "visit-mut" "full" ];
           }
           {
@@ -10902,9 +11110,9 @@ rec {
       };
       "winnow" = rec {
         crateName = "winnow";
-        version = "0.7.3";
+        version = "0.7.4";
         edition = "2021";
-        sha256 = "1c9bmhpdwbdmll6b4l6skabz0296dchnmnxw84hh2y3ggyllwzqf";
+        sha256 = "0dmbsz6zfddcgsqzzqxw1h8f7zy19x407g7zl3hyp6vf2m2bb5qf";
         dependencies = [
           {
             name = "memchr";
@@ -11027,7 +11235,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "fold" ];
           }
           {
@@ -11037,7 +11245,7 @@ rec {
         ];
 
       };
-      "zerocopy" = rec {
+      "zerocopy 0.7.35" = rec {
         crateName = "zerocopy";
         version = "0.7.35";
         edition = "2018";
@@ -11046,27 +11254,21 @@ rec {
           "Joshua Liebow-Feeser <joshlf@google.com>"
         ];
         dependencies = [
-          {
-            name = "byteorder";
-            packageId = "byteorder";
-            optional = true;
-            usesDefaultFeatures = false;
-          }
           {
             name = "zerocopy-derive";
-            packageId = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.7.35";
             optional = true;
           }
           {
             name = "zerocopy-derive";
-            packageId = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.7.35";
             target = { target, features }: false;
           }
         ];
         devDependencies = [
           {
             name = "zerocopy-derive";
-            packageId = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.7.35";
           }
         ];
         features = {
@@ -11077,9 +11279,45 @@ rec {
           "simd-nightly" = [ "simd" ];
           "zerocopy-derive" = [ "dep:zerocopy-derive" ];
         };
-        resolvedDefaultFeatures = [ "byteorder" "default" "derive" "simd" "zerocopy-derive" ];
+        resolvedDefaultFeatures = [ "simd" ];
+      };
+      "zerocopy 0.8.23" = rec {
+        crateName = "zerocopy";
+        version = "0.8.23";
+        edition = "2021";
+        sha256 = "1inbxgqhsxghawsss8x8517g30fpp8s3ll2ywy88ncm40m6l95zx";
+        authors = [
+          "Joshua Liebow-Feeser <joshlf@google.com>"
+          "Jack Wrenn <jswrenn@amazon.com>"
+        ];
+        dependencies = [
+          {
+            name = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.8.23";
+            optional = true;
+          }
+          {
+            name = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.8.23";
+            target = { target, features }: false;
+          }
+        ];
+        devDependencies = [
+          {
+            name = "zerocopy-derive";
+            packageId = "zerocopy-derive 0.8.23";
+          }
+        ];
+        features = {
+          "__internal_use_only_features_that_work_on_stable" = [ "alloc" "derive" "simd" "std" ];
+          "derive" = [ "zerocopy-derive" ];
+          "simd-nightly" = [ "simd" ];
+          "std" = [ "alloc" ];
+          "zerocopy-derive" = [ "dep:zerocopy-derive" ];
+        };
+        resolvedDefaultFeatures = [ "simd" ];
       };
-      "zerocopy-derive" = rec {
+      "zerocopy-derive 0.7.35" = rec {
         crateName = "zerocopy-derive";
         version = "0.7.35";
         edition = "2018";
@@ -11100,7 +11338,35 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
+          }
+        ];
+
+      };
+      "zerocopy-derive 0.8.23" = rec {
+        crateName = "zerocopy-derive";
+        version = "0.8.23";
+        edition = "2021";
+        sha256 = "0m7iwisxz111sgkski722nyxv0rixbs0a9iylrcvhpfx1qfw0lk3";
+        procMacro = true;
+        libName = "zerocopy_derive";
+        authors = [
+          "Joshua Liebow-Feeser <joshlf@google.com>"
+          "Jack Wrenn <jswrenn@amazon.com>"
+        ];
+        dependencies = [
+          {
+            name = "proc-macro2";
+            packageId = "proc-macro2";
+          }
+          {
+            name = "quote";
+            packageId = "quote";
+          }
+          {
+            name = "syn";
+            packageId = "syn 2.0.100";
+            features = [ "full" ];
           }
         ];
 
@@ -11148,7 +11414,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "fold" ];
           }
           {
@@ -11232,7 +11498,7 @@ rec {
           }
           {
             name = "syn";
-            packageId = "syn 2.0.99";
+            packageId = "syn 2.0.100";
             features = [ "extra-traits" ];
           }
         ];
diff --git a/Cargo.toml b/Cargo.toml
index a6f91f19..17c5eb3b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["rust/crd", "rust/operator-binary"]
+members = ["rust/operator-binary"]
 resolver = "2"
 
 [workspace.package]
@@ -23,11 +23,12 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.87.0" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.87.4" }
+stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.0" }
 strum = { version = "0.27", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
+# [patch."https://github.com/stackabletech/operator-rs"]
 # stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
diff --git a/crate-hashes.json b/crate-hashes.json
index f8d07bd1..8a3738aa 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,6 +1,9 @@
 {
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-operator-derive@0.3.1": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0",
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-operator@0.87.0": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0",
-  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.0#stackable-shared@0.0.1": "0asgwj93drwvqsgd5c563qawjc3avb42nav0i5dgs4zv8bldx6x0",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-operator-derive@0.3.1": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-operator@0.87.4": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-shared@0.0.1": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#k8s-version@0.1.2": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#stackable-versioned-macros@0.7.0": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+  "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#stackable-versioned@0.7.0": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
   "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny"
 }
\ No newline at end of file
diff --git a/rust/crd/Cargo.toml b/rust/crd/Cargo.toml
deleted file mode 100644
index 1b7ddd9d..00000000
--- a/rust/crd/Cargo.toml
+++ /dev/null
@@ -1,23 +0,0 @@
-[package]
-name = "stackable-superset-crd"
-description = "Contains the Apache Superset CRD structs and utilities"
-version.workspace = true
-authors.workspace = true
-license.workspace = true
-edition.workspace = true
-repository.workspace = true
-publish = false
-
-[dependencies]
-serde.workspace = true
-serde_json.workspace = true
-stackable-operator.workspace = true
-product-config.workspace = true
-strum.workspace = true
-snafu.workspace = true
-tracing.workspace = true
-
-[dev-dependencies]
-indoc.workspace = true
-serde_yaml.workspace = true
-tokio.workspace = true
diff --git a/rust/crd/src/druidconnection.rs b/rust/crd/src/druidconnection.rs
deleted file mode 100644
index 0b705a24..00000000
--- a/rust/crd/src/druidconnection.rs
+++ /dev/null
@@ -1,137 +0,0 @@
-use serde::{Deserialize, Serialize};
-use snafu::Snafu;
-use stackable_operator::{
-    k8s_openapi::{apimachinery::pkg::apis::meta::v1::Time, chrono::Utc},
-    kube::{CustomResource, ResourceExt},
-    schemars::{self, JsonSchema},
-};
-
-#[derive(Snafu, Debug)]
-#[allow(clippy::enum_variant_names)]
-pub enum Error {
-    #[snafu(display("{druid_connection} is missing a namespace, this should not happen!"))]
-    NoNamespace { druid_connection: String },
-}
-type Result<T, E = Error> = std::result::Result<T, E>;
-
-#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct ClusterRef {
-    /// The name of the stacklet.
-    pub name: String,
-    /// The namespace. Defaults to the namespace of the `DruidConnection` if it is not specified.
-    pub namespace: Option<String>,
-}
-
-/// The DruidConnection resource can be used to automatically deploy a Druid datasource in Superset.
-/// Learn more about it in the [Superset operator usage guide](DOCS_BASE_URL_PLACEHOLDER/superset/usage-guide/connecting-druid).
-#[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[kube(
-    group = "superset.stackable.tech",
-    version = "v1alpha1",
-    kind = "DruidConnection",
-    plural = "druidconnections",
-    status = "DruidConnectionStatus",
-    namespaced,
-    crates(
-        kube_core = "stackable_operator::kube::core",
-        k8s_openapi = "stackable_operator::k8s_openapi",
-        schemars = "stackable_operator::schemars"
-    )
-)]
-#[serde(rename_all = "camelCase")]
-pub struct DruidConnectionSpec {
-    /// The Superset to connect.
-    pub superset: ClusterRef,
-    /// The Druid to connect.
-    pub druid: ClusterRef,
-}
-
-impl DruidConnection {
-    pub fn job_name(&self) -> String {
-        format!("{}-import", self.name_unchecked())
-    }
-
-    pub fn superset_name(&self) -> String {
-        self.spec.superset.name.clone()
-    }
-
-    pub fn superset_namespace(&self) -> Result<String> {
-        if let Some(superset_ns) = &self.spec.superset.namespace {
-            Ok(superset_ns.clone())
-        } else if let Some(ns) = self.namespace() {
-            Ok(ns)
-        } else {
-            NoNamespaceSnafu {
-                druid_connection: self.name_unchecked(),
-            }
-            .fail()
-        }
-    }
-
-    pub fn druid_name(&self) -> String {
-        self.spec.druid.name.clone()
-    }
-
-    pub fn druid_namespace(&self) -> Result<String> {
-        if let Some(druid_ns) = &self.spec.druid.namespace {
-            Ok(druid_ns.clone())
-        } else if let Some(ns) = self.namespace() {
-            Ok(ns)
-        } else {
-            NoNamespaceSnafu {
-                druid_connection: self.name_unchecked(),
-            }
-            .fail()
-        }
-    }
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize, JsonSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct DruidConnectionStatus {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub started_at: Option<Time>,
-    pub condition: DruidConnectionStatusCondition,
-}
-
-impl DruidConnectionStatus {
-    pub fn new() -> Self {
-        Self {
-            started_at: Some(Time(Utc::now())),
-            condition: DruidConnectionStatusCondition::Pending,
-        }
-    }
-
-    pub fn importing(&self) -> Self {
-        let mut new = self.clone();
-        new.condition = DruidConnectionStatusCondition::Importing;
-        new
-    }
-
-    pub fn ready(&self) -> Self {
-        let mut new = self.clone();
-        new.condition = DruidConnectionStatusCondition::Ready;
-        new
-    }
-
-    pub fn failed(&self) -> Self {
-        let mut new = self.clone();
-        new.condition = DruidConnectionStatusCondition::Failed;
-        new
-    }
-}
-
-impl Default for DruidConnectionStatus {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, PartialEq, Serialize)]
-pub enum DruidConnectionStatusCondition {
-    Pending,
-    Importing,
-    Ready,
-    Failed,
-}
diff --git a/rust/operator-binary/Cargo.toml b/rust/operator-binary/Cargo.toml
index 1796804c..03923bba 100644
--- a/rust/operator-binary/Cargo.toml
+++ b/rust/operator-binary/Cargo.toml
@@ -9,8 +9,6 @@ repository.workspace = true
 publish = false
 
 [dependencies]
-stackable-superset-crd = { path = "../crd" }
-
 anyhow.workspace = true
 clap.workspace = true
 const_format.workspace = true
@@ -18,15 +16,20 @@ fnv.workspace = true
 futures.workspace = true
 indoc.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 snafu.workspace = true
 stackable-operator.workspace = true
+stackable-versioned.workspace = true
 product-config.workspace = true
 strum.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 
 [dev-dependencies]
+indoc.workspace = true
 rstest.workspace = true
+serde_yaml.workspace = true
+tokio.workspace = true
 
 [build-dependencies]
 built.workspace = true
diff --git a/rust/operator-binary/src/authorization/opa.rs b/rust/operator-binary/src/authorization/opa.rs
index c1898120..ee46c248 100644
--- a/rust/operator-binary/src/authorization/opa.rs
+++ b/rust/operator-binary/src/authorization/opa.rs
@@ -1,7 +1,8 @@
 use std::collections::BTreeMap;
 
 use stackable_operator::{client::Client, commons::opa::OpaApiVersion, time::Duration};
-use stackable_superset_crd::{SupersetCluster, SupersetOpaRoleMappingConfig};
+
+use crate::crd::v1alpha1;
 
 pub const OPA_IMPORTS: &[&str] =
     &["from opa_authorizer.opa_manager import OpaSupersetSecurityManager"];
@@ -15,8 +16,8 @@ pub struct SupersetOpaConfigResolved {
 impl SupersetOpaConfigResolved {
     pub async fn from_opa_config(
         client: &Client,
-        superset: &SupersetCluster,
-        opa_config: &SupersetOpaRoleMappingConfig,
+        superset: &v1alpha1::SupersetCluster,
+        opa_config: &v1alpha1::SupersetOpaRoleMappingConfig,
     ) -> Result<Self, stackable_operator::commons::opa::Error> {
         let opa_endpoint = opa_config
             .opa
diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
index af2914e5..3d8b6397 100644
--- a/rust/operator-binary/src/config.rs
+++ b/rust/operator-binary/src/config.rs
@@ -3,10 +3,11 @@ use std::collections::BTreeMap;
 use indoc::formatdoc;
 use snafu::{ResultExt, Snafu};
 use stackable_operator::commons::authentication::{ldap, oidc};
-use stackable_superset_crd::{
+
+use crate::crd::{
     authentication::{
-        FlaskRolesSyncMoment, SupersetAuthenticationClassResolved,
-        SupersetClientAuthenticationDetailsResolved, DEFAULT_OIDC_PROVIDER,
+        self, SupersetAuthenticationClassResolved, SupersetClientAuthenticationDetailsResolved,
+        DEFAULT_OIDC_PROVIDER,
     },
     SupersetConfigOptions,
 };
@@ -120,7 +121,8 @@ fn append_authentication_config(
     );
     config.insert(
         SupersetConfigOptions::AuthRolesSyncAtLogin.to_string(),
-        (auth_config.sync_roles_at == FlaskRolesSyncMoment::Login).to_string(),
+        (auth_config.sync_roles_at == authentication::v1alpha1::FlaskRolesSyncMoment::Login)
+            .to_string(),
     );
 
     Ok(())
diff --git a/rust/operator-binary/src/controller_commons.rs b/rust/operator-binary/src/controller_commons.rs
index 02438675..7d16c41b 100644
--- a/rust/operator-binary/src/controller_commons.rs
+++ b/rust/operator-binary/src/controller_commons.rs
@@ -9,7 +9,8 @@ use stackable_operator::{
         },
     },
 };
-use stackable_superset_crd::MAX_LOG_FILES_SIZE;
+
+use crate::crd::MAX_LOG_FILES_SIZE;
 
 pub const CONFIG_VOLUME_NAME: &str = "config";
 pub const LOG_CONFIG_VOLUME_NAME: &str = "log-config";
diff --git a/rust/crd/src/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
similarity index 94%
rename from rust/crd/src/affinity.rs
rename to rust/operator-binary/src/crd/affinity.rs
index 560539c4..8b9c89af 100644
--- a/rust/crd/src/affinity.rs
+++ b/rust/operator-binary/src/crd/affinity.rs
@@ -3,7 +3,7 @@ use stackable_operator::{
     k8s_openapi::api::core::v1::PodAntiAffinity,
 };
 
-use crate::{SupersetRole, APP_NAME};
+use crate::crd::{SupersetRole, APP_NAME};
 
 pub fn get_affinity(cluster_name: &str, role: &SupersetRole) -> StackableAffinityFragment {
     StackableAffinityFragment {
@@ -32,7 +32,7 @@ mod tests {
     };
 
     use super::*;
-    use crate::SupersetCluster;
+    use crate::crd::v1alpha1;
 
     #[test]
     fn test_affinity_defaults() {
@@ -51,7 +51,8 @@ mod tests {
               default:
                 replicas: 1
         "#;
-        let superset: SupersetCluster = serde_yaml::from_str(input).expect("illegal test input");
+        let superset: v1alpha1::SupersetCluster =
+            serde_yaml::from_str(input).expect("illegal test input");
         let merged_config = superset
             .merged_config(&SupersetRole::Node, &superset.node_rolegroup_ref("default"))
             .unwrap();
diff --git a/rust/crd/src/authentication.rs b/rust/operator-binary/src/crd/authentication.rs
similarity index 94%
rename from rust/crd/src/authentication.rs
rename to rust/operator-binary/src/crd/authentication.rs
index 0cccd496..577b6a36 100644
--- a/rust/crd/src/authentication.rs
+++ b/rust/operator-binary/src/crd/authentication.rs
@@ -11,6 +11,7 @@ use stackable_operator::{
     },
     schemars::{self, JsonSchema},
 };
+use stackable_versioned::versioned;
 use tracing::info;
 
 // The assumed OIDC provider if no hint is given in the AuthClass
@@ -88,41 +89,36 @@ pub enum Error {
 
 type Result<T, E = Error> = std::result::Result<T, E>;
 
-#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetClientAuthenticationDetails {
-    #[serde(flatten)]
-    pub common: ClientAuthenticationDetails<()>,
-
-    /// Allow users who are not already in the FAB DB.
-    /// Gets mapped to `AUTH_USER_REGISTRATION`
-    #[serde(default = "default_user_registration")]
-    pub user_registration: bool,
-
-    /// This role will be given in addition to any AUTH_ROLES_MAPPING.
-    /// Gets mapped to `AUTH_USER_REGISTRATION_ROLE`
-    #[serde(default = "default_user_registration_role")]
-    pub user_registration_role: String,
-
-    /// If we should replace ALL the user's roles each login, or only on registration.
-    /// Gets mapped to `AUTH_ROLES_SYNC_AT_LOGIN`
-    #[serde(default)]
-    pub sync_roles_at: FlaskRolesSyncMoment,
-}
-
-pub fn default_user_registration() -> bool {
-    true
-}
-
-pub fn default_user_registration_role() -> String {
-    "Public".to_string()
-}
+#[versioned(version(name = "v1alpha1"))]
+pub mod versioned {
+    #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetClientAuthenticationDetails {
+        #[serde(flatten)]
+        pub common: ClientAuthenticationDetails<()>,
+
+        /// Allow users who are not already in the FAB DB.
+        /// Gets mapped to `AUTH_USER_REGISTRATION`
+        #[serde(default = "default_user_registration")]
+        pub user_registration: bool,
+
+        /// This role will be given in addition to any AUTH_ROLES_MAPPING.
+        /// Gets mapped to `AUTH_USER_REGISTRATION_ROLE`
+        #[serde(default = "default_user_registration_role")]
+        pub user_registration_role: String,
+
+        /// If we should replace ALL the user's roles each login, or only on registration.
+        /// Gets mapped to `AUTH_ROLES_SYNC_AT_LOGIN`
+        #[serde(default)]
+        pub sync_roles_at: v1alpha1::FlaskRolesSyncMoment,
+    }
 
-#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-pub enum FlaskRolesSyncMoment {
-    #[default]
-    Registration,
-    Login,
+    #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    pub enum FlaskRolesSyncMoment {
+        #[default]
+        Registration,
+        Login,
+    }
 }
 
 /// Resolved and validated counter part for `SupersetClientAuthenticationDetails`.
@@ -131,7 +127,7 @@ pub struct SupersetClientAuthenticationDetailsResolved {
     pub authentication_classes_resolved: Vec<SupersetAuthenticationClassResolved>,
     pub user_registration: bool,
     pub user_registration_role: String,
-    pub sync_roles_at: FlaskRolesSyncMoment,
+    pub sync_roles_at: v1alpha1::FlaskRolesSyncMoment,
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -145,9 +141,17 @@ pub enum SupersetAuthenticationClassResolved {
     },
 }
 
+pub fn default_user_registration() -> bool {
+    true
+}
+
+pub fn default_user_registration_role() -> String {
+    "Public".to_string()
+}
+
 impl SupersetClientAuthenticationDetailsResolved {
     pub async fn from(
-        auth_details: &[SupersetClientAuthenticationDetails],
+        auth_details: &[v1alpha1::SupersetClientAuthenticationDetails],
         client: &Client,
     ) -> Result<SupersetClientAuthenticationDetailsResolved> {
         let resolve_auth_class = |auth_details: ClientAuthenticationDetails| async move {
@@ -157,7 +161,7 @@ impl SupersetClientAuthenticationDetailsResolved {
     }
 
     pub async fn resolve<R>(
-        auth_details: &[SupersetClientAuthenticationDetails],
+        auth_details: &[v1alpha1::SupersetClientAuthenticationDetails],
         resolve_auth_class: impl Fn(ClientAuthenticationDetails) -> R,
     ) -> Result<SupersetClientAuthenticationDetailsResolved>
     where
@@ -264,14 +268,14 @@ impl SupersetClientAuthenticationDetailsResolved {
             user_registration: user_registration.unwrap_or_else(default_user_registration),
             user_registration_role: user_registration_role
                 .unwrap_or_else(default_user_registration_role),
-            sync_roles_at: sync_roles_at.unwrap_or_else(FlaskRolesSyncMoment::default),
+            sync_roles_at: sync_roles_at.unwrap_or_else(v1alpha1::FlaskRolesSyncMoment::default),
         })
     }
 
     fn from_oidc(
         auth_class_name: &str,
         provider: &oidc::AuthenticationProvider,
-        auth_details: &SupersetClientAuthenticationDetails,
+        auth_details: &v1alpha1::SupersetClientAuthenticationDetails,
     ) -> Result<SupersetAuthenticationClassResolved> {
         let oidc_provider = match &provider.provider_hint {
             None => {
@@ -346,7 +350,7 @@ mod tests {
                 authentication_classes_resolved: Vec::default(),
                 user_registration: default_user_registration(),
                 user_registration_role: default_user_registration_role(),
-                sync_roles_at: FlaskRolesSyncMoment::default()
+                sync_roles_at: v1alpha1::FlaskRolesSyncMoment::default()
             },
             auth_details_resolved
         );
@@ -383,7 +387,7 @@ mod tests {
                 }],
                 user_registration: false,
                 user_registration_role: "Gamma".into(),
-                sync_roles_at: FlaskRolesSyncMoment::Login
+                sync_roles_at: v1alpha1::FlaskRolesSyncMoment::Login
             },
             auth_details_resolved
         );
@@ -495,7 +499,7 @@ mod tests {
                 ],
                 user_registration: false,
                 user_registration_role: "Gamma".into(),
-                sync_roles_at: FlaskRolesSyncMoment::Login
+                sync_roles_at: v1alpha1::FlaskRolesSyncMoment::Login
             },
             auth_details_resolved
         );
@@ -901,7 +905,7 @@ mod tests {
     /// Fail if the given string cannot be deserialized.
     fn deserialize_superset_client_authentication_details(
         input: &str,
-    ) -> Vec<SupersetClientAuthenticationDetails> {
+    ) -> Vec<v1alpha1::SupersetClientAuthenticationDetails> {
         serde_yaml::from_str(input)
             .expect("The definition of the authentication configuration should be valid.")
     }
diff --git a/rust/operator-binary/src/crd/druidconnection.rs b/rust/operator-binary/src/crd/druidconnection.rs
new file mode 100644
index 00000000..bce8964c
--- /dev/null
+++ b/rust/operator-binary/src/crd/druidconnection.rs
@@ -0,0 +1,138 @@
+use serde::{Deserialize, Serialize};
+use snafu::Snafu;
+use stackable_operator::{
+    k8s_openapi::{apimachinery::pkg::apis::meta::v1::Time, chrono::Utc},
+    kube::{CustomResource, ResourceExt},
+    schemars::{self, JsonSchema},
+};
+use stackable_versioned::versioned;
+
+#[derive(Snafu, Debug)]
+pub enum Error {
+    #[snafu(display("{druid_connection} is missing a namespace, this should not happen!"))]
+    NoNamespace { druid_connection: String },
+}
+type Result<T, E = Error> = std::result::Result<T, E>;
+
+#[versioned(version(name = "v1alpha1"))]
+pub mod versioned {
+    /// The DruidConnection resource can be used to automatically deploy a Druid datasource in Superset.
+    /// Learn more about it in the [Superset operator usage guide](DOCS_BASE_URL_PLACEHOLDER/superset/usage-guide/connecting-druid).
+    #[versioned(k8s(
+        group = "superset.stackable.tech",
+        plural = "druidconnections",
+        status = "v1alpha1::DruidConnectionStatus",
+        namespaced,
+        crates(
+            kube_core = "stackable_operator::kube::core",
+            k8s_openapi = "stackable_operator::k8s_openapi",
+            schemars = "stackable_operator::schemars"
+        )
+    ))]
+    #[derive(Clone, CustomResource, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct DruidConnectionSpec {
+        /// The Superset to connect.
+        pub superset: v1alpha1::ClusterRef,
+        /// The Druid to connect.
+        pub druid: v1alpha1::ClusterRef,
+    }
+
+    #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct ClusterRef {
+        /// The name of the stacklet.
+        pub name: String,
+        /// The namespace. Defaults to the namespace of the `DruidConnection` if it is not specified.
+        pub namespace: Option<String>,
+    }
+
+    #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize, JsonSchema)]
+    #[serde(rename_all = "camelCase")]
+    pub struct DruidConnectionStatus {
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub started_at: Option<Time>,
+        pub condition: v1alpha1::DruidConnectionStatusCondition,
+    }
+
+    #[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, JsonSchema, PartialEq, Serialize)]
+    pub enum DruidConnectionStatusCondition {
+        Pending,
+        Importing,
+        Ready,
+        Failed,
+    }
+}
+
+impl v1alpha1::DruidConnection {
+    pub fn job_name(&self) -> String {
+        format!("{}-import", self.name_unchecked())
+    }
+
+    pub fn superset_name(&self) -> String {
+        self.spec.superset.name.clone()
+    }
+
+    pub fn superset_namespace(&self) -> Result<String> {
+        if let Some(superset_ns) = &self.spec.superset.namespace {
+            Ok(superset_ns.clone())
+        } else if let Some(ns) = self.namespace() {
+            Ok(ns)
+        } else {
+            NoNamespaceSnafu {
+                druid_connection: self.name_unchecked(),
+            }
+            .fail()
+        }
+    }
+
+    pub fn druid_name(&self) -> String {
+        self.spec.druid.name.clone()
+    }
+
+    pub fn druid_namespace(&self) -> Result<String> {
+        if let Some(druid_ns) = &self.spec.druid.namespace {
+            Ok(druid_ns.clone())
+        } else if let Some(ns) = self.namespace() {
+            Ok(ns)
+        } else {
+            NoNamespaceSnafu {
+                druid_connection: self.name_unchecked(),
+            }
+            .fail()
+        }
+    }
+}
+
+impl v1alpha1::DruidConnectionStatus {
+    pub fn new() -> Self {
+        Self {
+            started_at: Some(Time(Utc::now())),
+            condition: v1alpha1::DruidConnectionStatusCondition::Pending,
+        }
+    }
+
+    pub fn importing(&self) -> Self {
+        let mut new = self.clone();
+        new.condition = v1alpha1::DruidConnectionStatusCondition::Importing;
+        new
+    }
+
+    pub fn ready(&self) -> Self {
+        let mut new = self.clone();
+        new.condition = v1alpha1::DruidConnectionStatusCondition::Ready;
+        new
+    }
+
+    pub fn failed(&self) -> Self {
+        let mut new = self.clone();
+        new.condition = v1alpha1::DruidConnectionStatusCondition::Failed;
+        new
+    }
+}
+
+impl Default for v1alpha1::DruidConnectionStatus {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/rust/crd/src/lib.rs b/rust/operator-binary/src/crd/mod.rs
similarity index 56%
rename from rust/crd/src/lib.rs
rename to rust/operator-binary/src/crd/mod.rs
index a33ea587..610378e1 100644
--- a/rust/crd/src/lib.rs
+++ b/rust/operator-binary/src/crd/mod.rs
@@ -1,6 +1,5 @@
 use std::collections::BTreeMap;
 
-use authentication::SupersetClientAuthenticationDetails;
 use product_config::flask_app_config_writer::{FlaskAppConfigOptions, PythonType};
 use serde::{Deserialize, Serialize};
 use snafu::{OptionExt, ResultExt, Snafu};
@@ -31,10 +30,9 @@ use stackable_operator::{
     status::condition::{ClusterCondition, HasStatusCondition},
     time::Duration,
 };
+use stackable_versioned::versioned;
 use strum::{Display, EnumIter, EnumString, IntoEnumIterator};
 
-use crate::affinity::get_affinity;
-
 pub mod affinity;
 pub mod authentication;
 pub mod druidconnection;
@@ -99,11 +97,263 @@ pub enum SupersetConfigOptions {
     AuthOpaCacheTtlInSec,
 }
 
+#[versioned(version(name = "v1alpha1"))]
+pub mod versioned {
+    /// A Superset cluster stacklet. This resource is managed by the Stackable operator for Apache Superset.
+    /// Find more information on how to use it and the resources that the operator generates in the
+    /// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/superset/).
+    #[versioned(k8s(
+        group = "superset.stackable.tech",
+        plural = "supersetclusters",
+        shortname = "superset",
+        status = "v1alpha1::SupersetClusterStatus",
+        namespaced,
+        crates(
+            kube_core = "stackable_operator::kube::core",
+            k8s_openapi = "stackable_operator::k8s_openapi",
+            schemars = "stackable_operator::schemars"
+        )
+    ))]
+    #[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetClusterSpec {
+        // no doc - docs in the struct.
+        pub image: ProductImage,
+
+        /// Settings that affect all roles and role groups.
+        /// The settings in the `clusterConfig` are cluster wide settings that do not need to be configurable at role or role group level.
+        pub cluster_config: v1alpha1::SupersetClusterConfig,
+
+        // no doc - docs in the struct.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        pub nodes: Option<Role<v1alpha1::SupersetConfigFragment>>,
+    }
+
+    #[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetClusterConfig {
+        /// List of AuthenticationClasses used to authenticate users.
+        #[serde(default)]
+        pub authentication: Vec<authentication::v1alpha1::SupersetClientAuthenticationDetails>,
+
+        /// Authorization options for Superset.
+        ///
+        /// Currently only role assignment is supported. This means that roles are assigned to users in
+        /// OPA but, due to the way Superset is implemented, the database also needs to be updated
+        /// to reflect these assignments.
+        /// Therefore, user roles and permissions must already exist in the Superset database before
+        /// they can be assigned to a user.
+        /// Warning: Any user roles assigned with the Superset UI are discarded.
+        #[serde(skip_serializing_if = "Option::is_none")]
+        pub authorization: Option<v1alpha1::SupersetAuthorization>,
+
+        /// The name of the Secret object containing the admin user credentials and database connection details.
+        /// Read the
+        /// [getting started guide first steps](DOCS_BASE_URL_PLACEHOLDER/superset/getting_started/first_steps)
+        /// to find out more.
+        pub credentials_secret: String,
+
+        /// Cluster operations like pause reconciliation or cluster stop.
+        #[serde(default)]
+        pub cluster_operation: ClusterOperation,
+
+        /// This field controls which type of Service the Operator creates for this SupersetCluster:
+        ///
+        /// * cluster-internal: Use a ClusterIP service
+        ///
+        /// * external-unstable: Use a NodePort service
+        ///
+        /// * external-stable: Use a LoadBalancer service
+        ///
+        /// This is a temporary solution with the goal to keep yaml manifests forward compatible.
+        /// In the future, this setting will control which [ListenerClass](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass.html)
+        /// will be used to expose the service, and ListenerClass names will stay the same, allowing for a non-breaking change.
+        #[serde(default)]
+        pub listener_class: v1alpha1::CurrentlySupportedListenerClasses,
+
+        /// The name of a Secret object.
+        /// The Secret should contain a key `connections.mapboxApiKey`.
+        /// This is the API key required for map charts to work that use mapbox.
+        /// The token should be in the JWT format.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        pub mapbox_secret: Option<String>,
+
+        /// Name of the Vector aggregator [discovery ConfigMap](DOCS_BASE_URL_PLACEHOLDER/concepts/service_discovery).
+        /// It must contain the key `ADDRESS` with the address of the Vector aggregator.
+        /// Follow the [logging tutorial](DOCS_BASE_URL_PLACEHOLDER/tutorials/logging-vector-aggregator)
+        /// to learn how to configure log aggregation with Vector.
+        #[serde(default, skip_serializing_if = "Option::is_none")]
+        pub vector_aggregator_config_map_name: Option<String>,
+    }
+
+    #[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)]
+    #[fragment_attrs(
+        derive(
+            Clone,
+            Debug,
+            Default,
+            Deserialize,
+            Merge,
+            JsonSchema,
+            PartialEq,
+            Serialize
+        ),
+        serde(rename_all = "camelCase")
+    )]
+    pub struct SupersetConfig {
+        /// Row limit when requesting chart data. Corresponds to ROW_LIMIT.
+        pub row_limit: Option<i32>,
+
+        /// Maximum time period a Superset request can take before timing out. This
+        /// setting affects the maximum duration a query to an underlying datasource
+        /// can take. If you get timeout errors before your query returns the result
+        /// you may need to increase this timeout. Corresponds to
+        /// SUPERSET_WEBSERVER_TIMEOUT.
+        pub webserver_timeout: Option<u32>,
+
+        /// CPU and memory limits for Superset pods
+        #[fragment_attrs(serde(default))]
+        pub resources: Resources<v1alpha1::SupersetStorageConfig, NoRuntimeLimits>,
+
+        #[fragment_attrs(serde(default))]
+        pub logging: Logging<v1alpha1::Container>,
+
+        #[fragment_attrs(serde(default))]
+        pub affinity: StackableAffinity,
+
+        /// Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
+        #[fragment_attrs(serde(default))]
+        pub graceful_shutdown_timeout: Option<Duration>,
+    }
+
+    // TODO: Temporary solution until listener-operator is finished
+    #[derive(Clone, Debug, Default, Display, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "PascalCase")]
+    pub enum CurrentlySupportedListenerClasses {
+        #[default]
+        #[serde(rename = "cluster-internal")]
+        ClusterInternal,
+
+        #[serde(rename = "external-unstable")]
+        ExternalUnstable,
+
+        #[serde(rename = "external-stable")]
+        ExternalStable,
+    }
+
+    #[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetAuthorization {
+        pub role_mapping_from_opa: v1alpha1::SupersetOpaRoleMappingConfig,
+    }
+
+    #[derive(Clone, Deserialize, Serialize, Eq, JsonSchema, Debug, PartialEq)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetOpaRoleMappingConfig {
+        #[serde(flatten)]
+        pub opa: OpaConfig,
+
+        /// Configuration for an Superset internal cache for calls to OPA
+        #[serde(default)]
+        pub cache: UserInformationCache,
+    }
+
+    #[allow(clippy::derive_partial_eq_without_eq)]
+    #[derive(Clone, Debug, Default, JsonSchema, PartialEq, Fragment)]
+    #[fragment_attrs(
+        allow(clippy::derive_partial_eq_without_eq),
+        derive(
+            Clone,
+            Debug,
+            Default,
+            Deserialize,
+            Merge,
+            JsonSchema,
+            PartialEq,
+            Serialize
+        ),
+        serde(rename_all = "camelCase")
+    )]
+    pub struct SupersetStorageConfig {}
+
+    #[derive(
+        Clone,
+        Debug,
+        Deserialize,
+        Display,
+        Eq,
+        EnumIter,
+        JsonSchema,
+        Ord,
+        PartialEq,
+        PartialOrd,
+        Serialize,
+    )]
+    #[serde(rename_all = "kebab-case")]
+    #[strum(serialize_all = "kebab-case")]
+    pub enum Container {
+        Superset,
+        Vector,
+    }
+
+    #[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct SupersetClusterStatus {
+        #[serde(default)]
+        pub conditions: Vec<ClusterCondition>,
+    }
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SupersetCredentials {
+    pub admin_user: AdminUserCredentials,
+    pub connections: Connections,
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AdminUserCredentials {
+    pub username: String,
+    pub firstname: String,
+    pub lastname: String,
+    pub email: String,
+    pub password: String,
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Connections {
+    pub secret_key: String,
+    pub sqlalchemy_database_uri: String,
+}
+
+#[derive(
+    Clone, Debug, Deserialize, Display, EnumIter, Eq, Hash, JsonSchema, PartialEq, Serialize,
+)]
+pub enum SupersetRole {
+    #[strum(serialize = "node")]
+    Node,
+}
+
+/// A reference to a [`v1alpha1::SupersetCluster`]
+#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SupersetClusterRef {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub name: Option<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub namespace: Option<String>,
+}
+
 impl SupersetConfigOptions {
     /// Mapping from `SupersetConfigOptions` to the values set in `SupersetConfigFragment`.
     /// `None` is returned if either the according option is not set or is not exposed in the
     /// `SupersetConfig`.
-    fn config_type_to_string(&self, superset_config: &SupersetConfigFragment) -> Option<String> {
+    fn config_type_to_string(
+        &self,
+        superset_config: &v1alpha1::SupersetConfigFragment,
+    ) -> Option<String> {
         match self {
             SupersetConfigOptions::RowLimit => superset_config.row_limit.map(|v| v.to_string()),
             SupersetConfigOptions::SupersetWebserverTimeout => {
@@ -156,252 +406,24 @@ impl FlaskAppConfigOptions for SupersetConfigOptions {
     }
 }
 
-/// A Superset cluster stacklet. This resource is managed by the Stackable operator for Apache Superset.
-/// Find more information on how to use it and the resources that the operator generates in the
-/// [operator documentation](DOCS_BASE_URL_PLACEHOLDER/superset/).
-#[derive(Clone, CustomResource, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
-#[kube(
-    group = "superset.stackable.tech",
-    version = "v1alpha1",
-    kind = "SupersetCluster",
-    plural = "supersetclusters",
-    shortname = "superset",
-    status = "SupersetClusterStatus",
-    namespaced,
-    crates(
-        kube_core = "stackable_operator::kube::core",
-        k8s_openapi = "stackable_operator::k8s_openapi",
-        schemars = "stackable_operator::schemars"
-    )
-)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetClusterSpec {
-    // no doc - docs in the struct.
-    pub image: ProductImage,
-
-    /// Settings that affect all roles and role groups.
-    /// The settings in the `clusterConfig` are cluster wide settings that do not need to be configurable at role or role group level.
-    pub cluster_config: SupersetClusterConfig,
-
-    // no doc - docs in the struct.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub nodes: Option<Role<SupersetConfigFragment>>,
-}
-
-#[derive(Clone, Debug, Deserialize, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetClusterConfig {
-    /// List of AuthenticationClasses used to authenticate users.
-    #[serde(default)]
-    pub authentication: Vec<SupersetClientAuthenticationDetails>,
-
-    /// Authorization options for Superset.
-    ///
-    /// Currently only role assignment is supported. This means that roles are assigned to users in
-    /// OPA but, due to the way Superset is implemented, the database also needs to be updated
-    /// to reflect these assignments.
-    /// Therefore, user roles and permissions must already exist in the Superset database before
-    /// they can be assigned to a user.
-    /// Warning: Any user roles assigned with the Superset UI are discarded.
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub authorization: Option<SupersetAuthorization>,
-
-    /// The name of the Secret object containing the admin user credentials and database connection details.
-    /// Read the
-    /// [getting started guide first steps](DOCS_BASE_URL_PLACEHOLDER/superset/getting_started/first_steps)
-    /// to find out more.
-    pub credentials_secret: String,
-
-    /// Cluster operations like pause reconciliation or cluster stop.
-    #[serde(default)]
-    pub cluster_operation: ClusterOperation,
-
-    /// This field controls which type of Service the Operator creates for this SupersetCluster:
-    ///
-    /// * cluster-internal: Use a ClusterIP service
-    ///
-    /// * external-unstable: Use a NodePort service
-    ///
-    /// * external-stable: Use a LoadBalancer service
-    ///
-    /// This is a temporary solution with the goal to keep yaml manifests forward compatible.
-    /// In the future, this setting will control which [ListenerClass](DOCS_BASE_URL_PLACEHOLDER/listener-operator/listenerclass.html)
-    /// will be used to expose the service, and ListenerClass names will stay the same, allowing for a non-breaking change.
-    #[serde(default)]
-    pub listener_class: CurrentlySupportedListenerClasses,
-
-    /// The name of a Secret object.
-    /// The Secret should contain a key `connections.mapboxApiKey`.
-    /// This is the API key required for map charts to work that use mapbox.
-    /// The token should be in the JWT format.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub mapbox_secret: Option<String>,
-
-    /// Name of the Vector aggregator [discovery ConfigMap](DOCS_BASE_URL_PLACEHOLDER/concepts/service_discovery).
-    /// It must contain the key `ADDRESS` with the address of the Vector aggregator.
-    /// Follow the [logging tutorial](DOCS_BASE_URL_PLACEHOLDER/tutorials/logging-vector-aggregator)
-    /// to learn how to configure log aggregation with Vector.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub vector_aggregator_config_map_name: Option<String>,
-}
-
-// TODO: Temporary solution until listener-operator is finished
-#[derive(Clone, Debug, Default, Display, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "PascalCase")]
-pub enum CurrentlySupportedListenerClasses {
-    #[default]
-    #[serde(rename = "cluster-internal")]
-    ClusterInternal,
-
-    #[serde(rename = "external-unstable")]
-    ExternalUnstable,
-
-    #[serde(rename = "external-stable")]
-    ExternalStable,
-}
-
-impl CurrentlySupportedListenerClasses {
+impl v1alpha1::CurrentlySupportedListenerClasses {
     pub fn k8s_service_type(&self) -> String {
         match self {
-            CurrentlySupportedListenerClasses::ClusterInternal => "ClusterIP".to_string(),
-            CurrentlySupportedListenerClasses::ExternalUnstable => "NodePort".to_string(),
-            CurrentlySupportedListenerClasses::ExternalStable => "LoadBalancer".to_string(),
+            v1alpha1::CurrentlySupportedListenerClasses::ClusterInternal => "ClusterIP".to_string(),
+            v1alpha1::CurrentlySupportedListenerClasses::ExternalUnstable => "NodePort".to_string(),
+            v1alpha1::CurrentlySupportedListenerClasses::ExternalStable => {
+                "LoadBalancer".to_string()
+            }
         }
     }
 }
-#[derive(Clone, Deserialize, Serialize, Eq, JsonSchema, Debug, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetOpaRoleMappingConfig {
-    #[serde(flatten)]
-    pub opa: OpaConfig,
-
-    /// Configuration for an Superset internal cache for calls to OPA
-    #[serde(default)]
-    pub cache: UserInformationCache,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetAuthorization {
-    pub role_mapping_from_opa: SupersetOpaRoleMappingConfig,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetCredentials {
-    pub admin_user: AdminUserCredentials,
-    pub connections: Connections,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AdminUserCredentials {
-    pub username: String,
-    pub firstname: String,
-    pub lastname: String,
-    pub email: String,
-    pub password: String,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct Connections {
-    pub secret_key: String,
-    pub sqlalchemy_database_uri: String,
-}
-
-#[derive(
-    Clone, Debug, Deserialize, Display, EnumIter, Eq, Hash, JsonSchema, PartialEq, Serialize,
-)]
-pub enum SupersetRole {
-    #[strum(serialize = "node")]
-    Node,
-}
-
-#[allow(clippy::derive_partial_eq_without_eq)]
-#[derive(Clone, Debug, Default, JsonSchema, PartialEq, Fragment)]
-#[fragment_attrs(
-    allow(clippy::derive_partial_eq_without_eq),
-    derive(
-        Clone,
-        Debug,
-        Default,
-        Deserialize,
-        Merge,
-        JsonSchema,
-        PartialEq,
-        Serialize
-    ),
-    serde(rename_all = "camelCase")
-)]
-pub struct SupersetStorageConfig {}
-
-#[derive(
-    Clone,
-    Debug,
-    Deserialize,
-    Display,
-    Eq,
-    EnumIter,
-    JsonSchema,
-    Ord,
-    PartialEq,
-    PartialOrd,
-    Serialize,
-)]
-#[serde(rename_all = "kebab-case")]
-#[strum(serialize_all = "kebab-case")]
-pub enum Container {
-    Superset,
-    Vector,
-}
 
-#[derive(Clone, Debug, Default, Fragment, JsonSchema, PartialEq)]
-#[fragment_attrs(
-    derive(
-        Clone,
-        Debug,
-        Default,
-        Deserialize,
-        Merge,
-        JsonSchema,
-        PartialEq,
-        Serialize
-    ),
-    serde(rename_all = "camelCase")
-)]
-pub struct SupersetConfig {
-    /// Row limit when requesting chart data. Corresponds to ROW_LIMIT.
-    pub row_limit: Option<i32>,
-
-    /// Maximum time period a Superset request can take before timing out. This
-    /// setting affects the maximum duration a query to an underlying datasource
-    /// can take. If you get timeout errors before your query returns the result
-    /// you may need to increase this timeout. Corresponds to
-    /// SUPERSET_WEBSERVER_TIMEOUT.
-    pub webserver_timeout: Option<u32>,
-
-    /// CPU and memory limits for Superset pods
-    #[fragment_attrs(serde(default))]
-    pub resources: Resources<SupersetStorageConfig, NoRuntimeLimits>,
-
-    #[fragment_attrs(serde(default))]
-    pub logging: Logging<Container>,
-
-    #[fragment_attrs(serde(default))]
-    pub affinity: StackableAffinity,
-
-    /// Time period Pods have to gracefully shut down, e.g. `30m`, `1h` or `2d`. Consult the operator documentation for details.
-    #[fragment_attrs(serde(default))]
-    pub graceful_shutdown_timeout: Option<Duration>,
-}
-
-impl SupersetConfig {
+impl v1alpha1::SupersetConfig {
     pub const CREDENTIALS_SECRET_PROPERTY: &'static str = "credentialsSecret";
     pub const MAPBOX_SECRET_PROPERTY: &'static str = "mapboxSecret";
 
-    fn default_config(cluster_name: &str, role: &SupersetRole) -> SupersetConfigFragment {
-        SupersetConfigFragment {
+    fn default_config(cluster_name: &str, role: &SupersetRole) -> v1alpha1::SupersetConfigFragment {
+        v1alpha1::SupersetConfigFragment {
             resources: ResourcesFragment {
                 cpu: CpuLimitsFragment {
                     min: Some(Quantity("300m".to_owned())),
@@ -411,10 +433,10 @@ impl SupersetConfig {
                     limit: Some(Quantity("2Gi".to_owned())),
                     runtime_limits: NoRuntimeLimitsFragment {},
                 },
-                storage: SupersetStorageConfigFragment {},
+                storage: v1alpha1::SupersetStorageConfigFragment {},
             },
             logging: product_logging::spec::default_logging(),
-            affinity: get_affinity(cluster_name, role),
+            affinity: affinity::get_affinity(cluster_name, role),
             graceful_shutdown_timeout: Some(DEFAULT_NODE_GRACEFUL_SHUTDOWN_TIMEOUT),
             row_limit: None,
             webserver_timeout: None,
@@ -422,8 +444,8 @@ impl SupersetConfig {
     }
 }
 
-impl Configuration for SupersetConfigFragment {
-    type Configurable = SupersetCluster;
+impl Configuration for v1alpha1::SupersetConfigFragment {
+    type Configurable = v1alpha1::SupersetCluster;
 
     fn compute_env(
         &self,
@@ -432,12 +454,12 @@ impl Configuration for SupersetConfigFragment {
     ) -> Result<BTreeMap<String, Option<String>>, product_config_utils::Error> {
         let mut result = BTreeMap::new();
         result.insert(
-            SupersetConfig::CREDENTIALS_SECRET_PROPERTY.to_string(),
+            v1alpha1::SupersetConfig::CREDENTIALS_SECRET_PROPERTY.to_string(),
             Some(cluster.spec.cluster_config.credentials_secret.clone()),
         );
         if let Some(msec) = &cluster.spec.cluster_config.mapbox_secret {
             result.insert(
-                SupersetConfig::MAPBOX_SECRET_PROPERTY.to_string(),
+                v1alpha1::SupersetConfig::MAPBOX_SECRET_PROPERTY.to_string(),
                 Some(msec.clone()),
             );
         }
@@ -473,14 +495,7 @@ impl Configuration for SupersetConfigFragment {
     }
 }
 
-#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetClusterStatus {
-    #[serde(default)]
-    pub conditions: Vec<ClusterCondition>,
-}
-
-impl HasStatusCondition for SupersetCluster {
+impl HasStatusCondition for v1alpha1::SupersetCluster {
     fn conditions(&self) -> Vec<ClusterCondition> {
         match &self.status {
             Some(status) => status.conditions.clone(),
@@ -489,8 +504,8 @@ impl HasStatusCondition for SupersetCluster {
     }
 }
 
-impl SupersetCluster {
-    pub fn get_role(&self, role: &SupersetRole) -> Option<&Role<SupersetConfigFragment>> {
+impl v1alpha1::SupersetCluster {
+    pub fn get_role(&self, role: &SupersetRole) -> Option<&Role<v1alpha1::SupersetConfigFragment>> {
         match role {
             SupersetRole::Node => self.spec.nodes.as_ref(),
         }
@@ -505,7 +520,7 @@ impl SupersetCluster {
     pub fn node_rolegroup_ref(
         &self,
         group_name: impl Into<String>,
-    ) -> RoleGroupRef<SupersetCluster> {
+    ) -> RoleGroupRef<v1alpha1::SupersetCluster> {
         RoleGroupRef {
             cluster: ObjectRef::from_obj(self),
             role: SupersetRole::Node.to_string(),
@@ -519,7 +534,7 @@ impl SupersetCluster {
         }
     }
 
-    pub fn get_opa_config(&self) -> Option<&SupersetOpaRoleMappingConfig> {
+    pub fn get_opa_config(&self) -> Option<&v1alpha1::SupersetOpaRoleMappingConfig> {
         self.spec
             .cluster_config
             .authorization
@@ -531,10 +546,10 @@ impl SupersetCluster {
     pub fn merged_config(
         &self,
         role: &SupersetRole,
-        rolegroup_ref: &RoleGroupRef<SupersetCluster>,
-    ) -> Result<SupersetConfig, Error> {
+        rolegroup_ref: &RoleGroupRef<v1alpha1::SupersetCluster>,
+    ) -> Result<v1alpha1::SupersetConfig, Error> {
         // Initialize the result with all default values as baseline
-        let conf_defaults = SupersetConfig::default_config(&self.name_any(), role);
+        let conf_defaults = v1alpha1::SupersetConfig::default_config(&self.name_any(), role);
 
         let role = match role {
             SupersetRole::Node => self.spec.nodes.as_ref().context(UnknownSupersetRoleSnafu {
@@ -565,13 +580,3 @@ impl SupersetCluster {
         fragment::validate(conf_rolegroup).context(FragmentValidationFailureSnafu)
     }
 }
-
-/// A reference to a [`SupersetCluster`]
-#[derive(Clone, Debug, Default, Deserialize, Eq, JsonSchema, PartialEq, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct SupersetClusterRef {
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub name: Option<String>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub namespace: Option<String>,
-}
diff --git a/rust/operator-binary/src/druid_connection_controller.rs b/rust/operator-binary/src/druid_connection_controller.rs
index 563839ce..af816e5b 100644
--- a/rust/operator-binary/src/druid_connection_controller.rs
+++ b/rust/operator-binary/src/druid_connection_controller.rs
@@ -22,13 +22,10 @@ use stackable_operator::{
     status::condition::{ClusterConditionStatus, ClusterConditionType},
     time::Duration,
 };
-use stackable_superset_crd::{
-    druidconnection::{DruidConnection, DruidConnectionStatus, DruidConnectionStatusCondition},
-    SupersetCluster, PYTHONPATH, SUPERSET_CONFIG_FILENAME,
-};
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
+    crd::{druidconnection, v1alpha1, PYTHONPATH, SUPERSET_CONFIG_FILENAME},
     rbac,
     superset_controller::DOCKER_IMAGE_BASE_NAME,
     util::{get_job_state, JobState},
@@ -77,8 +74,8 @@ pub enum Error {
     },
     #[snafu(display("namespace missing on DruidConnection {druid_connection}"))]
     DruidConnectionNoNamespace {
-        source: stackable_superset_crd::druidconnection::Error,
-        druid_connection: ObjectRef<DruidConnection>,
+        source: crate::crd::druidconnection::Error,
+        druid_connection: ObjectRef<druidconnection::v1alpha1::DruidConnection>,
     },
     #[snafu(display("failed to patch service account"))]
     ApplyServiceAccount {
@@ -129,7 +126,7 @@ impl ReconcilerError for Error {
 }
 
 pub async fn reconcile_druid_connection(
-    druid_connection: Arc<DeserializeGuard<DruidConnection>>,
+    druid_connection: Arc<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>,
     ctx: Arc<Ctx>,
 ) -> Result<Action> {
     tracing::info!("Starting reconciling DruidConnections");
@@ -157,7 +154,7 @@ pub async fn reconcile_druid_connection(
 
     if let Some(ref s) = druid_connection.status {
         match s.condition {
-            DruidConnectionStatusCondition::Pending => {
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Pending => {
                 // Is the referenced druid discovery configmap there?
                 let druid_discovery_cm_exists = client
                     .get_opt::<ConfigMap>(
@@ -173,7 +170,7 @@ pub async fn reconcile_druid_connection(
                     .is_some();
 
                 let superset_cluster = client
-                    .get::<SupersetCluster>(
+                    .get::<v1alpha1::SupersetCluster>(
                         &druid_connection.superset_name(),
                         &druid_connection.superset_namespace().context(
                             DruidConnectionNoNamespaceSnafu {
@@ -234,7 +231,7 @@ pub async fn reconcile_druid_connection(
                         .context(ApplyStatusSnafu)?;
                 }
             }
-            DruidConnectionStatusCondition::Importing => {
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Importing => {
                 let ns = druid_connection
                     .namespace()
                     .unwrap_or_else(|| "default".to_string());
@@ -259,8 +256,8 @@ pub async fn reconcile_druid_connection(
                         .context(ApplyStatusSnafu)?;
                 }
             }
-            DruidConnectionStatusCondition::Ready => (),
-            DruidConnectionStatusCondition::Failed => (),
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Ready => (),
+            druidconnection::v1alpha1::DruidConnectionStatusCondition::Failed => (),
         }
     } else {
         // Status not set yet, initialize
@@ -268,7 +265,7 @@ pub async fn reconcile_druid_connection(
             .apply_patch_status(
                 DRUID_CONNECTION_CONTROLLER_NAME,
                 druid_connection,
-                &DruidConnectionStatus::new(),
+                &druidconnection::v1alpha1::DruidConnectionStatus::new(),
             )
             .await
             .context(ApplyStatusSnafu)?;
@@ -303,8 +300,8 @@ fn build_druid_db_yaml(druid_cluster_name: &str, sqlalchemy_str: &str) -> Result
 
 /// Builds the import job.  When run it will import the druid connection into the database.
 async fn build_import_job(
-    superset_cluster: &SupersetCluster,
-    druid_connection: &DruidConnection,
+    superset_cluster: &v1alpha1::SupersetCluster,
+    druid_connection: &druidconnection::v1alpha1::DruidConnection,
     resolved_product_image: &ResolvedProductImage,
     sqlalchemy_str: &str,
     sa_name: &str,
@@ -375,7 +372,7 @@ async fn build_import_job(
 }
 
 pub fn error_policy(
-    _obj: Arc<DeserializeGuard<DruidConnection>>,
+    _obj: Arc<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>,
     error: &Error,
     _ctx: Arc<Ctx>,
 ) -> Action {
diff --git a/rust/operator-binary/src/main.rs b/rust/operator-binary/src/main.rs
index d02f3445..66fef038 100644
--- a/rust/operator-binary/src/main.rs
+++ b/rust/operator-binary/src/main.rs
@@ -20,11 +20,15 @@ use stackable_operator::{
         ResourceExt,
     },
     logging::controller::report_controller_reconciled,
-    CustomResourceExt,
+    shared::yaml::SerializeOptions,
+    YamlSchema,
 };
-use stackable_superset_crd::{druidconnection::DruidConnection, SupersetCluster, APP_NAME};
 
 use crate::{
+    crd::{
+        druidconnection::{self, DruidConnection},
+        v1alpha1, SupersetCluster, APP_NAME,
+    },
     druid_connection_controller::DRUID_CONNECTION_FULL_CONTROLLER_NAME,
     superset_controller::SUPERSET_FULL_CONTROLLER_NAME,
 };
@@ -33,6 +37,7 @@ mod authorization;
 mod commands;
 mod config;
 mod controller_commons;
+mod crd;
 mod druid_connection_controller;
 mod operations;
 mod product_logging;
@@ -59,8 +64,10 @@ async fn main() -> anyhow::Result<()> {
     let opts = Opts::parse();
     match opts.cmd {
         Command::Crd => {
-            SupersetCluster::print_yaml_schema(built_info::PKG_VERSION)?;
-            DruidConnection::print_yaml_schema(built_info::PKG_VERSION)?;
+            SupersetCluster::merged_crd(SupersetCluster::V1Alpha1)?
+                .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
+            DruidConnection::merged_crd(DruidConnection::V1Alpha1)?
+                .print_yaml_schema(built_info::PKG_VERSION, SerializeOptions::default())?;
         }
         Command::Run(ProductOperatorRun {
             product_config,
@@ -101,7 +108,7 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let superset_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<SupersetCluster>>(&client),
+                watch_namespace.get_api::<DeserializeGuard<v1alpha1::SupersetCluster>>(&client),
                 watcher::Config::default(),
             );
             let superset_store_1 = superset_controller.store();
@@ -162,7 +169,10 @@ async fn main() -> anyhow::Result<()> {
                 },
             ));
             let druid_connection_controller = Controller::new(
-                watch_namespace.get_api::<DeserializeGuard<DruidConnection>>(&client),
+                watch_namespace
+                    .get_api::<DeserializeGuard<druidconnection::v1alpha1::DruidConnection>>(
+                        &client,
+                    ),
                 watcher::Config::default(),
             );
             let druid_connection_store_1 = druid_connection_controller.store();
@@ -171,7 +181,7 @@ async fn main() -> anyhow::Result<()> {
             let druid_connection_controller = druid_connection_controller
                 .shutdown_on_signal()
                 .watches(
-                    watch_namespace.get_api::<DeserializeGuard<SupersetCluster>>(&client),
+                    watch_namespace.get_api::<DeserializeGuard<v1alpha1::SupersetCluster>>(&client),
                     watcher::Config::default(),
                     move |superset_cluster| {
                         druid_connection_store_1
@@ -242,7 +252,7 @@ async fn main() -> anyhow::Result<()> {
 }
 
 fn references_authentication_class(
-    superset: &DeserializeGuard<SupersetCluster>,
+    superset: &DeserializeGuard<v1alpha1::SupersetCluster>,
     authentication_class: &DeserializeGuard<AuthenticationClass>,
 ) -> bool {
     let Ok(superset) = &superset.0 else {
@@ -259,8 +269,8 @@ fn references_authentication_class(
 }
 
 fn valid_druid_connection(
-    superset_cluster: &DeserializeGuard<SupersetCluster>,
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    superset_cluster: &DeserializeGuard<v1alpha1::SupersetCluster>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
         return false;
@@ -270,7 +280,7 @@ fn valid_druid_connection(
 }
 
 fn valid_druid_connection_namespace(
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
     config_map: &DeserializeGuard<ConfigMap>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
@@ -281,7 +291,7 @@ fn valid_druid_connection_namespace(
 }
 
 fn valid_druid_job(
-    druid_connection: &DeserializeGuard<DruidConnection>,
+    druid_connection: &DeserializeGuard<druidconnection::v1alpha1::DruidConnection>,
     job: &DeserializeGuard<Job>,
 ) -> bool {
     let Ok(druid_connection) = &druid_connection.0 else {
diff --git a/rust/operator-binary/src/operations/graceful_shutdown.rs b/rust/operator-binary/src/operations/graceful_shutdown.rs
index b4630dd9..a77bb8bb 100644
--- a/rust/operator-binary/src/operations/graceful_shutdown.rs
+++ b/rust/operator-binary/src/operations/graceful_shutdown.rs
@@ -1,6 +1,7 @@
 use snafu::{ResultExt, Snafu};
 use stackable_operator::builder::pod::PodBuilder;
-use stackable_superset_crd::SupersetConfig;
+
+use crate::crd::v1alpha1;
 
 #[derive(Debug, Snafu)]
 pub enum Error {
@@ -11,7 +12,7 @@ pub enum Error {
 }
 
 pub fn add_graceful_shutdown_config(
-    merged_config: &SupersetConfig,
+    merged_config: &v1alpha1::SupersetConfig,
     pod_builder: &mut PodBuilder,
 ) -> Result<(), Error> {
     // This must be always set by the merge mechanism, as we provide a default value,
diff --git a/rust/operator-binary/src/operations/pdb.rs b/rust/operator-binary/src/operations/pdb.rs
index 3908bd2d..77a7c962 100644
--- a/rust/operator-binary/src/operations/pdb.rs
+++ b/rust/operator-binary/src/operations/pdb.rs
@@ -3,9 +3,12 @@ use stackable_operator::{
     builder::pdb::PodDisruptionBudgetBuilder, client::Client, cluster_resources::ClusterResources,
     commons::pdb::PdbConfig, kube::ResourceExt,
 };
-use stackable_superset_crd::{SupersetCluster, SupersetRole, APP_NAME};
 
-use crate::{superset_controller::SUPERSET_CONTROLLER_NAME, OPERATOR_NAME};
+use crate::{
+    crd::{v1alpha1, SupersetRole, APP_NAME},
+    superset_controller::SUPERSET_CONTROLLER_NAME,
+    OPERATOR_NAME,
+};
 
 #[derive(Snafu, Debug)]
 pub enum Error {
@@ -23,7 +26,7 @@ pub enum Error {
 
 pub async fn add_pdbs(
     pdb: &PdbConfig,
-    superset: &SupersetCluster,
+    superset: &v1alpha1::SupersetCluster,
     role: &SupersetRole,
     client: &Client,
     cluster_resources: &mut ClusterResources,
diff --git a/rust/operator-binary/src/product_logging.rs b/rust/operator-binary/src/product_logging.rs
index fb9a5076..73de7598 100644
--- a/rust/operator-binary/src/product_logging.rs
+++ b/rust/operator-binary/src/product_logging.rs
@@ -14,7 +14,8 @@ use stackable_operator::{
     },
     role_utils::RoleGroupRef,
 };
-use stackable_superset_crd::STACKABLE_LOG_DIR;
+
+use crate::crd::STACKABLE_LOG_DIR;
 
 #[derive(Snafu, Debug)]
 pub enum Error {
diff --git a/rust/operator-binary/src/superset_controller.rs b/rust/operator-binary/src/superset_controller.rs
index f492b3ec..d1baceb8 100644
--- a/rust/operator-binary/src/superset_controller.rs
+++ b/rust/operator-binary/src/superset_controller.rs
@@ -65,14 +65,6 @@ use stackable_operator::{
     time::Duration,
     utils::COMMON_BASH_TRAP_FUNCTIONS,
 };
-use stackable_superset_crd::{
-    authentication::{
-        SupersetAuthenticationClassResolved, SupersetClientAuthenticationDetailsResolved,
-    },
-    Container, SupersetCluster, SupersetClusterStatus, SupersetConfig, SupersetConfigOptions,
-    SupersetRole, APP_NAME, PYTHONPATH, STACKABLE_CONFIG_DIR, STACKABLE_LOG_CONFIG_DIR,
-    STACKABLE_LOG_DIR, SUPERSET_CONFIG_FILENAME,
-};
 use strum::{EnumDiscriminants, IntoStaticStr};
 
 use crate::{
@@ -80,6 +72,14 @@ use crate::{
     commands::add_cert_to_python_certifi_command,
     config::{self, PYTHON_IMPORTS},
     controller_commons::{self, CONFIG_VOLUME_NAME, LOG_CONFIG_VOLUME_NAME, LOG_VOLUME_NAME},
+    crd::{
+        authentication::{
+            SupersetAuthenticationClassResolved, SupersetClientAuthenticationDetailsResolved,
+        },
+        v1alpha1::{Container, SupersetCluster, SupersetClusterStatus, SupersetConfig},
+        SupersetConfigOptions, SupersetRole, APP_NAME, PYTHONPATH, STACKABLE_CONFIG_DIR,
+        STACKABLE_LOG_CONFIG_DIR, STACKABLE_LOG_DIR, SUPERSET_CONFIG_FILENAME,
+    },
     operations::{graceful_shutdown::add_graceful_shutdown_config, pdb::add_pdbs},
     product_logging::{
         extend_config_map_with_log_config, resolve_vector_aggregator_address, LOG_CONFIG_FILE,
@@ -181,7 +181,7 @@ pub enum Error {
 
     #[snafu(display("failed to apply authentication configuration"))]
     InvalidAuthenticationConfig {
-        source: stackable_superset_crd::authentication::Error,
+        source: crate::crd::authentication::Error,
     },
 
     #[snafu(display(
@@ -193,9 +193,7 @@ pub enum Error {
     MissingWebServerTimeoutInSupersetConfig,
 
     #[snafu(display("failed to resolve and merge config for role and role group"))]
-    FailedToResolveConfig {
-        source: stackable_superset_crd::Error,
-    },
+    FailedToResolveConfig { source: crate::crd::Error },
 
     #[snafu(display("failed to resolve the Vector aggregator address"))]
     ResolveVectorAggregatorAddress {
diff --git a/rust/operator-binary/src/util.rs b/rust/operator-binary/src/util.rs
index 84fd1a93..9cf6c54b 100644
--- a/rust/operator-binary/src/util.rs
+++ b/rust/operator-binary/src/util.rs
@@ -1,7 +1,6 @@
 use stackable_operator::{k8s_openapi::api::batch::v1::Job, kvp::ObjectLabels};
-use stackable_superset_crd::APP_NAME;
 
-use crate::OPERATOR_NAME;
+use crate::{crd::APP_NAME, OPERATOR_NAME};
 
 pub enum JobState {
     InProgress,
diff --git a/tests/templates/kuttl/logging/test_log_aggregation.py b/tests/templates/kuttl/logging/test_log_aggregation.py
index 7e8c18b3..f6b7e7a3 100755
--- a/tests/templates/kuttl/logging/test_log_aggregation.py
+++ b/tests/templates/kuttl/logging/test_log_aggregation.py
@@ -23,9 +23,9 @@ def check_sent_events():
         },
     )
 
-    assert (
-        response.status_code == 200
-    ), "Cannot access the API of the vector aggregator."
+    assert response.status_code == 200, (
+        "Cannot access the API of the vector aggregator."
+    )
 
     result = response.json()
 
@@ -35,14 +35,14 @@ def check_sent_events():
         componentId = transform["componentId"]
 
         if componentId == "filteredInvalidEvents":
-            assert (
-                sentEvents is None or sentEvents["sentEventsTotal"] == 0
-            ), "Invalid log events were sent."
+            assert sentEvents is None or sentEvents["sentEventsTotal"] == 0, (
+                "Invalid log events were sent."
+            )
 
         else:
-            assert (
-                sentEvents is not None and sentEvents["sentEventsTotal"] > 0
-            ), f'No events were sent in "{componentId}".'
+            assert sentEvents is not None and sentEvents["sentEventsTotal"] > 0, (
+                f'No events were sent in "{componentId}".'
+            )
 
 
 if __name__ == "__main__":
diff --git a/tests/templates/kuttl/oidc/60_login.py b/tests/templates/kuttl/oidc/60_login.py
index 8ad0c966..9b7cef67 100644
--- a/tests/templates/kuttl/oidc/60_login.py
+++ b/tests/templates/kuttl/oidc/60_login.py
@@ -28,17 +28,17 @@
 )
 
 assert welcome_page.ok, "Login failed"
-assert (
-    welcome_page.url == "http://superset-external:8088/superset/welcome/"
-), "Redirection to the Superset welcome page expected"
+assert welcome_page.url == "http://superset-external:8088/superset/welcome/", (
+    "Redirection to the Superset welcome page expected"
+)
 
 # Open the user information page in Superset
 userinfo_page = session.get("http://superset-external:8088/users/userinfo/")
 
 assert userinfo_page.ok, "Retrieving user information failed"
-assert (
-    userinfo_page.url == "http://superset-external:8088/superset/welcome/"
-), "Redirection to the Superset welcome page expected"
+assert userinfo_page.url == "http://superset-external:8088/superset/welcome/", (
+    "Redirection to the Superset welcome page expected"
+)
 
 # Expect the user data provided by Keycloak in Superset
 userinfo_page_html = BeautifulSoup(userinfo_page.text, "html.parser")
@@ -46,15 +46,15 @@
 data = json.loads(raw_data)
 user_data = data["user"]
 
-assert (
-    user_data["firstName"] == "Jane"
-), "The first name of the user in Superset should match the one provided by Keycloak"
-assert (
-    user_data["lastName"] == "Doe"
-), "The last name of the user in Superset should match the one provided by Keycloak"
-assert (
-    user_data["email"] == "jane.doe@stackable.tech"
-), "The email of the user in Superset should match the one provided by Keycloak"
+assert user_data["firstName"] == "Jane", (
+    "The first name of the user in Superset should match the one provided by Keycloak"
+)
+assert user_data["lastName"] == "Doe", (
+    "The last name of the user in Superset should match the one provided by Keycloak"
+)
+assert user_data["email"] == "jane.doe@stackable.tech", (
+    "The email of the user in Superset should match the one provided by Keycloak"
+)
 
 # TODO Use different OIDC providers (currently only Keycloak is
 # supported)
diff --git a/tests/templates/kuttl/smoke/metrics.py b/tests/templates/kuttl/smoke/metrics.py
index cffaa151..6c86f2f2 100644
--- a/tests/templates/kuttl/smoke/metrics.py
+++ b/tests/templates/kuttl/smoke/metrics.py
@@ -11,6 +11,6 @@
 metrics_response = requests.get("http://superset-node-default:9102/metrics")
 assert metrics_response.status_code == 200, "Metrics could not be retrieved."
 
-assert (
-    "superset_welcome" in metrics_response.text
-), "The metrics do not contain the superset_welcome counter."
+assert "superset_welcome" in metrics_response.text, (
+    "The metrics do not contain the superset_welcome counter."
+)