fix signature and policy to use a pre-created policy to make sure signature consistency