diff --git a/documentation/_scripts/genconfigstore.py b/documentation/_scripts/genconfigstore.py
index 8940a9b90f21463a3e056f6fc2df28501953d804..571af0ea925d8f04c2ef5992152e53a9c71df8a6 100755
--- a/documentation/_scripts/genconfigstore.py
+++ b/documentation/_scripts/genconfigstore.py
@@ -40,7 +40,7 @@ def make_rst_table(headers, data):
 
 
 def make_rst_table_from_dict(headers, data):
-	return make_rst_table(headers, [(k, v) for k, v in data.items()])
+	return make_rst_table(headers, sorted(data.items()))
 
 
 def fix_whitespace(text):
diff --git a/documentation/userguide/configstore/bootwrapper.rst b/documentation/userguide/configstore/bootwrapper.rst
index a401f2f0d495ee1eebea191d03dd8f5f20044721..9c522b268e8d77da20d58f90e65482457a84c762 100644
--- a/documentation/userguide/configstore/bootwrapper.rst
+++ b/documentation/userguide/configstore/bootwrapper.rst
@@ -33,8 +33,8 @@ Run-Time Variables
 ============== =======
 rtvar          default
 ============== =======
-LOCAL_NET_PORT 8022
 BOOTWRAPPER    <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 ============== =======
 
diff --git a/documentation/userguide/configstore/cca-3world.rst b/documentation/userguide/configstore/cca-3world.rst
index c6dd8ac9b99e2d27cd3b11eebb07fb0059bcafd5..b5ab2cb4700f47ceed1e90425153decdbfddadcf 100644
--- a/documentation/userguide/configstore/cca-3world.rst
+++ b/documentation/userguide/configstore/cca-3world.rst
@@ -26,8 +26,11 @@ For the time being, there is an issue in the linux kernel's handling of 9p which
 .. code-block:: shell
 
   $ cd ~/.shrinkwrap/package/cca-3world
+  $ ORIGINAL_PATH=$PATH
+  $ export PATH=$PATH:~/.shrinkwrap/build/build/cca-3world/buildroot/host/bin/
   $ e2fsck -fp rootfs.ext2
   $ resize2fs rootfs.ext2 256M
+  $ export PATH=$ORIGINAL_PATH
   $ sudo su
   # mkdir mnt
   # mount rootfs.ext2 mnt
@@ -72,7 +75,7 @@ When the linux kernel 9p issue will be fixed, the shared directory approach can
   $ shrinkwrap run cca-3world.yaml --rtvar ROOTFS=rootfs.ext2 --rtvar SHARE=.
 
 
-Then, once the host has booted, log in as "root" (no password) and mount the shared folder to "/cca" and change dir to it. The realm guest can then be launched as previously:
+Then, once the host has booted, log in as "root" (no password) and mount the shared folder to "/cca" and change dir to it. The realmn guest can then be launched as previously:
 
 .. code-block:: shell
 
@@ -101,14 +104,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         ${artifact:KERNEL}
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/cca-4world.rst b/documentation/userguide/configstore/cca-4world.rst
index 0fc46c801f4a490f584128fb7383d559620ff232..c28e06ab248a3ed5d535f1cca8d35ae8763510a2 100644
--- a/documentation/userguide/configstore/cca-4world.rst
+++ b/documentation/userguide/configstore/cca-4world.rst
@@ -60,14 +60,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         ${artifact:KERNEL}
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ffa-hafnium-optee.rst b/documentation/userguide/configstore/ffa-hafnium-optee.rst
index 5128aa77353001c95faa42f99a8b5257cbd40212..e6370dff2a85215a9562b882fbe699c38191e6b7 100644
--- a/documentation/userguide/configstore/ffa-hafnium-optee.rst
+++ b/documentation/userguide/configstore/ffa-hafnium-optee.rst
@@ -31,14 +31,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ffa-optee.rst b/documentation/userguide/configstore/ffa-optee.rst
index 388ecd3c86e72de5cb56da12746abf6f79e3efe8..8840f707f0efd19a2d199101a1383c83d28828af 100644
--- a/documentation/userguide/configstore/ffa-optee.rst
+++ b/documentation/userguide/configstore/ffa-optee.rst
@@ -31,14 +31,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ffa-tftf.rst b/documentation/userguide/configstore/ffa-tftf.rst
index ee62b95a4b105bf06cb3abd24e5e2710b80deed6..aa8f1a24e652f8e458027b4d2ec8b880789b47c1 100644
--- a/documentation/userguide/configstore/ffa-tftf.rst
+++ b/documentation/userguide/configstore/ffa-tftf.rst
@@ -31,14 +31,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ns-edk2-optee.rst b/documentation/userguide/configstore/ns-edk2-optee.rst
index aa1f0858cd69a6a94b44741b3c55730471161f10..936b6c1b615db640e820dc7052ffdd13328cbd1b 100644
--- a/documentation/userguide/configstore/ns-edk2-optee.rst
+++ b/documentation/userguide/configstore/ns-edk2-optee.rst
@@ -31,14 +31,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ns-edk2.rst b/documentation/userguide/configstore/ns-edk2.rst
index 04d321b5fae70977e325a07094b288a7c53b59c9..2fde25a17a2b74f92837df21949e82510f5e860d 100644
--- a/documentation/userguide/configstore/ns-edk2.rst
+++ b/documentation/userguide/configstore/ns-edk2.rst
@@ -46,14 +46,14 @@ Run-Time Variables
 ============== ===============================================================
 rtvar          default
 ============== ===============================================================
-LOCAL_NET_PORT 8022
 BL1            ${artifact:BL1}
-FIP            ${artifact:FIP}
-DTB            ${artifact:DTB}
 CMDLINE        console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda ip=dhcp
+DTB            ${artifact:DTB}
+EDK2FLASH      <empty>
+FIP            ${artifact:FIP}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
-EDK2FLASH      <empty>
 ============== ===============================================================
 
diff --git a/documentation/userguide/configstore/ns-preload.rst b/documentation/userguide/configstore/ns-preload.rst
index 4531fd0969d37c2ef2852240e06efb3de77e91a6..28ae1d9669999d07476d24544855b30ae898ac0f 100644
--- a/documentation/userguide/configstore/ns-preload.rst
+++ b/documentation/userguide/configstore/ns-preload.rst
@@ -42,10 +42,10 @@ Run-Time Variables
 ============== ================
 rtvar          default
 ============== ================
-LOCAL_NET_PORT 8022
 BL31           ${artifact:BL31}
 DTB            ${artifact:DTB}
 KERNEL         <null>
+LOCAL_NET_PORT 8022
 ROOTFS         <empty>
 SHARE          <empty>
 ============== ================