diff --git a/nbde/system/installed-base.scm b/nbde/system/installed-base.scm
index 62b648d..d33a621 100644
--- a/nbde/system/installed-base.scm
+++ b/nbde/system/installed-base.scm
@@ -5,7 +5,6 @@
   #:use-module (gnu services networking)
   #:use-module (gnu services ssh)
   #:use-module (guix gexp)
-  #:use-module (nbde system boot-store)
   #:export (nbde-installed-operating-system))
 
 (define %tribe-one-guix-substitute-url
@@ -50,7 +49,6 @@ runtime-discovered boot and filesystem values from the installer."
      (append
      extra-services
       (list (service dhcpcd-service-type)
-            (boot-store-staging-service)
             (service elogind-service-type)
             (service agetty-service-type
                      (agetty-configuration
diff --git a/tribes/system/installer.scm b/tribes/system/installer.scm
index 98067fd..aaaf5c7 100644
--- a/tribes/system/installer.scm
+++ b/tribes/system/installer.scm
@@ -62,7 +62,8 @@
                                             file-systems
                                             initrd
                                             interface
-                                            authorized-keys-file)
+                                            authorized-keys-file
+                                            (extra-services '()))
   "Return an installed NBDE operating-system extended with PostgreSQL and the
 Tribes service.  By default it uses the pinned upstream package; setting
 TRIBES_SOURCE_DIRECTORY switches to a development source override."
@@ -152,4 +153,5 @@ TRIBES_SOURCE_DIRECTORY switches to a development source override."
      #:initrd initrd
      #:interface interface
      #:authorized-keys-file authorized-keys-file
-     #:extra-services (tribes-node-services node-config))))
+     #:extra-services (append (tribes-node-services node-config)
+                              extra-services))))