diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b14c69b9..ef78ad67 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -126,6 +126,7 @@ jobs:
       id: copy
       run: |
         source repository/src/config
+        source repository/src/variants/beamos/config
         NOW=$(date +"%Y-%m-%d-%H%M")
         # When building a variant, it is built in workspace-$VARIANT
         if [ -n $VARIANT ]; then
diff --git a/src/config b/src/config
index 6bddb497..22fefc45 100755
--- a/src/config
+++ b/src/config
@@ -1,3 +1 @@
-export DIST_NAME=OctoPi
-export DIST_VERSION=0.18.1
 export MODULES="base(raspicam, network, disable-services(dev-libs(octopi)), password-for-sudo)"
diff --git a/src/modules/beamos/filesystem/home/pi/.config/neofetch/config.conf b/src/modules/beamos/filesystem/home/pi/.config/neofetch/config.conf
index e6d65edf..f4282283 100644
--- a/src/modules/beamos/filesystem/home/pi/.config/neofetch/config.conf
+++ b/src/modules/beamos/filesystem/home/pi/.config/neofetch/config.conf
@@ -14,6 +14,10 @@ device_info() {
     fi
 }
 
+beamos_version() {
+    echo "$(cat /etc/beamos_version)"
+}
+
 print_info() {
     info title
     info underline
@@ -21,6 +25,7 @@ print_info() {
     info "OS" distro
     prin "Serial Number" "$(device_info serial)"
     prin "Beam OS Identifier" "$(device_info octopi)"
+    prin "Beam OS version" $(beamos_version)
     info "Host" model
     info "Local IP" local_ip
     info "Packages" packages
diff --git a/src/modules/beamos/start_chroot_script b/src/modules/beamos/start_chroot_script
index 6e5d66dd..df82ac2f 100755
--- a/src/modules/beamos/start_chroot_script
+++ b/src/modules/beamos/start_chroot_script
@@ -382,9 +382,8 @@ pushd /home/pi
       cp extras/netconnectd.service /etc/systemd/system/
       cp extras/eth0 /etc/network/interfaces.d/
     popd
-    echo 'EXTRA_OPTS="--debug"' >> /etc/default/netconnectd
     if [ "$BEAMOS_DEV" == "yes" ]; then
-      echo "nothing to do"
+      echo 'EXTRA_OPTS="--debug"' >> /etc/default/netconnectd
     else
       rm -rf $NETCONNECTD_PROJ
     fi
diff --git a/src/variants/beamos/config b/src/variants/beamos/config
index 3f17d67f..7b930bde 100755
--- a/src/variants/beamos/config
+++ b/src/variants/beamos/config
@@ -1,6 +1,7 @@
 #!/bin/sh
 # variant mrbeam, flavor default: override hostname & custom config setting
 export DIST_NAME=BeamOS
+export DIST_VERSION=0.18.2
 export BASE_OVERRIDE_HOSTNAME=MrBeam-XXXX
 export BASE_IMAGE_ENLARGEROOT=1700