diff --git a/README.md b/README.md
index 12e7a867..3416e40b 100644
--- a/README.md
+++ b/README.md
@@ -58,6 +58,14 @@ The architectures supported by this image are:
 | arm64 | ✅ | arm64v8-\<version tag\> |
 | armhf | ❌ | |
 
+## Version Tags
+
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
+
+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable Unifi Controller releases. |
+| mongoless | ✅ | Stable Unifi Controller releases without mongodb included. |
 ## Application Setup
 
 The webui is at https://ip:8443, setup with the first run wizard.
@@ -272,6 +280,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.03.23:** - Add mongoless branch.
 * **10.03.23:** - Test writing to /run/unifi and symlink to /config/run if it fails.
 * **20.02.23:** - Migrate to s6v3, install deb package on build, fix permissions.
 * **23.01.23:** - Exclude `run` from `/config` volume.
diff --git a/readme-vars.yml b/readme-vars.yml
index 4e020e05..ab1a7814 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -13,7 +13,10 @@ available_architectures:
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 
 # development version
-development_versions: false
+development_versions: true
+development_versions_items:
+  - { tag: "latest", desc: "Stable Unifi Controller releases." }
+  - { tag: "mongoless", desc: "Stable Unifi Controller releases without mongodb included." }
 
 # container parameters
 param_container_name: "{{ project_name }}"
@@ -68,6 +71,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.03.23:", desc: "Add mongoless branch."}
   - { date: "10.03.23:", desc: "Test writing to /run/unifi and symlink to /config/run if it fails."}
   - { date: "20.02.23:", desc: "Migrate to s6v3, install deb package on build, fix permissions."}
   - { date: "23.01.23:", desc: "Exclude `run` from `/config` volume."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-unifi-controller-config/run b/root/etc/s6-overlay/s6-rc.d/init-unifi-controller-config/run
index fa9c5507..75e516ce 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-unifi-controller-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-unifi-controller-config/run
@@ -78,7 +78,7 @@ fi
 if [[ ! -f /config/data/keystore ]]; then
     keytool -genkey -keyalg RSA -alias unifi -keystore /config/data/keystore \
     -storepass aircontrolenterprise -keypass aircontrolenterprise -validity 3650 \
-    -keysize 4096 -dname "cn=unifi"
+    -keysize 4096 -dname "cn=unifi" -ext san=dns:unifi
 fi
 
 # permissions