diff --git a/storage/zfs/manifest.yaml b/storage/zfs/manifest.yaml
index c4dfb0fa..0d55bd3d 100644
--- a/storage/zfs/manifest.yaml
+++ b/storage/zfs/manifest.yaml
@@ -4,7 +4,7 @@ metadata:
   version: "$VERSION"
   author: Andrei Kvapil, Aenix
   description: |
-    This system extension provides kernel module driver for ZFS built against a specific Talos version.
+    This system extension provides the ZFS kernel module, the ZFS utilities, and a service to import all ZFS pools on start and unmount all pools on stop.
   compatibility:
     talos:
       version: ">= v1.6.0"
diff --git a/storage/zfs/pkg.yaml b/storage/zfs/pkg.yaml
index 7b055d42..0fe6e2b5 100644
--- a/storage/zfs/pkg.yaml
+++ b/storage/zfs/pkg.yaml
@@ -9,19 +9,18 @@ dependencies:
   - stage: libtirpc-zfs
   - stage: zlib-zfs
   - stage: zfs-tools
+  - stage: zfs-service
 steps:
   - prepare:
       - |
         sed -i 's#$VERSION#{{ .VERSION }}#' /pkg/manifest.yaml
   - install:
       - |
-        mkdir -p /rootfs/lib/modules /rootfs/usr/local/lib/containers/zpool-importer
-
-        cp -R /lib/modules/* /rootfs/lib/modules
+        mkdir -p /rootfs/lib/modules
+        cp -R /lib/modules/* /rootfs/lib/modules/
       - |
         mkdir -p /rootfs/usr/local/etc/containers
-
-        cp /pkg/zpool-importer.yaml /rootfs/usr/local/etc/containers/zpool-importer.yaml
+        cp /pkg/zfs-service.yaml /rootfs/usr/local/etc/containers/
     test:
       - |
         mkdir -p /extensions-validator-rootfs
diff --git a/storage/zfs/zpool-importer.yaml b/storage/zfs/zfs-service.yaml
similarity index 84%
rename from storage/zfs/zpool-importer.yaml
rename to storage/zfs/zfs-service.yaml
index 8a861519..c8f950b1 100755
--- a/storage/zfs/zpool-importer.yaml
+++ b/storage/zfs/zfs-service.yaml
@@ -1,15 +1,10 @@
-name: zpool-importer
+name: zfs-service
 depends:
   - service: udevd
   - service: cri
   - path: /dev/zfs
 container:
-  security:
-    rootfsPropagation: shared
-  entrypoint: /usr/local/sbin/zpool
-  args:
-    - import
-    - -fa
+  entrypoint: /zfs-service
   mounts:
     # ld-musl-x86_64.so.1
     - source: /lib
@@ -44,6 +39,13 @@ container:
         - rshared
         - rbind
         - rw
+    - source: /run
+      destination: /run
+      type: bind
+      options:
+        - rshared
+        - rbind
+        - rw
     - source: /var
       destination: /var
       type: bind
@@ -51,4 +53,6 @@ container:
         - rshared
         - rbind
         - rw
+  security:
+    rootfsPropagation: shared
 restart: untilSuccess
diff --git a/storage/zfs/zfs-service/go.mod b/storage/zfs/zfs-service/go.mod
new file mode 100644
index 00000000..648ba78d
--- /dev/null
+++ b/storage/zfs/zfs-service/go.mod
@@ -0,0 +1,5 @@
+module zfs-service
+
+go 1.22
+
+require golang.org/x/sys v0.24.0
diff --git a/storage/zfs/zfs-service/go.sum b/storage/zfs/zfs-service/go.sum
new file mode 100644
index 00000000..d88e7bd7
--- /dev/null
+++ b/storage/zfs/zfs-service/go.sum
@@ -0,0 +1,2 @@
+golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
+golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
diff --git a/storage/zfs/zfs-service/main.go b/storage/zfs/zfs-service/main.go
new file mode 100644
index 00000000..afed8bcb
--- /dev/null
+++ b/storage/zfs/zfs-service/main.go
@@ -0,0 +1,34 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+package main
+
+import (
+	"log"
+	"os"
+	"os/exec"
+	"os/signal"
+
+	"golang.org/x/sys/unix"
+)
+
+func main() {
+	cmd := exec.Command("/usr/local/sbin/zpool", "import", "-fal")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		log.Fatalf("zfs-service: zpool import error: %v\n", err)
+	}
+
+	ch := make(chan os.Signal, 1)
+	signal.Notify(ch, unix.SIGINT, unix.SIGTERM)
+	<-ch
+
+	cmd = exec.Command("/usr/local/sbin/zfs", "unmount", "-au")
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if err := cmd.Run(); err != nil {
+		log.Fatalf("zfs-service: zfs unmount error: %v\n", err)
+	}
+}
diff --git a/storage/zfs/zfs-service/pkg.yaml b/storage/zfs/zfs-service/pkg.yaml
new file mode 100644
index 00000000..374927dc
--- /dev/null
+++ b/storage/zfs/zfs-service/pkg.yaml
@@ -0,0 +1,21 @@
+name: zfs-service
+variant: scratch
+shell: /toolchain/bin/bash
+dependencies:
+  - stage: base
+steps:
+  - cachePaths:
+      - /.cache/go-build
+      - /go/pkg
+    build:
+      - |
+        export PATH=${PATH}:${TOOLCHAIN}/go/bin
+        cp -r /pkg/* .
+        CGO_ENABLED=0 go build -ldflags "-s -w" -trimpath -o zfs-service main.go
+    install:
+      - |
+        mkdir -p /rootfs/usr/local/lib/containers/zfs-service
+        cp zfs-service /rootfs/usr/local/lib/containers/zfs-service/
+finalize:
+  - from: /rootfs
+    to: /rootfs