Move the EC2 specific thing to a new scaffold