diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 42c53ef..e1dd12c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,19 +31,19 @@ jobs:
 
     - name: Download Raspios Lite ARM64 Image
       run: |
-        cd repository/src/image
+        cd repository/src/image-raspios_lite_arm64
         wget -c --trust-server-names 'https://downloads.raspberrypi.org/raspios_lite_arm64/images/raspios_lite_arm64-2022-09-26/2022-09-22-raspios-bullseye-arm64-lite.img.xz'
 
     - name: Update CustomPiOS Paths
       run: |
-        cd repository/src
-        ../../CustomPiOS/src/update-custompios-paths
+        cd repository/src/image-raspios_lite_arm64
+        ../../../CustomPiOS/src/update-custompios-paths
     
     - name: Build Image
       run: |
         sudo modprobe loop
         cd repository/src
-        sudo bash -x ./build_dist
+        sudo bash -x ./build_dist raspios_lite_arm64
 
     - name: Copy output
       id: copy
@@ -51,7 +51,7 @@ jobs:
         source repository/src/config
         NOW=$(date +"%Y-%m-%d-%H%M")
         IMAGE=$NOW-cube-$DIST_VERSION
-        cp repository/src/workspace/*.img $IMAGE.img
+        cp repository/src/workspace-raspios_lite_arm64/*.img $IMAGE.img
         gzip $IMAGE.img
         sync; sync; sync
         echo "::set-output name=image::$IMAGE"
diff --git a/src/build_dist b/src/build_dist
index d64a0ac..244dbdc 100755
--- a/src/build_dist
+++ b/src/build_dist
@@ -3,7 +3,7 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 export DIST_PATH=${DIR}
-export CUSTOM_PI_OS_PATH=$(<${DIR}/custompios_path)
+export CUSTOM_PI_OS_PATH="${DIR}/../../CustomPiOS/src"
 export PATH=$PATH:$CUSTOM_PI_OS_PATH
 echo ${CUSTOM_PI_OS_PATH}
 
diff --git a/src/config b/src/config
index 639431a..4e3c273 100755
--- a/src/config
+++ b/src/config
@@ -1,7 +1,14 @@
 export DIST_NAME=cube
-export DIST_VERSION=0.0.9
+export DIST_VERSION=0.0.10
 export MODULES="base(cube)"
 
+
+if [ "$#" -gt 0 ]; then
+  export BUILD_VARIANT=$1
+  export VARIANT_BASE="${DIST_PATH}/variants/$BUILD_VARIANT"
+fi
+
+
 export RPI_IMAGER_NAME="${DIST_NAME} version ${DIST_VERSION}"
 export RPI_IMAGER_DESCRIPTION="A Raspberry Pi distribution for servers. Ships Planet out-of-the-box."
 export RPI_IMAGER_ICON="https://avatars.githubusercontent.com/u/33208073"
diff --git a/src/image-raspios_lite_arm64/config b/src/image-raspios_lite_arm64/config
new file mode 100644
index 0000000..1bfebad
--- /dev/null
+++ b/src/image-raspios_lite_arm64/config
@@ -0,0 +1,4 @@
+BASE_ARCH=arm64
+BASE_IMAGE_PATH=${DIST_PATH}/image-raspios_lite_arm64
+BASE_ZIP_IMG=`ls -t $BASE_IMAGE_PATH/*-{raspbian,raspios}-*-arm64-*.zip | head -n 1`
+BASE_IGNORE_VARIANT_NAME=yes
diff --git a/src/image/README b/src/image/README
deleted file mode 100644
index 4203497..0000000
--- a/src/image/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Place zipped Raspberry Pi OS image here. Or any other variant you want to build/
-
-If not otherwise specified, the build script will always use the most
-recent zip file matching the file name pattern "*-raspbian.zip" or "*-rpios.zip" or "*-rpios.xz" located
-here.