diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 96ae3532..6638ed0e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,7 +33,7 @@ jobs:
         then
           flavors='{"flavor":"alpha 2R"}'
         else
-          flavors='{"flavor":"2R"}'
+          flavors='{"flavor":"mrb3 oprint173"}'
         fi
         echo "::set-output name=matrix::{\"include\":[$flavors]}"
 
@@ -50,7 +50,7 @@ jobs:
         sudo apt update
         sudo apt install coreutils p7zip-full qemu-user-static
 
-    - name: Configure SSH-Keys inside image
+    - name: Configure SSH-Keys for pipeline
       env:
         SSH_KEY_MOUNTMANAGER: ${{ secrets.DEPLOY_KEY_MOUNTMANAGER }}
         SSH_KEY_MRBCHECK: ${{ secrets.DEPLOY_KEY_MRBCHECK }}
@@ -60,6 +60,7 @@ jobs:
         echo "$SSH_KEY_BITBUCKET" > ~/.ssh/bitbucket.key
         echo "$SSH_KEY_MOUNTMANAGER" > ~/.ssh/mountmanager.key
         echo "$SSH_KEY_MRBCHECK" > ~/.ssh/mrbcheck.key
+       
         chmod 600 ~/.ssh/bitbucket.key
         chmod 600 ~/.ssh/mountmanager.key
         chmod 600 ~/.ssh/mrbcheck.key
@@ -120,6 +121,12 @@ jobs:
         sudo modprobe loop
         cd repository/src
         echo "export EXTRA_SSH_KEY='${{ secrets.SSH_BEAMOS01_RSA }}'" >> config
+        echo "export SSH_KEY_MRB3_CORE_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_CORE_PLUGIN }}'" >> config
+        echo "export SSH_KEY_MRB3_FINDME_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_FINDME_PLUGIN }}'" >> config
+        echo "export SSH_KEY_MRB3_CONNECT_PLUGIN='${{ secrets.DEPLOY_KEY_MRB3_CONNECT_PLUGIN }}'" >> config
+        echo "export SSH_KEY_MRB3_CONNECT_DAEMON='${{ secrets.DEPLOY_KEY_MRB3_CONNECT_DAEMON }}'" >> config
+        echo "export SSH_KEY_MRB3_DOC='${{ secrets.DEPLOY_KEY_MRB3_DOC }}'" >> config
+        echo "export SSH_KEY_MRB3_HAL='${{ secrets.DEPLOY_KEY_MRB3_HAL }}'" >> config
         sudo bash -x ./build_dist $VARIANT ${{ matrix.flavor }}
 
     - name: Copy output
diff --git a/src/modules/beamos/filesystem/home/pi/.ssh/config b/src/modules/beamos/filesystem/home/pi/.ssh/config
new file mode 100644
index 00000000..872c1496
--- /dev/null
+++ b/src/modules/beamos/filesystem/home/pi/.ssh/config
@@ -0,0 +1,18 @@
+Host github.com-mrb3-core-plugin
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-core-plugin
+Host github.com-mrb3-findMe-plugin
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-findMe-plugin
+Host github.com-mrb3-connect-plugin
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-connect-plugin
+Host github.com-mrb3-connect-daemon
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-connect-daemon
+Host github.com-mrb3-doc
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-doc
+Host github.com-mrb3-hal
+    HostName github.com
+    IdentityFile /home/pi/.ssh/mrb3-hal
diff --git a/src/modules/beamos/start_chroot_script b/src/modules/beamos/start_chroot_script
index d86ab996..510edcf3 100755
--- a/src/modules/beamos/start_chroot_script
+++ b/src/modules/beamos/start_chroot_script
@@ -58,16 +58,16 @@ enable_hw_serial() {
 add_mrb3() {
   echo "--- Installing Python3"
   # additional python3 packages (uncomment when needed +20sec)
-  apt-get -y install python3 python3-venv python3-dev
+  apt-get -y install python3.10 python3.10-venv python3.10-dev
   # create mrb virtual environments
   # TODO create mrb2 and mrb3 (python 2 and 3 versions)
-  sudo -u pi python3.7 -m venv /home/pi/mrb3
+  sudo -u pi python3.10 -m venv /home/pi/mrb3
 }
 
 OPRINT=/home/pi/oprint/bin
 
 pip_install() {
-  PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip --disable-pip-version-check install $@
+  PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip3 --disable-pip-version-check install $@
 }
 
 pip_install_dev_or_rm() {
@@ -206,7 +206,7 @@ mv ./micro /usr/bin/
 # Install a toml cli tool and neofetch presentation script
 # Can be used to edit / query /etc/mrbeam `crudini --get /etc/mrbeam "" hostname`
 apt-install python3-pip neofetch
-python3 -m pip install crudini
+python3.10 -m pip install crudini
 
 mkdir -p /root/.ssh
 # Add ssh creds to prevent errors when pulling from bitbucket
@@ -214,6 +214,7 @@ ssh-keyscan -t rsa bitbucket.org >> /root/.ssh/known_hosts
 
 mkdir -p /home/pi/.ssh
 ssh-keyscan -t rsa bitbucket.org >> /home/pi/.ssh/known_hosts
+ssh-keyscan -t rsa github.com >> /home/pi/.ssh/known_hosts
 chown 1000:1000 /home/pi/.ssh/known_hosts
 
 # Enable ssh identification for private packages in bitbucket.org
@@ -224,12 +225,44 @@ if [ -n "$EXTRA_SSH_KEY" ]; then
   chmod 0600 /root/.ssh/id_rsa
 fi
 
+if [ -n "$SSH_KEY_MRB3_CORE_PLUGIN" ]; then
+  echo "$SSH_KEY_MRB3_CORE_PLUGIN" > /home/pi/.ssh/mrb3-core-plugin
+  chmod 0600 /home/pi/.ssh/mrb3-core-plugin
+  chown pi:pi /home/pi/.ssh/mrb3-core-plugin
+fi
+
+if [ -n "$SSH_KEY_MRB3_FINDME_PLUGIN" ]; then
+  echo "$SSH_KEY_MRB3_FINDME_PLUGIN" > /home/pi/.ssh/mrb3-findMe-plugin
+  chmod 0600 /home/pi/.ssh/mrb3-findMe-plugin
+  chown pi:pi /home/pi/.ssh/mrb3-findMe-plugin
+fi
+if [ -n "$SSH_KEY_MRB3_CONNECT_PLUGIN" ]; then
+  echo "$SSH_KEY_MRB3_CONNECT_PLUGIN" > /home/pi/.ssh/mrb3-connect-plugin
+  chmod 0600 /home/pi/.ssh/mrb3-connect-plugin
+  chown pi:pi /home/pi/.ssh/mrb3-connect-plugin
+fi
+if [ -n "$SSH_KEY_MRB3_CONNECT_DAEMON" ]; then
+  echo "$SSH_KEY_MRB3_CONNECT_DAEMON" > /home/pi/.ssh/mrb3-connect-daemon
+  chmod 0600 /home/pi/.ssh/mrb3-connect-daemon
+  chown pi:pi /home/pi/.ssh/mrb3-connect-daemon
+fi
+if [ -n "$SSH_KEY_MRB3_DOC" ]; then
+  echo "$SSH_KEY_MRB3_DOC" > /home/pi/.ssh/mrb3-doc
+  chmod 0600 /home/pi/.ssh/mrb3-doc
+  chown pi:pi /home/pi/.ssh/mrb3-doc
+fi
+if [ -n "$SSH_KEY_MRB3_HAL" ]; then
+  echo "$SSH_KEY_MRB3_HAL" > /home/pi/.ssh/mrb3-hal
+  chmod 0600 /home/pi/.ssh/mrb3-hal
+  chown pi:pi /home/pi/.ssh/mrb3-hal
+fi
+
 pushd /home/pi
   # Add .local/bin to PATH and add link to octoprint there
   sudo -u pi mkdir -p .local/bin
   sudo -u pi ln -s /home/pi/oprint/bin/octoprint .local/bin/
   # Add symlink to preserve legacy compatibility for mrbtools
-  sudo -u pi ln -s oprint/lib/python2.7/site-packages
+  #  sudo -u pi ln -s oprint/lib/python2.7/site-packages
 
   if [ "$BEAMOS_INCLUDE_CHECK" = "yes" ]
   then
@@ -253,6 +286,7 @@ pushd /home/pi
       # picamera (OctoPrint-MrBeam dependency) needs to check /proc/cpuinfo at install time to figure out which model it's used with.
       cp /filesystem/picamera/cpuinfo.pi3bp /proc/cpuinfo
       gitclone BEAMOS_CAMERA_REPO OctoPrint-Camera
+      pip_install numpy==1.23.3
       pip_install_dev_or_rm ./OctoPrint-Camera
       set_plugin_update_conf_remote camera $BEAMOS_CAMERA_REPO_SHIP $BEAMOS_CAMERA_REPO_BRANCH
       rm /proc/cpuinfo
@@ -279,8 +313,14 @@ pushd /home/pi
       echo "Compiling OpenCV v.$BEAMOS_OPENCV_VERSION for python $PYTHON_VERSION -- This can take around an hour"
       # Following the pyimagesearch tutorial
       # https://www.pyimagesearch.com/2019/09/16/install-opencv-4-on-raspberry-pi-4-and-raspbian-buster/
-      DEV_LIBS_OPENCV="libjpeg-dev libtiff5-dev libjasper-dev libpng-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libatlas-base-dev gfortran libhdf5-dev libhdf5-serial-dev"
+#      DEV_LIBS_OPENCV="libjpeg-dev libtiff5-dev libjasper-dev libpng-dev libavcodec-dev libavformat-dev libswscale-dev libv4l-dev libxvidcore-dev libx264-dev libatlas-base-dev gfortran libhdf5-dev libhdf5-serial-dev"
+      DEV_LIBS_OPENCV="cmake gcc g++ python3-dev python3-numpy libavcodec-dev libavformat-dev libswscale-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libgtk-3-dev"
       apt-install $DEV_LIBS_OPENCV libhdf5-103
+
+      cp /filesystem/picamera/cpuinfo.pi3bp /proc/cpuinfo
+      pip_install opencv-python-headless
+      rm /proc/cpuinfo
+
       # TODO finish up
       sudo apt -y remove $DEV_LIBS_OPENCV # save space
 
@@ -290,13 +330,15 @@ pushd /home/pi
       # as you don't have to configure the OpenCV build and link everything.
       echo "--- Installing OpenCV from pip wheels ~ 10min because installs gtk"
       # After this operation, 1085 MB of additional disk space will be used.
-      apt-install python-opencv
+#      apt-install python-opencv
+      sudo apt-get -y install python3-opencv
       # link the global library to the oprint environment
-      ln -s /usr/lib/python2.7/dist-packages/cv2.arm-linux-gnueabihf.so /home/pi/oprint/lib/python2.7/cv2.so
+      ln -s /usr/lib/python3/dist-packages/cv2.cpython-37m-arm-linux-gnueabihf.so /home/pi/oprint/lib/python3.10/site-packages/cv2.so
       # Headless install (which fails)
       # PIP_DEFAULT_TIMEOUT=60 sudo -u pi $OPRINT/pip install opencv-python-headless
       # Install the opencv wheel available for raspberry (also fails)
       # PIP_DEFAULT_TIMEOUT=60 sudo -u pi /home/pi/oprint/bin/pip install opencv-python #opencv-contrib-python-nonfree-headless
+
     fi
     echo "--- Installing MrBeamPlugin"
     # Library dependencies for lxml and PIL
@@ -308,7 +350,7 @@ pushd /home/pi
 
     gitclone BEAMOS_MRBEAMPLUGIN_REPO OctoPrint-MrBeam
     pip_install_dev_or_rm ./OctoPrint-MrBeam
-    set_plugin_update_conf_remote mrbeam $BEAMOS_MRBEAMPLUGIN_REPO_SHIP $BEAMOS_MRBEAMPLUGIN_REPO_BRANCH
+#    set_plugin_update_conf_remote mrbeam $BEAMOS_MRBEAMPLUGIN_REPO_SHIP $BEAMOS_MRBEAMPLUGIN_REPO_BRANCH
     rm /proc/cpuinfo
 
     # Install MrBeamDocs
@@ -329,7 +371,7 @@ pushd /home/pi
     # Create a python2 venv because python2-pip might not be an available package
     BEAMOS_IOBEAM_VENV=/usr/local/iobeam/venv
     mkdir -p $(dirname $BEAMOS_IOBEAM_VENV)
-    python3 -m virtualenv -p python2 $BEAMOS_IOBEAM_VENV
+    python3.10 -m venv $BEAMOS_IOBEAM_VENV
     # change pip commands to match the new virtualenv
     # Do this BEFORE INSTALLING as - in the develop version,
     # it will move the source folder, in which case we couldn't access it.
@@ -342,18 +384,13 @@ pushd /home/pi
     # numpy and mrb_hw_info AND requests are not listed as a dependency in iobeam or mrb_hw_info, install them manually before iobeam
     # They are installed on the root level because they use root files from time to time. See iobeam#69 (nice)
     # iobeam is cloned as a submodule to /filesystem before running the script
-    if [ "$BEAMOS_DEV" = "yes" ]; then
-      PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
-      gitclone BEAMOS_IOBEAM_REPO iobeam
-      gitclone BEAMOS_MRBHWINFO_REPO mrb_hw_info
-      mv mrb_hw_info iobeam sources/
-      PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install -e sources/mrb_hw_info sources/iobeam
-    else
-      PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
-      sudo git clone -b $BEAMOS_IOBEAM_REPO_BRANCH $BEAMOS_IOBEAM_REPO_BUILD iobeam
-      PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./iobeam
-      sudo git clone -b $BEAMOS_MRBHWINFO_REPO_BRANCH $BEAMOS_MRBHWINFO_REPO_BUILD mrb_hw_info
-      PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./mrb_hw_info
+    PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install requests numpy
+    sudo git clone -b $BEAMOS_IOBEAM_REPO_BRANCH $BEAMOS_IOBEAM_REPO_BUILD iobeam
+    PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./iobeam
+    sudo git clone -b $BEAMOS_MRBHWINFO_REPO_BRANCH $BEAMOS_MRBHWINFO_REPO_BUILD mrb_hw_info
+    PIP_DEFAULT_TIMEOUT=60 $BEAMOS_IOBEAM_VENV/bin/python -m pip install ./mrb_hw_info
+
+    if [ "$BEAMOS_DEV" != "yes" ]; then
       rm -rf mrb_hw_info
       rm -rf iobeam
     fi
@@ -388,7 +425,7 @@ pushd /home/pi
     NETCONNECTD_PROJ=sources/netconnectd
     gitclone BEAMOS_NETCONNECTD_REPO $NETCONNECTD_PROJ
     # Create venv
-    python3 -m virtualenv -p python3 $BEAMOS_NETCONNECTD_VENV
+    python3.10 -m venv $BEAMOS_NETCONNECTD_VENV
     $BEAMOS_NETCONNECTD_VENV/bin/python -m pip install $BEAMOS_NETCONNECTD_WIFI_ARCHIVE $NETCONNECTD_PROJ
     pushd $NETCONNECTD_PROJ
       mkdir -p /etc/netconnectd.conf.d/{hostapd,dnsmasq} /etc/network/interfaces.d/
@@ -458,7 +495,7 @@ pushd /home/pi
     # apt-install python3-pip
     # Install in a separate venv
     LED_VENV=/usr/local/mrbeam_ledstrips/venv
-    python3 -m virtualenv -p python3 $LED_VENV
+    python3.10 -m venv $LED_VENV
     $LED_VENV/bin/pip install $BEAMOS_RPI_WS281X_ARCHIVE $BEAMOS_MRBEAMLED_ARCHIVE
     # Link the executables to have mrbeam_ledstrips(_cli) in the $PATH
     ln -s $LED_VENV/bin/mrbeam_ledstrips /usr/bin/
diff --git a/src/modules/dev-libs/start_chroot_script b/src/modules/dev-libs/start_chroot_script
index 435b6176..49d143c0 100755
--- a/src/modules/dev-libs/start_chroot_script
+++ b/src/modules/dev-libs/start_chroot_script
@@ -13,5 +13,7 @@ then
     cp /etc/apt/sources.list /etc/apt/sources.list.backup
     sed -i "s@http://raspbian.raspberrypi.org/raspbian/@$DEV_LIBS_APTMIRROR@g" /etc/apt/sources.list
 fi
-
+#apt-get -y install software-properties-common
+#add-apt-repository ppa:deadsnakes/ppa
+#apt-get update
 apt-get install -y $(echo $DEV_LIBS_BASE $DEV_LIBS_EXTRA)
diff --git a/src/modules/octopi/start_chroot_script b/src/modules/octopi/start_chroot_script
index 7ca366f8..f9921970 100755
--- a/src/modules/octopi/start_chroot_script
+++ b/src/modules/octopi/start_chroot_script
@@ -34,14 +34,60 @@ else
 fi
 apt-get -y --force-yes install python3 python3-virtualenv git screen subversion cmake avahi-daemon libavahi-compat-libdnssd1 libatlas3-base
 
+#apt-get -y install software-properties-common
+#add-apt-repository ppa:deadsnakes/ppa
+#apt-get update
+#apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev wget
+PYTHON3_VERSION=3.10.6
+file="Python-${PYTHON3_VERSION}.tar.xz"
+url="https://www.python.org/ftp/python/${PYTHON3_VERSION}/${file}"
+apt-get -y install python3-virtualenv git screen subversion cmake avahi-daemon libavahi-compat-libdnssd1 libatlas3-base
+#wget -qO - https://raw.githubusercontent.com/tvdsluijs/sh-python-installer/main/python.sh | sudo bash -s 3.10.0
+echo "Updating & upgrading system"
+apt -qq update && apt --yes --force-yes upgrade < /dev/null
+echo "Installing Python essentials"
+apt -qq install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev wget libbz2-dev < /dev/null
+echo "Downloading Python $PYTHON3_VERSION"
+wget "${url}"
+echo "Decompressing file"
+tar -Jxf "${file}" < /dev/null
+cd "Python-${PYTHON3_VERSION}"
+echo "Prepare the source for the installation"
+./configure --enable-optimizations
+echo "(Install the new Python version $PYTHON3_VERSION)"
+sudo make altinstall
+#echo "Let's try to create package"
+#sudo cpack
+echo "Let's cleanup!"
+cd ..
+rm -rf "Python-${PYTHON3_VERSION}"
+rm -r "${file}"
+
+echo "Let's install PIP"
+apt -qq install -y python3-pip < /dev/null
+
+#echo "updating pip..."
+#python"${py_main_version}" -m pip install --upgrade pip
+
+new_python_version=$(python -c 'import platform; print(platform.python_version())')
+echo "new python version $new_python_version"
+
+new_python_version=$(python3 -c 'import platform; print(platform.python_version())')
+echo "new python version3 $new_python_version"
+
+new_python_version=$(python3.10 -c 'import platform; print(platform.python_version())')
+echo "new python version3.10 $new_python_version"
+
 echo " - Reinstall iputils-ping"
 apt-get install --reinstall iputils-ping
 
 pushd /home/"${BASE_USER}"
 
   # build virtualenv
-  sudo -u "${BASE_USER}" python3 -m virtualenv --python=$PYTHON oprint
+#  sudo -u "${BASE_USER}" python3 -m virtualenv --python=$PYTHON oprint
+  sudo -u "${BASE_USER}" python3.10 -m venv oprint
   sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install --upgrade pip
+  sudo -u "${BASE_USER}" /home/"${BASE_USER}"/oprint/bin/pip install wheel
 
   # OctoPrint
   if [ "$OCTOPI_INCLUDE_OCTOPRINT" == "yes" ]
diff --git a/src/variants/beamos/config b/src/variants/beamos/config
index fc10374d..80a6587b 100755
--- a/src/variants/beamos/config
+++ b/src/variants/beamos/config
@@ -1,9 +1,9 @@
 #!/bin/sh
 # variant mrbeam, flavor default: override hostname & custom config setting
 export DIST_NAME=BeamOS
-export DIST_VERSION=0.19.0
+export DIST_VERSION=1.0.0dev0
 export BASE_OVERRIDE_HOSTNAME=MrBeam-XXXX
-export BASE_IMAGE_ENLARGEROOT=1700
+export BASE_IMAGE_ENLARGEROOT=2000
 
 export BEAMOS_DEV=no
 export MODULES="base(raspicam, network, disable-services(dev-libs(octopi, beamos)))"
@@ -14,7 +14,7 @@ export BASE_PYPI_INDEX="http://datamania.atbo.studio:3141/root/dev/"
 
 export OCTOPI_OCTOPRINT_REPO_BUILD=https://github.com/mrbeam/OctoPrint.git
 export OCTOPI_OCTOPRINT_REPO_SHIP=https://github.com/mrbeam/OctoPrint.git
-export OCTOPI_OCTOPRINT_REPO_BRANCH=v1.3.6.9
+export OCTOPI_OCTOPRINT_REPO_BRANCH=feature/SW-1030-octoprint-upgrade-to-latest-v-1-x
 # export OCTOPI_OCTOPRINT_ARCHIVE=/filesystem/OctoPrint
 export OCTOPI_OCTOPRINT_ARCHIVE=https://github.com/mrbeam/OctoPrint/archive/$OCTOPI_OCTOPRINT_REPO_BRANCH.zip
 
@@ -25,8 +25,6 @@ export OCTOPI_INCLUDE_MJPGSTREAMER=no
 export OCTOPI_INCLUDE_WIRINGPI=no
 export OCTOPI_INCLUDE_FFMPEG_HLS=no
 
-# Fix - only python2 compatible for now:
-export OCTOPI_PYTHON_VERSION=python2
 # Add dev repos to build up the MrBeam dependencies - Will not be kept in the image.
 export DEV_LIBS_EXTRA="python2-dev libxml2-dev libxslt1-dev"
 
diff --git a/src/variants/beamos/config.mrb3 b/src/variants/beamos/config.mrb3
new file mode 100644
index 00000000..c648c228
--- /dev/null
+++ b/src/variants/beamos/config.mrb3
@@ -0,0 +1,33 @@
+#!/bin/sh
+export BEAMOS_DEV=yes
+export BEAMOS_DEVICE_MODEL="mrb3"
+export BEAMOS_MODEL="MRBEAM2_DC_S"
+
+export BEAMOS_MRBEAMPLUGIN_ARCHIVE=https://github.com/mrbeam/mrb3-core-plugin/archive/$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH.zip
+export BEAMOS_MRBEAMPLUGIN_REPO_SHIP=https://github.com/mrbeam/mrb3-core-plugin.git
+export BEAMOS_MRBEAMPLUGIN_REPO_BUILD=git@github.com-mrb3-core-plugin:mrbeam/mrb3-core-plugin.git
+export BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=alpha
+
+export BEAMOS_CAMERA_REPO_BRANCH=mrbeam2-stable #TODO not python3 compatible version
+export BEAMOS_FINDMYMRBEAM_REPO_BRANCH=alpha
+export BEAMOS_FINDMYMRBEAM_REPO_BRANCH_BUILD=git@github.com-mrb3-findMe-plugin:mrbeam/mrb3-findMe-plugin.git
+export BEAMOS_NETCONNECTD_PLUGIN_REPO_BRANCH=alpha
+export BEAMOS_NETCONNECTD_PLUGIN_REPO_BUILD=git@github.com-mrb3-connect-plugin:mrbeam/mrb3-connect-plugin.git
+## Dependencies
+export BEAMOS_IOBEAM_REPO_BRANCH=feature/SW-1522-iobeam-to-python-3.10.x-in-githu #TODO will be HAL
+export BEAMOS_IOBEAM_REPO_BUILD=git+ssh://git@bitbucket.org/mrbeam/iobeam.git
+export BEAMOS_MRBHWINFO_REPO_BRANCH=SW-1677 #TODO will be HAL
+export BEAMOS_MRBHWINFO_REPO_BUILD=git+ssh://git@bitbucket.org/mrbeam/mrb_hw_info.git
+export BEAMOS_MRBEAMLED_REPO_BRANCH=SW-1677 #TODO will be HAL
+export BEAMOS_MRBEAMLED_REPO_BUILD=https://github.com/mrbeam/MrBeamLedStrips.git
+export BEAMOS_NETCONNECTD_REPO_BRANCH=alpha
+export BEAMOS_NETCONNECTD_REPO_BUILD=git@github.com-mrb3-connect-daemon:mrbeam/mrb3-connect-daemon.git
+export BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BRANCH=alpha
+export BEAMOS_MRBEAMPLUGIN_DOCS_REPO_BUILD=git@github.com-mrb3-doc:mrbeam/mrb3-doc.git
+## BeamOS-dependencies
+export BEAMOS_MOUNTMANAGER_REPO_BRANCH=mrbeam2-stable
+export BEAMOS_SHIELDFLASHER_REPO_BRANCH=master
+export BEAMOS_RPI_WS281X_REPO_BRANCH=master
+export BEAMOS_CHECK_REPO_BRANCH=beamos
+export BEAMOS_NETCONNECTD_WIFI_REPO_BRANCH=master
+
diff --git a/src/variants/beamos/config.oprint173 b/src/variants/beamos/config.oprint173
new file mode 100644
index 00000000..321c8e7e
--- /dev/null
+++ b/src/variants/beamos/config.oprint173
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+export DIST_VERSION=0.19.0dev1
+
+export BEAMOS_MRBEAMPLUGIN_ARCHIVE=https://github.com/mrbeam/mrb3-core-plugin/archive/$BEAMOS_MRBEAMPLUGIN_REPO_BRANCH.zip
+export BEAMOS_MRBEAMPLUGIN_REPO_SHIP=https://github.com/mrbeam/mrb3-core-plugin.git
+export BEAMOS_MRBEAMPLUGIN_REPO_BUILD=git@github.com-mrb3-core-plugin:mrbeam/mrb3-core-plugin.git
+export BEAMOS_MRBEAMPLUGIN_REPO_BRANCH=epic/SW-1030-octoprint-upgrade-to-latest-v-1-x
diff --git a/src/variants/beamos/post_chroot_script.backup b/src/variants/beamos/post_chroot_script.backup
index 7a1df865..eb762605 100755
--- a/src/variants/beamos/post_chroot_script.backup
+++ b/src/variants/beamos/post_chroot_script.backup
@@ -58,14 +58,14 @@ sudo -u pi /home/pi/oprint/bin/pip install --no-index --find-links=/wheels/ pill
 sudo rm -rf /wheels
 
 # install Mr Beam Plugin
-pushd /home/pi
-  gitclone OCTOPI_MRBEAMPLUGIN_REPO MrBeamPlugin
-  pushd MrBeamPlugin
-    addGitHashToConfig "mrbeamhash"
-    sudo -u pi /home/pi/oprint/bin/pip install .
-  popd
-  rm -rf MrBeamPlugin
-popd
+#pushd /home/pi
+#  gitclone OCTOPI_MRBEAMPLUGIN_REPO MrBeamPlugin
+#  pushd MrBeamPlugin
+#    addGitHashToConfig "mrbeamhash"
+#    sudo -u pi /home/pi/oprint/bin/pip install .
+#  popd
+#  rm -rf MrBeamPlugin
+#popd
 
 # install netconnectd
 sudo systemctl disable hostapd.service