diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f594159da17961daf7e99db2f7f592d704cd2f65..359ad955c9afd551a7de2e384ad1ee9936aa93fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,7 +40,9 @@ create-binaries:
 
       EOF
     - orchestra update --no-config
+    # Print graph and component list to aid debugging
     - orchestra -b graph revng-distributable
+    - orchestra -b components --hashes --deps
     - orchestra -b install --create-binary-archives revng-distributable
     - cd .orchestra/binary-archives/personal
     - git config user.email "gitlabci@rev.ng"
diff --git a/.orchestra/config/components/revng_distributable.yml b/.orchestra/config/components/revng_distributable.yml
index 8fa560698dd83208405ca72bd5942fccc087cd2d..552b4bc3a37b934e4f353060a56617d4e4ec7659 100644
--- a/.orchestra/config/components/revng_distributable.yml
+++ b/.orchestra/config/components/revng_distributable.yml
@@ -30,11 +30,22 @@ install: |
   cd root
 
   echo "Removing build-only components"
-  cat "share/orchestra/glibc.idx" | xargs -n1000 rm -f
-  cat "share/orchestra/boost.idx" | xargs -n1000 rm -f
-  cat "share/orchestra/toolchain_host_binutils.idx" | xargs -n1000 rm -f
-  cat "share/orchestra/toolchain_host_gcc.idx" | grep -v libgcc_s.so | xargs -n1000 rm -f
-  cat "share/orchestra/clang-release.idx" | grep -v 'libc++.so' | grep -v 'libc++abi.so' | xargs -n1000 rm -f
+  index_files=(
+    "share/orchestra/glibc.idx"
+    "share/orchestra/boost.idx"
+    "share/orchestra/toolchain_host_binutils.idx"
+    "share/orchestra/toolchain_host_gcc.idx"
+    "share/orchestra/clang-release.idx"
+  )
+  for index_file in $index_files; do
+    if [ -e "$index_file" ]; then
+      cat "$index_file" | \
+        grep -v libgcc_s.so | \
+        grep -v 'libc++.so' | \
+        grep -v 'libc++abi.so' | \
+        xargs -n1000 rm -f
+    fi
+  done
 
   echo "Stripping components"
   find "share/orchestra" -name "*.idx" -type f | grep -vE 'revng|caliban'| xargs cat | while read EXECUTABLE; do