diff --git a/configs/mech.kibot.yaml b/configs/mech.kibot.yaml
index 43d7f95..e749d72 100644
--- a/configs/mech.kibot.yaml
+++ b/configs/mech.kibot.yaml
@@ -15,3 +15,5 @@ preflight:
       command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
     - name: 'rev_pcb'
       command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
+    - name: 'name'
+      command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
diff --git a/configs/pcb_main.kibot.yaml b/configs/pcb_main.kibot.yaml
index af9957c..5400aee 100644
--- a/configs/pcb_main.kibot.yaml
+++ b/configs/pcb_main.kibot.yaml
@@ -15,3 +15,5 @@ preflight:
       command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
     - name: 'rev_pcb'
       command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
+    - name: 'name'
+      command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
diff --git a/configs/pos.kibot.yaml b/configs/pos.kibot.yaml
index 18a8db3..91d47e5 100644
--- a/configs/pos.kibot.yaml
+++ b/configs/pos.kibot.yaml
@@ -15,3 +15,5 @@ preflight:
       command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
     - name: 'rev_pcb'
       command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
+    - name: 'name'
+      command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
diff --git a/configs/sch.kibot.yaml b/configs/sch.kibot.yaml
index 8c98ce0..e57d9ad 100644
--- a/configs/sch.kibot.yaml
+++ b/configs/sch.kibot.yaml
@@ -14,3 +14,5 @@ preflight:
       command: 'if [ -n "$KIBOT_VAR_rev" ]; then echo $KIBOT_VAR_rev; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
     - name: 'rev_pcb'
       command: 'if [ -n "$KIBOT_VAR_rev_pcb" ]; then echo $KIBOT_VAR_rev_pcb; else git describe --tags 2>/dev/null || echo $CI_COMMIT_SHORT_SHA; fi'
+    - name: 'name'
+      command: 'if [ -n "$KIBOT_VAR_name" ]; then echo $KIBOT_VAR_name; else echo $KIBOT_PCB_NAME | rev | cut -d"/" -f1 | rev | cut -d"-" -f1; fi'
diff --git a/kibot-ci.yml b/kibot-ci.yml
index 843c6d2..40234dd 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -226,8 +226,6 @@ generate_3d:
 
 generate_gerbers:
   extends: .fabrication_base
-  rules:
-    - !reference [.main_rules, rules]
   script:
     - |
       export KIBOT_VAR_rev="${VERSION}"
@@ -244,8 +242,6 @@ generate_gerbers:
 
 generate_position:
   extends: .fabrication_base
-  rules:
-    - !reference [.main_rules, rules]
   script:
     - |
       export KIBOT_VAR_rev="${VERSION}"
@@ -262,8 +258,6 @@ generate_position:
 
 generate_panel:
   extends: .fabrication_base
-  rules:
-    - !reference [.main_rules, rules]
   script:
     - |
       export KIBOT_VAR_rev="${VERSION}"
@@ -340,6 +334,13 @@ inventree_dev:
       artifacts: true
     - job: generate_3d
       artifacts: true
+    - job: generate_gerbers
+      artifacts: true
+    - job: generate_position
+      artifacts: true
+    - job: generate_panel
+      artifacts: true
+      optional: true
   script:
     - |
       echo "Running InvenTree upload for dev branch (revision: dev)"