diff --git a/maintenance/alt-images/packer.groovy b/maintenance/alt-images/packer.groovy
index bb5efa8..9f888a7 100644
--- a/maintenance/alt-images/packer.groovy
+++ b/maintenance/alt-images/packer.groovy
@@ -1,16 +1,16 @@
 def baseName = 'maintenance/packer'
-def vms = ['qemu']
-def platforms = ['8.2', 'sisyphus']
-def baseDistrVersion = '8.2'
-def distrs = ['srv', 'ws', 'kws']
+def target_names = ['alt-server', 'alt-workstation', 'alt-kworkstation']
+def vms = ['qemu', 'onebula']
+def platforms = ['8.2', '8.3', '8sp', '9', 'sisyphus']
+def arch = 'x86_64'
 def githubProject = 'altlinuxteam/alt-packer'
 def githubBranch = 'jenkins'
 def packerCachePath = '/data/iso_images/template/iso' // our PVE specific path
 
 platforms.each { p ->
-    distrs.each { d ->
+    target_names.each { tname ->
 	vms.each { v ->
-	    def jobName = "${baseName}-${v}-${d}-${p}"
+	    def jobName = "${baseName}-${v}-${tname}-${p}-${arch}"
 	    job(jobName) {
 		label('kvm && bigmem && nix')
 		scm {
@@ -26,18 +26,22 @@ set -euo pipefail
 set -x
 
 rm -rf output-*
+rm -rf onebula-*
+rm -rf vbox-*
+rm -rf qemu-*
 rm -f results/*
 
 nix-shell -p gnumake packer --run " \
   make \
+  -e target=${tname} \
   -e VM_TYPE=${v} \
-  -e BASE_VERSION=${baseDistrVersion} \
+  -e BASE_VERSION=${p} \
   -e TARGET_VERSION=${p} \
   -e PACKER_CACHE_DIR=${packerCachePath} \
-  ${d}"
+  image"
 
-for ext in tar.gz md5 sha1; do
-	mv results/${d}.${v}.\${ext} results/alt-${d}-${p}-${v}.\${ext}
+for ext in tar.gz md5 sha1 box; do
+	mv results/${v}-${tname}-${p}-${arch}.\${ext} results/${tname}-${p}-${v}.\${ext}
 done
 """.stripIndent()
 		    )
@@ -53,3 +57,4 @@ done
 	}
     }
 }
+