On-orbit Servicing (OOS) will revolutionize the satellite industry, by offering tools that enable life-extension and debris remediation. However, the advanced technology heightens the risk of liability for damages and the overall perceived security in space. In addition, international OOS missions challenges the traditional concepts in the international space Treaties. Whilst OOS is not prohibited under the current legal framework, it is clear that the legal framework needs to be supplemented in order to address the new challenges. Based on the findings of the regulatory landscape, the paper offers various suggestions as to how the legal and political challenges can be addressed. These suggestions include meeting security concerns through a greater sense of transparency and trust, enabled by for example more information on the locations of the satellites, and rules for OOS behaviour.