Add variables for s3 output mode, fix ansible variables must not have dashes