Remove queue references and replace with secrets