diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de8acf2b8a..330d157d3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -149,8 +149,8 @@ jobs:
       # disable unused repositories to have faster refresh
       run: zypper modifyrepo -d repo-non-oss repo-openh264 repo-update && ( zypper ref || zypper ref || zypper ref )
 
-    - name: Install Ruby development files
-      run: zypper --non-interactive install gcc gcc-c++ make openssl-devel ruby-devel npm augeas-devel
+    - name: Install Ruby development files and XML tooling
+      run: zypper --non-interactive install gcc gcc-c++ make openssl-devel ruby-devel npm augeas-devel xmlstarlet
 
     - name: Install RubyGems dependencies
       run: bundle config set --local with 'development' && bundle install
@@ -158,6 +158,10 @@ jobs:
     - name: Generate doc
       run: bundle exec yardoc --fail-on-warning
 
+    - name: Check that introspected API and its docs have not diverged
+      run: make -C ../doc check
+
+
   integration-tests:
     timeout-minutes: 60
     runs-on: ubuntu-latest
diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
index 4516c94e4c..9d3c6505b0 100644
--- a/.github/workflows/github-pages.yml
+++ b/.github/workflows/github-pages.yml
@@ -38,9 +38,6 @@ jobs:
           sudo apt-get update
           sudo apt-get --assume-yes --no-install-recommends install xmlto docbook-xsl xmlstarlet
 
-      - name: Check that introspected API and its docs have not diverged
-        run: make -C doc check
-
       - name: Build HTML via DocBook
         run: make -C doc
 
diff --git a/doc/Makefile b/doc/Makefile
index 0f43bebada..e704a15195 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -6,4 +6,4 @@ all:
 	cp index.html dist
 
 check:
-	$(MAKE) -C dbus diff
+	$(MAKE) -C dbus check
diff --git a/doc/dbus/Makefile b/doc/dbus/Makefile
index a37a0506f6..7195475146 100644
--- a/doc/dbus/Makefile
+++ b/doc/dbus/Makefile
@@ -23,7 +23,8 @@ SHELL=/bin/bash
 
 # check that the implementation and documentation haven't diverged
 # TODO: factor out a script to decouple Make syntax from the rest
-diff: ${tmpdir}
+diff: check
+check: ${tmpdir}
 	ALL_GOOD=true; \
 	for doc_xml in org.opensuse.Agama*.doc.xml; do \
 	  IFACE=$${doc_xml%.doc.xml}; \
diff --git a/doc/dbus/bus/README.md b/doc/dbus/bus/README.md
index 13d361c517..36328c2abe 100644
--- a/doc/dbus/bus/README.md
+++ b/doc/dbus/bus/README.md
@@ -1 +1,22 @@
-FIXME: describe how to maintain these (semi)automatically
+The `*.bus.xml` files here are produced by introspecting actual objects
+exported by the Agama services.
+
+The files are produced by `seed.sh`.
+- FIXME: run it in CI.
+- FIXME: make it easy to run it *and* commit the result to git.
+
+Each file name represents a D-Bus **interface** that we want to document.
+That is why some files have symlinks pointing to them (and why you see no
+`org.freedesktop.DBus.*` filenames, we don't need to document those interfaces)
+
+The interfaces implemented in Rust already have documentation in them
+(courtesy of Rust macro magic) but it is not in the exact format that
+`gdbus-codegen` understands :sob:.
+
+You are expected to copy a new `foo.bus.xml` to `../foo.doc.xml`, remove the
+`<interface>` elements other than `foo`, and add meaningful documentation.
+Run `make check`.
+
+FIXME: Storage1.ZFCP and Storage1.DASD needs an s390 machine to run,
+we should expose them on x86 too (returning errors), perhaps guarded by an
+`AGAMA_IGNORE_ARCH` flag?
diff --git a/doc/dbus/bus/org.opensuse.Agama.Locale1.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Locale1.bus.xml
index b3b346f936..b8a0dfb0c7 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Locale1.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Locale1.bus.xml
@@ -2,10 +2,29 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg type="s" direction="out"/>
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg type="v" direction="out"/>
+    </method>
+    <method name="Set">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
+    <method name="GetAll">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg type="a{sv}" direction="out"/>
+    </method>
+    <!--
+     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
+     -->
+    <signal name="PropertiesChanged">
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
+    </signal>
   </interface>
   <interface name="org.opensuse.Agama.Locale1">
     <!--
@@ -29,5 +48,17 @@
     <property name="Timezone" type="s" access="readwrite"/>
     <property name="VConsoleKeyboard" type="s" access="readwrite"/>
   </interface>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+  <interface name="org.freedesktop.DBus.Peer">
+    <method name="Ping">
+    </method>
+    <method name="GetMachineId">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
 </node>
 
diff --git a/doc/dbus/bus/org.opensuse.Agama.Questions1.Generic.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Questions1.Generic.bus.xml
index 0a6eaeda47..44e8169cb6 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Questions1.Generic.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Questions1.Generic.bus.xml
@@ -1,37 +1,49 @@
+
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/opensuse/Agama/Questions1/1">
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="v"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg type="v" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="val" direction="in" type="v"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="a{sv}"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg type="a{sv}" direction="out"/>
     </method>
+    <!--
+     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
+     -->
     <signal name="PropertiesChanged">
-      <arg name="interface" type="s"/>
+      <arg name="interface_name" type="s"/>
       <arg name="changed_properties" type="a{sv}"/>
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
+  <interface name="org.freedesktop.DBus.Peer">
+    <method name="Ping">
+    </method>
+    <method name="GetMachineId">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+  <interface name="org.opensuse.Agama.Questions1.Generic">
+    <property name="Answer" type="s" access="readwrite"/>
+    <property name="DefaultOption" type="s" access="read"/>
+    <property name="Id" type="u" access="read"/>
+    <property name="Options" type="as" access="read"/>
+    <property name="Text" type="s" access="read"/>
+  </interface>
   <interface name="org.freedesktop.DBus.Introspectable">
     <method name="Introspect">
-      <arg name="xml_data" direction="out" type="s"/>
+      <arg type="s" direction="out"/>
     </method>
   </interface>
-  <interface name="org.opensuse.Agama.Questions1">
-    <property type="u" name="Id" access="read"/>
-    <property type="s" name="Text" access="read"/>
-    <property type="as" name="Options" access="read"/>
-    <property type="s" name="DefaultOption" access="read"/>
-    <property type="s" name="Answer" access="readwrite"/>
-  </interface>
 </node>
+
diff --git a/doc/dbus/bus/org.opensuse.Agama.Questions1.LuksActivation.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Questions1.LuksActivation.bus.xml
index 12d742ebde..4443ec2189 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Questions1.LuksActivation.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Questions1.LuksActivation.bus.xml
@@ -1,41 +1,53 @@
+
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/opensuse/Agama/Questions1/2">
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+  <interface name="org.freedesktop.DBus.Peer">
+    <method name="Ping">
+    </method>
+    <method name="GetMachineId">
+      <arg type="s" direction="out"/>
+    </method>
+  </interface>
+  <interface name="org.opensuse.Agama.Questions1.Generic">
+    <property name="Answer" type="s" access="readwrite"/>
+    <property name="DefaultOption" type="s" access="read"/>
+    <property name="Id" type="u" access="read"/>
+    <property name="Options" type="as" access="read"/>
+    <property name="Text" type="s" access="read"/>
+  </interface>
   <interface name="org.freedesktop.DBus.Properties">
     <method name="Get">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="v"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg type="v" direction="out"/>
     </method>
     <method name="Set">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="val" direction="in" type="v"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
     <method name="GetAll">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="a{sv}"/>
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg type="a{sv}" direction="out"/>
     </method>
+    <!--
+     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
+     -->
     <signal name="PropertiesChanged">
-      <arg name="interface" type="s"/>
+      <arg name="interface_name" type="s"/>
       <arg name="changed_properties" type="a{sv}"/>
       <arg name="invalidated_properties" type="as"/>
     </signal>
   </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="xml_data" direction="out" type="s"/>
-    </method>
-  </interface>
-  <interface name="org.opensuse.Agama.Questions1">
-    <property type="u" name="Id" access="read"/>
-    <property type="s" name="Text" access="read"/>
-    <property type="as" name="Options" access="read"/>
-    <property type="s" name="DefaultOption" access="read"/>
-    <property type="s" name="Answer" access="readwrite"/>
-  </interface>
   <interface name="org.opensuse.Agama.Questions1.LuksActivation">
-    <property type="s" name="Password" access="readwrite"/>
-    <property type="u" name="Attempt" access="read"/>
+    <property name="Attempt" type="y" access="read"/>
+    <property name="Password" type="s" access="readwrite"/>
   </interface>
 </node>
+
diff --git a/doc/dbus/bus/org.opensuse.Agama.Questions1.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Questions1.bus.xml
index 53ba763367..4f27c734c5 100644
--- a/doc/dbus/bus/org.opensuse.Agama.Questions1.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama.Questions1.bus.xml
@@ -1,61 +1,91 @@
+
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/opensuse/Agama/Questions1">
-  <interface name="org.freedesktop.DBus.Properties">
-    <method name="Get">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="v"/>
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.freedesktop.DBus.Peer">
+    <method name="Ping">
     </method>
-    <method name="Set">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="property_name" direction="in" type="s"/>
-      <arg name="val" direction="in" type="v"/>
-    </method>
-    <method name="GetAll">
-      <arg name="interface_name" direction="in" type="s"/>
-      <arg name="value" direction="out" type="a{sv}"/>
+    <method name="GetMachineId">
+      <arg type="s" direction="out"/>
     </method>
-    <signal name="PropertiesChanged">
-      <arg name="interface" type="s"/>
-      <arg name="changed_properties" type="a{sv}"/>
-      <arg name="invalidated_properties" type="as"/>
-    </signal>
   </interface>
-  <interface name="org.freedesktop.DBus.Introspectable">
-    <method name="Introspect">
-      <arg name="xml_data" direction="out" type="s"/>
+  <interface name="org.opensuse.Agama.Questions1">
+    <!--
+     creates new generic question without answer
+     -->
+    <method name="New">
+      <arg name="text" type="s" direction="in"/>
+      <arg name="options" type="as" direction="in"/>
+      <arg name="default_option" type="as" direction="in"/>
+      <arg type="o" direction="out"/>
+    </method>
+    <!--
+     creates new specialized luks activation question without answer and password
+     -->
+    <method name="NewLuksActivation">
+      <arg name="device" type="s" direction="in"/>
+      <arg name="label" type="s" direction="in"/>
+      <arg name="size" type="s" direction="in"/>
+      <arg name="attempt" type="y" direction="in"/>
+      <arg type="o" direction="out"/>
+    </method>
+    <!--
+     Removes question at given object path
+     -->
+    <method name="Delete">
+      <arg name="question" type="o" direction="in"/>
     </method>
   </interface>
   <interface name="org.freedesktop.DBus.ObjectManager">
     <method name="GetManagedObjects">
-      <arg name="res" direction="out" type="a{oa{sa{sv}}}"/>
+      <arg type="a{oa{sa{sv}}}" direction="out"/>
     </method>
+    <!--
+     This signal is emitted when either a new object is added or when an existing object gains
+     one or more interfaces. The `interfaces_and_properties` argument contains a map with the
+     interfaces and properties (if any) that have been added to the given object path.
+     -->
     <signal name="InterfacesAdded">
-      <arg name="object" type="o"/>
+      <arg name="object_path" type="o"/>
       <arg name="interfaces_and_properties" type="a{sa{sv}}"/>
     </signal>
+    <!--
+     This signal is emitted whenever an object is removed or it loses one or more interfaces.
+     The `interfaces` parameters contains a list of the interfaces that were removed.
+     -->
     <signal name="InterfacesRemoved">
-      <arg name="object" type="o"/>
+      <arg name="object_path" type="o"/>
       <arg name="interfaces" type="as"/>
     </signal>
   </interface>
-  <interface name="org.opensuse.Agama.Questions1">
-    <method name="New">
-      <arg name="text" direction="in" type="s"/>
-      <arg name="options" direction="in" type="as"/>
-      <arg name="default_option" direction="in" type="as"/>
-      <arg name="q" direction="out" type="o"/>
+  <interface name="org.freedesktop.DBus.Properties">
+    <method name="Get">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg type="v" direction="out"/>
     </method>
-    <method name="NewLuksActivation">
-      <arg name="device" direction="in" type="s"/>
-      <arg name="label" direction="in" type="s"/>
-      <arg name="size" direction="in" type="s"/>
-      <arg name="attempt" direction="in" type="y"/>
-      <arg name="q" direction="out" type="o"/>
+    <method name="Set">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg name="property_name" type="s" direction="in"/>
+      <arg name="value" type="v" direction="in"/>
     </method>
-    <method name="Delete">
-      <arg name="question" direction="in" type="o"/>
+    <method name="GetAll">
+      <arg name="interface_name" type="s" direction="in"/>
+      <arg type="a{sv}" direction="out"/>
+    </method>
+    <!--
+     Emits the `org.freedesktop.DBus.Properties.PropertiesChanged` signal.
+     -->
+    <signal name="PropertiesChanged">
+      <arg name="interface_name" type="s"/>
+      <arg name="changed_properties" type="a{sv}"/>
+      <arg name="invalidated_properties" type="as"/>
+    </signal>
+  </interface>
+  <interface name="org.freedesktop.DBus.Introspectable">
+    <method name="Introspect">
+      <arg type="s" direction="out"/>
     </method>
   </interface>
 </node>
+
diff --git a/doc/dbus/bus/org.opensuse.Agama.Storage1.ZFCP.Manager.bus.xml b/doc/dbus/bus/org.opensuse.Agama.Storage1.ZFCP.Manager.bus.xml
new file mode 100644
index 0000000000..f959f913bc
--- /dev/null
+++ b/doc/dbus/bus/org.opensuse.Agama.Storage1.ZFCP.Manager.bus.xml
@@ -0,0 +1,9 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/opensuse/Agama/Storage1">
+  <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">
+    <method name="Probe">
+    </method>
+    <property type="b" name="AllowLUNScan" access="read"/>
+  </interface>
+</node>
diff --git a/doc/dbus/bus/org.opensuse.Agama1.Manager.bus.xml b/doc/dbus/bus/org.opensuse.Agama1.Manager.bus.xml
index 135f5d530d..ff8365b815 100644
--- a/doc/dbus/bus/org.opensuse.Agama1.Manager.bus.xml
+++ b/doc/dbus/bus/org.opensuse.Agama1.Manager.bus.xml
@@ -48,8 +48,11 @@
       <arg name="user" direction="in" type="s"/>
       <arg name="tarball_filesystem_path" direction="out" type="s"/>
     </method>
+    <method name="Finish">
+    </method>
     <property type="aa{sv}" name="InstallationPhases" access="read"/>
     <property type="u" name="CurrentInstallationPhase" access="read"/>
+    <property type="b" name="IguanaBackend" access="read"/>
     <property type="as" name="BusyServices" access="read"/>
   </interface>
 </node>
diff --git a/doc/dbus/bus/seed.sh b/doc/dbus/bus/seed.sh
index 570d248502..51f6885ce5 100755
--- a/doc/dbus/bus/seed.sh
+++ b/doc/dbus/bus/seed.sh
@@ -22,17 +22,21 @@ look Software1.Proposal
 look Storage1
 look Users1
 
+abusctl introspect --xml-interface \
+  ${DD}.Questions1 \
+  ${SS}/Questions1 \
+  | sed -e '/  <node/,/  <\/node/d' \
+  > ${DD}.Questions1.bus.xml
+# ^ remove detailed introspection of subnodes
+
 abusctl call \
   ${DD}.Questions1 \
   ${SS}/Questions1 \
   ${DD}.Questions1 \
   New sasas "should I stay or should I go" 2 yes no 1 yes
-# FIXME: the ruby code talks about a Generic interface but then
-# we end up declaring the properties on org.opensuse.Agama.Questions1
-# which is the same as what the factory object uses. WTF.
 abusctl introspect --xml-interface \
   ${DD}.Questions1 \
-  ${SS}/Questions1/1 \
+  ${SS}/Questions1/0 \
   > ${DD}.Questions1.Generic.bus.xml
 
 abusctl call \
@@ -42,5 +46,5 @@ abusctl call \
    NewLuksActivation sssy "/dev/tape1" "ZX Spectrum games" "90 minutes" 1
 abusctl introspect --xml-interface \
   ${DD}.Questions1 \
-  ${SS}/Questions1/2 \
+  ${SS}/Questions1/1 \
   > ${DD}.Questions1.LuksActivation.bus.xml
diff --git a/doc/dbus/make-index b/doc/dbus/make-index
index 9f9df4cfbe..4c97fe442e 100755
--- a/doc/dbus/make-index
+++ b/doc/dbus/make-index
@@ -1,5 +1,6 @@
 #!/bin/sh
 echo "<!-- do not edit: generated by make-index -->"
+echo "<head><title>Agama D-Bus API</title></head>"
 echo "<ul>"
 for F in tmp/ref-*.xml; do
   F=${F#tmp/}
@@ -8,3 +9,4 @@ for F in tmp/ref-*.xml; do
   echo "                >${F#ref-}</a></li>"
 done
 echo "</ul>"
+echo "<a href="..">up</a>"
diff --git a/doc/dbus/org.opensuse.Agama.Questions1.Generic.doc.xml b/doc/dbus/org.opensuse.Agama.Questions1.Generic.doc.xml
new file mode 100644
index 0000000000..8d6f667341
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama.Questions1.Generic.doc.xml
@@ -0,0 +1,35 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.opensuse.Agama.Questions1.Generic">
+    <!--
+        Answer:
+        Answer for the question. Clients set an option as answer.
+    -->
+    <property name="Answer" type="s" access="readwrite"/>
+
+    <!--
+        DefaultOption:
+        Clients should offer this option as default option for answering the question.
+    -->
+    <property name="DefaultOption" type="s" access="read"/>
+
+    <!--
+        Id:
+        Question id. The question is exported at *root_path/id*.
+    -->
+    <property name="Id" type="u" access="read"/>
+
+    <!--
+        Options:
+        Options for answering the question. The question only admits an option from the list as valid answer.
+    -->
+    <property name="Options" type="as" access="read"/>
+
+    <!--
+        Text:
+        Text of the question. Clients show this text to the users.
+    -->
+    <property name="Text" type="s" access="read"/>
+  </interface>
+</node>
diff --git a/doc/dbus/org.opensuse.Agama.Questions1.LuksActivation.doc.xml b/doc/dbus/org.opensuse.Agama.Questions1.LuksActivation.doc.xml
new file mode 100644
index 0000000000..3473a7c5ce
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama.Questions1.LuksActivation.doc.xml
@@ -0,0 +1,19 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.opensuse.Agama.Questions1.LuksActivation">
+    <!--
+         Attempt:
+         Current attempt to decrypt the device. This value is useful for clients to know if the very same
+         question is asked again (i.e., when the provided password did not work).
+    -->
+    <property name="Attempt" type="y" access="read"/>
+
+    <!--
+        Password:
+        Password provided to decrypt a LUKS device.
+    -->
+    <property name="Password" type="s" access="readwrite"/>
+  </interface>
+</node>
+
diff --git a/doc/dbus/org.opensuse.Agama.Questions1.doc.xml b/doc/dbus/org.opensuse.Agama.Questions1.doc.xml
index fb75d766ba..16d4bb24ca 100644
--- a/doc/dbus/org.opensuse.Agama.Questions1.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Questions1.doc.xml
@@ -1,6 +1,6 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
-<node name="/org/opensuse/Agama/Questions1">
+<node>
   <!--
       org.opensuse.Agama.Questions1:
 
@@ -26,14 +26,14 @@ when the question is answered.
       <arg name="text" direction="in" type="s"/>
       <arg name="options" direction="in" type="as"/>
       <arg name="default_option" direction="in" type="as"/>
-      <arg name="q" direction="out" type="o"/>
+      <arg direction="out" type="o"/>
     </method>
     <method name="NewLuksActivation">
       <arg name="device" direction="in" type="s"/>
       <arg name="label" direction="in" type="s"/>
       <arg name="size" direction="in" type="s"/>
       <arg name="attempt" direction="in" type="y"/>
-      <arg name="q" direction="out" type="o"/>
+      <arg direction="out" type="o"/>
     </method>
     <method name="Delete">
       <arg name="question" direction="in" type="o"/>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.ZFCP.Manager.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.ZFCP.Manager.doc.xml
new file mode 100644
index 0000000000..b7e40f85ef
--- /dev/null
+++ b/doc/dbus/org.opensuse.Agama.Storage1.ZFCP.Manager.doc.xml
@@ -0,0 +1,15 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/org/opensuse/Agama/Storage1">
+  <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">
+    <!--
+      Probes the zFCP controllers and disks.
+    -->
+    <method name="Probe">
+    </method>
+    <!--
+      Whether the option allow_lun_scan is active.
+    -->
+    <property type="b" name="AllowLUNScan" access="read"/>
+  </interface>
+</node>
diff --git a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
index 83cbc012bb..2a51000dd2 100644
--- a/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
+++ b/doc/dbus/org.opensuse.Agama.Storage1.doc.xml
@@ -1,6 +1,8 @@
 <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
 "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
 <node name="/org/opensuse/Agama/Storage1">
+  <node name="zfcp_controllers" />
+  <node name="zfcp_disks" />
   <interface name="org.opensuse.Agama.Storage1">
     <method name="Probe">
     </method>
@@ -20,15 +22,4 @@
     -->
     <property type="b" name="DeprecatedSystem" access="read"/>
   </interface>
-  <interface name="org.opensuse.Agama.Storage1.ZFCP.Manager">
-    <!--
-      Probes the zFCP controllers and disks.
-    -->
-    <method name="Probe">
-    </method>
-    <!--
-      Whether the option allow_lun_scan is active.
-    -->
-    <property type="b" name="AllowLUNScan" access="read"/>
-  </interface>
 </node>
diff --git a/doc/dbus/org.opensuse.Agama1.Manager.doc.xml b/doc/dbus/org.opensuse.Agama1.Manager.doc.xml
index f25653fdb3..02a8009499 100644
--- a/doc/dbus/org.opensuse.Agama1.Manager.doc.xml
+++ b/doc/dbus/org.opensuse.Agama1.Manager.doc.xml
@@ -13,6 +13,8 @@
       <arg name="user" direction="in" type="s"/>
       <arg name="tarball_filesystem_path" direction="out" type="s"/>
     </method>
+    <method name="Finish">
+    </method>
 
     <!--
         InstallationPhases:
@@ -60,6 +62,8 @@ installed.
     -->
     <property type="u" name="CurrentInstallationPhase" access="read"/>
 
+    <property access="read" name="IguanaBackend" type="b"></property>
+
     <!--
         CurrentInstallationPhase:
         List of names of the currently busy services.
diff --git a/doc/dbus_api.md b/doc/dbus_api.md
index 531f6936d8..b351b01067 100644
--- a/doc/dbus_api.md
+++ b/doc/dbus_api.md
@@ -635,43 +635,6 @@ See the new-style [reference][usr-ref] ([source][usr-src]).
 [usr-ref]: https://opensuse.github.io/agama/dbus/ref-org.opensuse.Agama.Users1.html
 [usr-src]: dbus/org.opensuse.Agama.Users1.doc.xml
 
-## Questions
-
-
-### org.opensuse.Agama.Questions1
-
-<!--
-TODO: seed a question object and a luks question object
--->
-#### Properties
-
-- Id -> unsigned 32-bit integer (r)
-  Question id. The question is exported at *root_path/id*.
-
-- Text -> string (r)
-  Text of the question. Clients show this text to the users.
-
-- Options -> array(string) (r)
-  Options for answering the question. The question only admits an option from the list as valid
-  answer.
-
-- DefaultOption -> string (r)
-  Clients should offer this option as default option for answering the question.
-
-- Answer -> string (rw)
-  Answer for the question. Clients set an option as answer.
-
-### org.opensuse.Agama.Questions1.LuksActivation
-
-#### Properties
-
-- Password -> string (rw)
-  Password provided to decrypt a LUKS device.
-
-- Attempt -> unsigned 32-bit integer (r)
-  Current attempt to decrypt the device. This value is useful for clients to know if the very same
-  question is asked again (i.e., when the provided password did not work).
-
 ## Manager
 
 See the new-style [reference][mgr-ref] ([source][mgr-src]).