diff --git a/elements/gnomeos/debug-layer-tar.bst b/elements/gnomeos/debug-layer-tar.bst
new file mode 100644
index 0000000000000000000000000000000000000000..d19b4cfb853c804cbbc47de5dd55dec793bfc2be
--- /dev/null
+++ b/elements/gnomeos/debug-layer-tar.bst
@@ -0,0 +1,20 @@
+kind: script
+
+build-depends:
+- freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
+- freedesktop-sdk.bst:components/tar.bst
+- freedesktop-sdk.bst:components/zstd.bst
+- filename: gnomeos/filesystem-debug.bst
+  config:
+    location: '/sysroot-debug'
+
+environment:
+  ZSTD_OPT: -T%{max-jobs}
+
+environment-nocache:
+- ZSTD_OPT
+
+config:
+  commands:
+  - |
+    tar -c --zstd -f '%{install-root}/debug.tar.zst' -C /sysroot-debug .
diff --git a/elements/gnomeos/update-images.bst b/elements/gnomeos/update-images.bst
index 078428f3cf3f09dc99748b10ef1cbd98fdadc1b7..a23772d38b1615208f9c6f8047b6db728af36d9a 100644
--- a/elements/gnomeos/update-images.bst
+++ b/elements/gnomeos/update-images.bst
@@ -17,6 +17,9 @@ build-depends:
   strict: true
   config:
     location: "%{install-root}"
+- filename: gnomeos/debug-layer-tar.bst
+  config:
+    location: "%{install-root}"
 - freedesktop-sdk.bst:public-stacks/runtime-minimal.bst
 
 (?):