Along with the updated changes in GITOPS-1858 - Implement the approved POC PR changes, we need to add unit/e2e test cases demonstrating the feature changes.

Acceptance Criteria:

• All existing and new unit/e2e tests should be successful