diff --git a/dendrite/deb.sh b/dendrite/deb.sh
index e702d14..105657c 100644
--- a/dendrite/deb.sh
+++ b/dendrite/deb.sh
@@ -68,7 +68,9 @@ function switch_tag()
     fi
 
     echo "switching to tag: $TARGET_TAG"
-    git -C "$REPO_DIR" switch --detach "$TARGET_TAG"
+    git -C "$REPO_DIR" switch --force-create build "$TARGET_TAG"
+    echo "cleaning workspace..."
+    git -C "$REPO_DIR" clean --force -xd
 }
 
 function build()
@@ -88,10 +90,9 @@ function package()
     rm -rf "$ROOTFS"/*
 
     install -D -t $ROOTFS/usr/local/lib/dendrite   $BUILD_DIR/*
-    install -D -t $ROOTFS/etc/dendrite             $REPO_DIR/dendrite-sample.polylith.yaml
-    install -D -t $ROOTFS/etc/dendrite             $REPO_DIR/dendrite-sample.monolith.yaml
+    install -D -t $ROOTFS/etc/dendrite             $REPO_DIR/dendrite-sample.yaml
 
-    export VERSION=$($BUILD_DIR/dendrite-monolith-server --version)
+    export VERSION=$($BUILD_DIR/dendrite --version)
     if [ -n "${BUILD_REL}" ]
     then
         VERSION=$VERSION-brel$BUILD_REL