for merging. renamed to unstable and stable, removed the -docker files, and modified the stable one too.