diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index d1121f9f0783..db60779ae871 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -313,6 +313,8 @@
 - `swiftpm` is no longer wrapped to include Git to fetch dependencies.
   Users with Git-based dependencies will need to add `git` to their dev shells or include it in their environment if they weren’t already.
 
+- `extra-container` v0.17 now enforces assertions and warnings, and is hosted at [new org/repo extra-container/extra-container](https://github.com/extra-container/extra-container). Full changes: [CHANGELOG](https://github.com/extra-container/extra-container/blob/main/CHANGELOG.md)
+
 - `buildPythonPackage` and `buildPythonApplication` now uses `meta.problems.unsupportedPython` to mark Python packages with unsupported Python interpreters.
   - The `disabled` argument automatically converts to `meta.problems.unsupportedPython` with the default message.
   - Overriding the `disabled` argument or the `passthru.disabled` attribute is deprecated.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c045d155dcec..a12db22c1008 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28227,6 +28227,16 @@
     githubId = 1181362;
     name = "Stefan Junker";
   };
+  stevelr = {
+    email = "stevelr.git@pm.me";
+    github = "stevelr";
+    githubId = 15311467;
+    name = "Steve Schoettler";
+    keys = [
+      { fingerprint = "57C9 E8E1 274D 713E FEF3  1B89 407A A4E4 3349 35ED"; }
+      { fingerprint = "8379 6FAD CB03 18D6 513B  4CBB D39C B4E4 FD6B C844"; }
+    ];
+  };
   stevenroose = {
     email = "github@stevenroose.org";
     github = "stevenroose";
diff --git a/nixos/modules/programs/extra-container.nix b/nixos/modules/programs/extra-container.nix
index 30b0785ad47f..1cb0c9b9bbd8 100644
--- a/nixos/modules/programs/extra-container.nix
+++ b/nixos/modules/programs/extra-container.nix
@@ -14,9 +14,10 @@ in
       extra-container, a tool for running declarative NixOS containers
       without host system rebuilds
     '';
+    programs.extra-container.package = lib.mkPackageOption pkgs "extra-container" { };
   };
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.extra-container ];
+    environment.systemPackages = [ cfg.package ];
     boot.extraSystemdUnitPaths = [ "/etc/systemd-mutable/system" ];
   };
 }
diff --git a/pkgs/by-name/ex/extra-container/package.nix b/pkgs/by-name/ex/extra-container/package.nix
index 804fc0c3bf16..528149ff527c 100644
--- a/pkgs/by-name/ex/extra-container/package.nix
+++ b/pkgs/by-name/ex/extra-container/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "extra-container";
-  version = "0.14";
+  version = "0.17";
 
   src = fetchFromGitHub {
-    owner = "erikarvstedt";
+    owner = "extra-container";
     repo = "extra-container";
-    rev = finalAttrs.version;
-    hash = "sha256-XGp4HHH6D6ZKiO5RnMzqYJYnZB538EnEflvlTsOKpvo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fLE3qALPTc9audJ/r1IXMd8eva4mpTYyKW50iJJcDxA=";
   };
 
   buildCommand = ''
@@ -37,11 +37,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Run declarative containers without full system rebuilds";
-    homepage = "https://github.com/erikarvstedt/extra-container";
-    changelog = "https://github.com/erikarvstedt/extra-container/blob/${finalAttrs.version}/CHANGELOG.md";
+    homepage = "https://github.com/extra-container/extra-container";
+    changelog = "https://github.com/extra-container/extra-container/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.erikarvstedt ];
+    maintainers = [ lib.maintainers.stevelr ];
     mainProgram = "extra-container";
   };
 })