consolidate registry variables

Merge Request Description

Merge Request BOE

Risk

Some pipeline jobs will fail if a variable wasn't updated properly

Rollback Plan

Revert MR and re-create CI variables that will be deleted, as they are being replaced by new variables.

Testing