diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
index 43c2fef57a0..cf5ceb8de8a 100644
--- a/.bingo/Variables.mk
+++ b/.bingo/Variables.mk
@@ -47,11 +47,11 @@ $(FIPS_DETECT): $(BINGO_DIR)/fips-detect.mod
 	@echo "(re)installing $(GOBIN)/fips-detect-v0.0.0-20230309083406-7157dae5bafd"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=fips-detect.mod -o=$(GOBIN)/fips-detect-v0.0.0-20230309083406-7157dae5bafd "github.com/acardace/fips-detect"
 
-GENCOSMOSDB := $(GOBIN)/gencosmosdb-v0.0.0-20240729051124-c9cf2c4f6aa1
+GENCOSMOSDB := $(GOBIN)/gencosmosdb-v0.0.0-20250203190900-6f9d371594d6
 $(GENCOSMOSDB): $(BINGO_DIR)/gencosmosdb.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/gencosmosdb-v0.0.0-20240729051124-c9cf2c4f6aa1"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gencosmosdb.mod -o=$(GOBIN)/gencosmosdb-v0.0.0-20240729051124-c9cf2c4f6aa1 "github.com/jewzaam/go-cosmosdb/cmd/gencosmosdb"
+	@echo "(re)installing $(GOBIN)/gencosmosdb-v0.0.0-20250203190900-6f9d371594d6"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=gencosmosdb.mod -o=$(GOBIN)/gencosmosdb-v0.0.0-20250203190900-6f9d371594d6 "github.com/bennerv/go-cosmosdb/cmd/gencosmosdb"
 
 GO_BINDATA := $(GOBIN)/go-bindata-v3.1.2+incompatible
 $(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
diff --git a/.bingo/gencosmosdb.mod b/.bingo/gencosmosdb.mod
index a4bec943b5a..bbab8446ef7 100644
--- a/.bingo/gencosmosdb.mod
+++ b/.bingo/gencosmosdb.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.22.9
 
-require github.com/jewzaam/go-cosmosdb v0.0.0-20240729051124-c9cf2c4f6aa1 // cmd/gencosmosdb
+require github.com/bennerv/go-cosmosdb v0.0.0-20250203190900-6f9d371594d6 // cmd/gencosmosdb
diff --git a/.bingo/gencosmosdb.sum b/.bingo/gencosmosdb.sum
index 83cbdf6d316..242998f855d 100644
--- a/.bingo/gencosmosdb.sum
+++ b/.bingo/gencosmosdb.sum
@@ -1,4 +1,2 @@
-github.com/jewzaam/go-cosmosdb v0.0.0-20240723075448-058185e3c66d h1:2Xp2eP830w13cWq6sombl3EsBM46xYkdkLog8BgFWyQ=
-github.com/jewzaam/go-cosmosdb v0.0.0-20240723075448-058185e3c66d/go.mod h1:hEk8/SoE/NBT9ofV69Gzs98vbGyF155SaYl1p9bxKb8=
-github.com/jewzaam/go-cosmosdb v0.0.0-20240729051124-c9cf2c4f6aa1 h1:7EGTuO4I+1fln9rQ50K4ysZSejU2gFC2Oz8UyrySYtw=
-github.com/jewzaam/go-cosmosdb v0.0.0-20240729051124-c9cf2c4f6aa1/go.mod h1:+G8ranhkJ4x2BUFTyh3b7Ap0KkDZwAwd/0OqtIVR63c=
+github.com/bennerv/go-cosmosdb v0.0.0-20250203190900-6f9d371594d6 h1:FTEfqwNyuxEBNtkRZwg3CBv+5TiiqscTzQkxeW2HJg4=
+github.com/bennerv/go-cosmosdb v0.0.0-20250203190900-6f9d371594d6/go.mod h1:4bSvv83quaEsAsIBxUGczXmMep28F+/pi7mbSoZkBxs=
diff --git a/.bingo/variables.env b/.bingo/variables.env
index 6d1d8ebbbd8..ae9cecbb4b3 100644
--- a/.bingo/variables.env
+++ b/.bingo/variables.env
@@ -18,7 +18,7 @@ ENUMER="${GOBIN}/enumer-v1.5.10"
 
 FIPS_DETECT="${GOBIN}/fips-detect-v0.0.0-20230309083406-7157dae5bafd"
 
-GENCOSMOSDB="${GOBIN}/gencosmosdb-v0.0.0-20240729051124-c9cf2c4f6aa1"
+GENCOSMOSDB="${GOBIN}/gencosmosdb-v0.0.0-20250203190900-6f9d371594d6"
 
 GO_BINDATA="${GOBIN}/go-bindata-v3.1.2+incompatible"
 
diff --git a/pkg/database/cosmosdb/zz_generated_asyncoperationdocument.go b/pkg/database/cosmosdb/zz_generated_asyncoperationdocument.go
index edb7f865182..9aab3a8f416 100644
--- a/pkg/database/cosmosdb/zz_generated_asyncoperationdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_asyncoperationdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_asyncoperationdocument_fake.go b/pkg/database/cosmosdb/zz_generated_asyncoperationdocument_fake.go
index 09a597dabb7..4673bbbbe70 100644
--- a/pkg/database/cosmosdb/zz_generated_asyncoperationdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_asyncoperationdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_authorizer.go b/pkg/database/cosmosdb/zz_generated_authorizer.go
index 12cdcfe3356..792d0885d57 100644
--- a/pkg/database/cosmosdb/zz_generated_authorizer.go
+++ b/pkg/database/cosmosdb/zz_generated_authorizer.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_billingdocument.go b/pkg/database/cosmosdb/zz_generated_billingdocument.go
index 685f6952037..30b9b0f9578 100644
--- a/pkg/database/cosmosdb/zz_generated_billingdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_billingdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_billingdocument_fake.go b/pkg/database/cosmosdb/zz_generated_billingdocument_fake.go
index 9a6da6936cb..e33ac3da66b 100644
--- a/pkg/database/cosmosdb/zz_generated_billingdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_billingdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument.go b/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument.go
index 58ff160643b..135dc1de026 100644
--- a/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument_fake.go b/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument_fake.go
index dea169f6a35..bc325029aea 100644
--- a/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_clustermanagerconfigurationdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_collection.go b/pkg/database/cosmosdb/zz_generated_collection.go
index b4a6bef1196..4bec99998ec 100644
--- a/pkg/database/cosmosdb/zz_generated_collection.go
+++ b/pkg/database/cosmosdb/zz_generated_collection.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_cosmosdb.go b/pkg/database/cosmosdb/zz_generated_cosmosdb.go
index 8784fbcda4b..7fd49e8f972 100644
--- a/pkg/database/cosmosdb/zz_generated_cosmosdb.go
+++ b/pkg/database/cosmosdb/zz_generated_cosmosdb.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_database.go b/pkg/database/cosmosdb/zz_generated_database.go
index 918bc35d4fc..ad106de1cde 100644
--- a/pkg/database/cosmosdb/zz_generated_database.go
+++ b/pkg/database/cosmosdb/zz_generated_database.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_document.go b/pkg/database/cosmosdb/zz_generated_document.go
index 43aded3a2bc..f4357c9050f 100644
--- a/pkg/database/cosmosdb/zz_generated_document.go
+++ b/pkg/database/cosmosdb/zz_generated_document.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_gatewaydocument.go b/pkg/database/cosmosdb/zz_generated_gatewaydocument.go
index 2fdc95c0ad9..4040efe624b 100644
--- a/pkg/database/cosmosdb/zz_generated_gatewaydocument.go
+++ b/pkg/database/cosmosdb/zz_generated_gatewaydocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_gatewaydocument_fake.go b/pkg/database/cosmosdb/zz_generated_gatewaydocument_fake.go
index 75b294b6320..03bf475d138 100644
--- a/pkg/database/cosmosdb/zz_generated_gatewaydocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_gatewaydocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument.go b/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument.go
index 1aa237d5d06..d9737bedaa6 100644
--- a/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument_fake.go b/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument_fake.go
index b6a6a20413f..aae19d4366a 100644
--- a/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_maintenancemanifestdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_monitordocument.go b/pkg/database/cosmosdb/zz_generated_monitordocument.go
index f7a60db115f..07176ffab63 100644
--- a/pkg/database/cosmosdb/zz_generated_monitordocument.go
+++ b/pkg/database/cosmosdb/zz_generated_monitordocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_monitordocument_fake.go b/pkg/database/cosmosdb/zz_generated_monitordocument_fake.go
index 78a7645ad21..7335606f0f0 100644
--- a/pkg/database/cosmosdb/zz_generated_monitordocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_monitordocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument.go b/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument.go
index 4a80180ab51..183b857509a 100644
--- a/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument_fake.go b/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument_fake.go
index bf4d6918f45..52cb577c72b 100644
--- a/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_openshiftclusterdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_openshiftversiondocument.go b/pkg/database/cosmosdb/zz_generated_openshiftversiondocument.go
index e6e22299ba8..6e3f9ed5ac1 100644
--- a/pkg/database/cosmosdb/zz_generated_openshiftversiondocument.go
+++ b/pkg/database/cosmosdb/zz_generated_openshiftversiondocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_openshiftversiondocument_fake.go b/pkg/database/cosmosdb/zz_generated_openshiftversiondocument_fake.go
index a8f353a2472..8ea819b832c 100644
--- a/pkg/database/cosmosdb/zz_generated_openshiftversiondocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_openshiftversiondocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_permission.go b/pkg/database/cosmosdb/zz_generated_permission.go
index 80e158397d0..cb2423f0f71 100644
--- a/pkg/database/cosmosdb/zz_generated_permission.go
+++ b/pkg/database/cosmosdb/zz_generated_permission.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument.go b/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument.go
index 5b7696418c9..04df96511e2 100644
--- a/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument.go
+++ b/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument_fake.go b/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument_fake.go
index 78a2f8109c2..38fc4cb8d4b 100644
--- a/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_platformworkloadidentityrolesetdocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_subscriptiondocument.go b/pkg/database/cosmosdb/zz_generated_subscriptiondocument.go
index 1c9bedc17b7..8272bcabdf7 100644
--- a/pkg/database/cosmosdb/zz_generated_subscriptiondocument.go
+++ b/pkg/database/cosmosdb/zz_generated_subscriptiondocument.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_subscriptiondocument_fake.go b/pkg/database/cosmosdb/zz_generated_subscriptiondocument_fake.go
index 7e322cc7325..e5664c8c16e 100644
--- a/pkg/database/cosmosdb/zz_generated_subscriptiondocument_fake.go
+++ b/pkg/database/cosmosdb/zz_generated_subscriptiondocument_fake.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_trigger.go b/pkg/database/cosmosdb/zz_generated_trigger.go
index cd7a85b6995..5ed5a0e20ef 100644
--- a/pkg/database/cosmosdb/zz_generated_trigger.go
+++ b/pkg/database/cosmosdb/zz_generated_trigger.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb
 
diff --git a/pkg/database/cosmosdb/zz_generated_user.go b/pkg/database/cosmosdb/zz_generated_user.go
index 06753f2c7df..49a216568e8 100644
--- a/pkg/database/cosmosdb/zz_generated_user.go
+++ b/pkg/database/cosmosdb/zz_generated_user.go
@@ -1,4 +1,4 @@
-// Code generated by github.com/jewzaam/go-cosmosdb, DO NOT EDIT.
+// Code generated by github.com/bennerv/go-cosmosdb, DO NOT EDIT.
 
 package cosmosdb