ARQ-1763 integrate tooling from Spacelift
ARQ-1673 Aligned with Spacelift Alpha2