diff --git a/overlay/opt/emcomm-tools/bin/et-bbs-server b/overlay/opt/emcomm-tools/bin/et-bbs-server
index e995ef0..05abd25 100755
--- a/overlay/opt/emcomm-tools/bin/et-bbs-server
+++ b/overlay/opt/emcomm-tools/bin/et-bbs-server
@@ -13,8 +13,8 @@
 source /opt/emcomm-tools/bin/et-common
 
 BBS_CONF_DIR=${HOME}/.local/share/emcomm-tools/bbs-server
-BBS_CONF_FILE=${BBS_CONF_DIR}/bpq32.conf
-BBS_CONF_FILE_TEMPLATE=/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.conf
+BBS_CONF_FILE=${BBS_CONF_DIR}/bpq32.cfg
+BBS_CONF_FILE_TEMPLATE=/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.cfg
 
 usage() {
   echo "usage: $(basename $0) <command>"
diff --git a/overlay/opt/emcomm-tools/bin/et-mode b/overlay/opt/emcomm-tools/bin/et-mode
index aaf735b..762ed3d 100755
--- a/overlay/opt/emcomm-tools/bin/et-mode
+++ b/overlay/opt/emcomm-tools/bin/et-mode
@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 6 November 2024
-# Updated  : 18 March 2025
+# Updated  : 25 March 2025
 # Purpose  : Configures the system for a specific mode of operation
 
 # Use a simple text file to save the state of the last mode selected
@@ -16,6 +16,7 @@ MODE_ID_APRS_DIGIPEATER="aprs-digipeater"
 MODE_ID_APRS_CLIENT="aprs-client" 
 MODE_ID_BBS_CLIENT="bbs-client" 
 MODE_ID_BBS_CLIENT2="bbs-client2" 
+MODE_ID_BBS_SERVER="bbs-server" 
 MODE_ID_CHAT_CLIENT="chat-chattervox" 
 MODE_ID_PACKET_DIGIPEATER="packet-digipeater" 
 MODE_ID_WINLINK_ARDOP="winlink-ardop" 
@@ -133,6 +134,7 @@ options+=("${MODE_ID_NONE}" "No mode selected")
 options+=("${MODE_ID_APRS_CLIENT}" "APRS Client (YAAC)")
 options+=("${MODE_ID_BBS_CLIENT}" "BBS Client (Paracon)")
 options+=("${MODE_ID_BBS_CLIENT2}" "BBS Client (QtTermTCP)")
+options+=("${MODE_ID_BBS_SERVER}" "BBS Server (LinBPQ)")
 options+=("${MODE_ID_CHAT_CLIENT}" "Chat (chattervox)")
 options+=("${MODE_ID_APRS_DIGIPEATER}" "APRS Digipeater")
 options+=("${MODE_ID_PACKET_DIGIPEATER}" "Packet Digipeater")
@@ -220,6 +222,11 @@ if [ $exit_status -eq 0 ]; then
       et-log "Starting QtTermTCP."
       et-qttermtcp start
     ;;
+    ${MODE_ID_BBS_SERVER})
+      start_and_wait_for_service et-service-direwolf-simple
+      et-log "Starting BBS server."
+      et-bbs-server start
+    ;;
     ${MODE_ID_CHAT_CLIENT})
       start_and_wait_for_service et-service-direwolf-simple
       et-log "Starting chattervox"
diff --git a/overlay/opt/emcomm-tools/bin/et-system-info b/overlay/opt/emcomm-tools/bin/et-system-info
index 529de30..416c79d 100755
--- a/overlay/opt/emcomm-tools/bin/et-system-info
+++ b/overlay/opt/emcomm-tools/bin/et-system-info
@@ -2,7 +2,7 @@
 #
 # Author   : Gaston Gonzalez
 # Date     : 6 October 2024
-# Updated  : 7 February 2025
+# Updated  : 25 March 2025
 # Purpose  : Utility script for dumping system information
 
 function usage() {
@@ -178,6 +178,7 @@ case $1 in
     MODE_ID_APRS_DIGIPEATER="aprs-digipeater"
     MODE_ID_BBS_CLIENT="bbs-client"
     MODE_ID_BBS_CLIENT2="bbs-client2"
+    MODE_ID_BBS_SERVER="bbs-server"
     MODE_ID_CHAT_CLIENT="chat-chattervox"
     MODE_ID_PACKET_DIGIPEATER="packet-digipeater"
     MODE_ID_APRS_CLIENT="aprs-client"
@@ -208,6 +209,9 @@ case $1 in
       ${MODE_ID_BBS_CLIENT2})
         echo "BBS Client"
       ;;
+      ${MODE_ID_BBS_SERVER})
+        echo "BBS Server"
+      ;;
       ${MODE_ID_CHAT_CLIENT})
         echo "Chat (chattervox)"
       ;;
diff --git a/overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.conf b/overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.cfg
similarity index 99%
rename from overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.conf
rename to overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.cfg
index 11034f7..ffe8435 100644
--- a/overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.conf
+++ b/overlay/opt/emcomm-tools/conf/template.d/bbs/bpq32.simple.cfg
@@ -1,5 +1,5 @@
 SIMPLE
-LOCATOR={{{{ET_GRID}}
+LOCATOR={{ET_GRID}}
 NODECALL={{ET_CALLSIGN}}-7
 NODEALIAS=ETCNDE