diff --git a/default.kibot.yaml b/default.kibot.yaml
index 845f0ad..5d81110 100644
--- a/default.kibot.yaml
+++ b/default.kibot.yaml
@@ -12,6 +12,8 @@ preflight:
   set_text_variables:
     - name: 'rev'
       command: 'if [ $(git describe --tags | wc -w) -gt 0 ]; then git describe --tags | sed -e "s/\([r,R][0-9]\+\)*$//g"; else echo $CI_COMMIT_SHORT_SHA; fi'
+    - name: 'rev_pcb'
+      command: if [ $(git describe --tags | wc -w) -gt 0 ]; then git describe --tags | awk -F- 'BEGIN {ORS=""} {split($1,a,"."); print a[1]"."a[2]; if ($2) print "-"$2}' ; else echo $CI_COMMIT_SHORT_SHA; fi
     - name: 'date'
       expand_kibot_patterns: true
       text: '%D'
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 2ada0ae..55e4019 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -160,6 +160,8 @@ image:
           fab_path=$CI_PROJECT_DIR/Fabrication/$(dirname $f | cut -c3-)
           name_n_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
           echo "name: $name_n_rev"
+          assembly_rev=$(echo $f | cut -c3- | rev | cut -d'/' -f1 | cut -c9- | rev)
+          pcb_rev=$(echo $assembly_rev | cut -d'_' -f1,2 | cut -d'.' -f1,2)
           pcb_im=$fab_path/PCB_$name_n_rev.png
           pcba_im=$fab_path/PCBA_$name_n_rev.png
           pcb_attach=$(echo "['$fab_path/${name_n_rev}_PCB.pdf', '$CI_PROJECT_DIR/Fabrication/${name_n_rev}_JLC.zip']")
@@ -169,7 +171,7 @@ image:
           if [[ $CI_COMMIT_BRANCH == "main" ]]; then
             DRY=""
           fi
-          python -m kintree.kintree_cli $DRY -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': '$TAG', 'image': ['$pcb_im', '$pcba_im'], 'desc': '$desc_suffix', 'attachments': [$pcb_attach, $pcba_attach]}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1
+          python -m kintree.kintree_cli $DRY -p $CI_PROJECT_DIR/Fabrication/$f --assembly "{'ipn': '$name', 'rev': '($pcb_rev, $assembly_rev)', 'image': ['$pcb_im', '$pcba_im'], 'desc': '$desc_suffix', 'attachments': [$pcb_attach, $pcba_attach]}" --settings $KINTREE_SETT --digi_token token_storage.json || FAIL=1
         done
     # - cp token_storage.json /tmp
     - |