Fix 00-sci-cd and 01-packages to work with multiple suites