diff --git a/pkgs/by-name/zi/zitadel/console.nix b/pkgs/by-name/zi/zitadel/console.nix
index ffef4ca1d4e5..5ffd0a2223ec 100644
--- a/pkgs/by-name/zi/zitadel/console.nix
+++ b/pkgs/by-name/zi/zitadel/console.nix
@@ -23,7 +23,7 @@ let
     workDir = "console";
     bufArgs = "../proto --include-imports --include-wkt";
     outputPath = "src/app/proto";
-    hash = "sha256-BBXFt4f2SQphr106sQ0eEL4Z2ooAI8fxXhu2rKqhjb4=";
+    hash = "sha256-n6BJ1gSSm66yOGdHcSea/nQbjiHZX2YX2zbFT4o75/4=";
   };
 in
 mkYarnPackage rec {
@@ -35,18 +35,19 @@ mkYarnPackage rec {
   packageJSON = ./package.json;
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-cfo2WLSbfU8tYADjF7j9zTLNsboVThF6MUBrb49MrII=";
+    hash = "sha256-MWATjfhIbo3cqpzOdXP52f/0Td60n99OTU1Qk6oWmXU=";
   };
 
   postPatch = ''
     substituteInPlace src/styles.scss \
-      --replace "/node_modules/flag-icons" "flag-icons"
+      --replace-fail "/node_modules/flag-icons" "flag-icons"
 
     substituteInPlace angular.json \
-      --replace "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
+      --replace-fail "./node_modules/tinycolor2" "../../node_modules/tinycolor2"
   '';
 
   buildPhase = ''
+    ln -s "${zitadelRepo}/docs" deps/docs
     mkdir deps/console/src/app/proto
     cp -r ${protobufGenerated}/* deps/console/src/app/proto/
     yarn --offline build
diff --git a/pkgs/by-name/zi/zitadel/package.json b/pkgs/by-name/zi/zitadel/package.json
index 42dc0ef19d77..70390d87e1d7 100644
--- a/pkgs/by-name/zi/zitadel/package.json
+++ b/pkgs/by-name/zi/zitadel/package.json
@@ -29,6 +29,7 @@
     "@fortawesome/fontawesome-svg-core": "^6.4.2",
     "@fortawesome/free-brands-svg-icons": "^6.4.2",
     "@grpc/grpc-js": "^1.9.3",
+    "@netlify/framework-info": "^9.8.10",
     "@ngx-translate/core": "^15.0.0",
     "angular-oauth2-oidc": "^15.0.1",
     "angularx-qrcode": "^16.0.0",
@@ -36,11 +37,11 @@
     "codemirror": "^5.65.8",
     "cors": "^2.8.5",
     "file-saver": "^2.0.5",
-    "flag-icons": "^6.7.0",
+    "flag-icons": "^7.1.0",
     "google-proto-files": "^4.0.0",
     "google-protobuf": "^3.21.2",
     "grpc-web": "^1.4.1",
-    "i18n-iso-countries": "^7.6.0",
+    "i18n-iso-countries": "^7.7.0",
     "libphonenumber-js": "^1.10.49",
     "material-design-icons-iconfont": "^6.1.1",
     "moment": "^2.29.4",
@@ -49,8 +50,8 @@
     "rxjs": "~7.8.0",
     "tinycolor2": "^1.6.0",
     "tslib": "^2.6.2",
-    "uuid": "^9.0.0",
-    "zone.js": "~0.13.1"
+    "uuid": "^9.0.1",
+    "zone.js": "~0.13.3"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^16.2.2",
@@ -65,13 +66,13 @@
     "@bufbuild/buf": "^1.23.1",
     "@types/file-saver": "^2.0.7",
     "@types/google-protobuf": "^3.15.3",
-    "@types/jasmine": "~4.3.6",
-    "@types/jasminewd2": "~2.0.10",
+    "@types/jasmine": "~5.1.4",
+    "@types/jasminewd2": "~2.0.13",
     "@types/jsonwebtoken": "^9.0.5",
     "@types/node": "^20.7.0",
-    "@types/opentype.js": "^1.3.4",
+    "@types/opentype.js": "^1.3.8",
     "@types/qrcode": "^1.5.2",
-    "@types/uuid": "^9.0.2",
+    "@types/uuid": "^9.0.7",
     "@typescript-eslint/eslint-plugin": "^5.59.11",
     "@typescript-eslint/parser": "^5.60.1",
     "codelyzer": "^6.0.2",
@@ -83,8 +84,8 @@
     "karma-coverage-istanbul-reporter": "^3.0.3",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
-    "prettier": "^3.0.3",
-    "prettier-plugin-organize-imports": "^3.2.2",
+    "prettier": "^3.1.1",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "protractor": "~7.0.0",
     "typescript": "^5.1.6"
   }
diff --git a/pkgs/by-name/zi/zitadel/package.nix b/pkgs/by-name/zi/zitadel/package.nix
index 567bd93f6961..d744ed153c83 100644
--- a/pkgs/by-name/zi/zitadel/package.nix
+++ b/pkgs/by-name/zi/zitadel/package.nix
@@ -15,14 +15,14 @@
 }:
 
 let
-  version = "2.42.10";
+  version = "2.58.3";
   zitadelRepo = fetchFromGitHub {
     owner = "zitadel";
     repo = "zitadel";
     rev = "v${version}";
-    hash = "sha256-Uv0iEIFkTdBAi0WDBQHf0ATs4L2FOU4NmiE9p1MHSa0=";
+    hash = "sha256-RXcJwGO8OQ38lbuy2uLTSkh6yUbyqY42FpwgMXC3g6c=";
   };
-  goModulesHash = "sha256-thd1bhbPVedYd+Yq1IYYUJFr66AWRTzA3DceCXFTEQo=";
+  goModulesHash = "sha256-gp17dP67HX7Tx3Gq+kEu9xCYkfs/rGpqLFiKT7cKlrc=";
 
   buildZitadelProtocGen = name:
     buildGoModule {
@@ -64,11 +64,10 @@ let
       src = zitadelRepo;
       patches = [ ./console-use-local-protobuf-plugins.patch ];
 
-      nativeBuildInputs = nativeBuildInputs ++ [ buf ];
+      nativeBuildInputs = nativeBuildInputs ++ [ buf cacert ];
 
       buildPhase = ''
         cd ${workDir}
-        export SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt"
         HOME=$TMPDIR buf generate ${bufArgs}
       '';
 
@@ -92,7 +91,7 @@ let
       protoc-gen-zitadel
     ];
     outputPath = ".artifacts";
-    hash = "sha256-ntIKudNFBs7kHjK7cfzbOfDCA6J8uvJRUbCTa6afK/I=";
+    hash = "sha256-KRf11PNn7LtVFjG3NYUtPEJtLNbnxfzR4B69US07B3k=";
   };
 in
 buildGoModule rec {
@@ -148,6 +147,6 @@ buildGoModule rec {
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.asl20;
     sourceProvenance = [ sourceTypes.fromSource ];
-    maintainers = [ ];
+    maintainers = [ maintainers.nrabulinski ];
   };
 }