Advanced archiving of artifacts

Hello

I'm using the artifact archiving features with TeamCity 5.1.4 and try doing the following:

I have the following folder structure
results/Release
results/ReleaseTest
results/UITest

and I try to have only part of the results published as artifacts in archive files
results/Release
results/ReleaseTest

At the moment I have the following in my build artifacts configuration section:
results/Release => Release.zip
results/ReleaseTest => ReleaseTest.zip

In the build configuration that uses the artifact zip files I like to restore the folder structure from above using the Build Dependency feature.
I have two dependencies:
Dependency 1: artifacts path: Release.zip!** and destination path: results/Release
Dependency 2: artifacts path: ReleaseTest.zip!** and destination path: results/ReleaseTest

As the number of zip files will grow in the future I like to have this thing simplified.

Is there a way I can configure the build artifacts so that Release and ReleaseTest are in a single zip file. where the zip files contains the 2 folders in the root? so I would only need to have 1 build dependency.
Or I could imagine a second solution where I still have 2 zip files, but Release.zip has a Release folder in the root and ReleaseTest.zip has a ReleaseTest folder in the root, so that the directory structure gets restored as desired.

Does anyone have any hints or ideas on this?

Thanks in advance
Philipp