new unstable environment

14 files changed, 109 insertions, 69 deletions

diff --git a/files/nodes/aardwolf/aardwolf_ssh.pub b/files/nodes/aardwolf/aardwolf_ssh.pub
index fb6392e..639c5f8 100644
--- a/files/nodes/aardwolf/aardwolf_ssh.pub
+++ b/files/nodes/aardwolf/aardwolf_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/
\ No newline at end of file
diff --git a/files/nodes/cat/cat_ssh.pub b/files/nodes/cat/cat_ssh.pub
index 793d5ee..86e6bbe 100644
--- a/files/nodes/cat/cat_ssh.pub
+++ b/files/nodes/cat/cat_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD
\ No newline at end of file
diff --git a/files/nodes/donkey/donkey_ssh.pub b/files/nodes/donkey/donkey_ssh.pub
index 92d83ff..bc46a25 100644
--- a/files/nodes/donkey/donkey_ssh.pub
+++ b/files/nodes/donkey/donkey_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh
\ No newline at end of file
diff --git a/files/nodes/tuatara/tuatara_ssh.pub b/files/nodes/tuatara/tuatara_ssh.pub
index ec258ca..59c86ea 100644
--- a/files/nodes/tuatara/tuatara_ssh.pub
+++ b/files/nodes/tuatara/tuatara_ssh.pub
@@ -1 +1 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUCLDyb/Gko3yY2CQNVa+25hQhlSufBLA5F4akkrSZ6/gCrZg/jCa+htftkCNd8INZOs2aETY1F3Fr2eMNlIk8dE5cNiSeQJsoxKa+Lbt0T5QPpc2D8vkd5wX0aF5hVFT5EohObNvtNIgdxIoriod8dDqF/F/w/8T1rX6VeEPIMmsh3vakYqA3ynd0GjRXADQjNj7uzpv/+pZfSr4GbWwQaTb/W+Na1JGaq2nrwGFATsogDhNzqJEhKfOP2Yb8dkMSV/mq9YCMoSXv1UaGDKF7+bmq3MKjXJ4qNWj5foowkvz/YP6HMqqY9zKaesyBh3rTgljxXI6b0Viumygbt3kp
\ No newline at end of file
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT/9Z0BIVLpriNPdkk9cEsh0/tave+Jx80dcrt1/04tzFgitUl77AWnvcMIBfZKZTZpxZrakw/K165opvZEhuz/H7ztdc069HAVRn5wqpBvRVMovuhDtYaaFrFu5zo7Mg9MgJwc1Y0SUsBjItKuvgid5hRpy61N+0KDiXDl9T/QZj340kD/pMEHjqVmVoKkRn8/KK6S9cTaAAeTvbYfz/lPQHsyJ/M8emhySk/OCQIdAJ9SqMkX2MMd081tqFAa/H0D22vdgh9DhnrRlmmaZ5Z4P6P1U7ieLTWdLG5n7bTrPgWQAC5uElhzsa3uhlHyKgmHUWDr47hWCA1X0TCKZk/
\ No newline at end of file
diff --git a/files/ssh/known_hosts b/files/ssh/known_hosts
index 29f027e..e6259db 100644
--- a/files/ssh/known_hosts
+++ b/files/ssh/known_hosts
@@ -2,23 +2,26 @@
 # This file is automatically generated by the command `leap`. You should NOT modify this file.
 # Instead, rerun `leap node init` on whatever node is causing SSH problems.
 #
-aardwolf,aardwolf.unstable.bitmask.i,aardwolf.unstable.bitmask.net,199.119.112.205 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv
+aardwolf,aardwolf.unstable.bitmask.i,aardwolf.unstable.bitmask.net,199.119.112.205 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/
 alpaca,alpaca.mail.bitmask.i,alpaca.mail.bitmask.net,199.119.112.223 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDtpKckyjDgSw555znY6Ww2ZHzYZvNkf/dm6Xml4SVM4hFTUVIhgAuFXoUcMjwOcAzbnqPdZN/zGCzTGGBnPrw9YvwaP2oso1b/tysEGYvemvxJlLxo7wQKLbTj8u89LahGFZhoUBFxIX6u0f4gBFURGKHgotyjRJq5tM19CjgnO7L3lhjXl/04Zd5mmQPoHuGNi8wjxZVHLi+cbmG1qXFIXhqb1nDjq2dJh+NJGRZ4IrkkNYYB/V1RlQvHfJ6eof7pyVUWLwyOBe11DkyOooKl/pOkH4jVVCKP2Asbdu7nlqq6il88pQpL0CsikikWvMgWJ9TqafI2kBJ6QX484foH
 ant,ant.demo.bitmask.i,ant.demo.bitmask.net,198.252.153.82 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBGDhCu92zulHOAhv63sTLnxPQrP+GxbWC4YUxonYOiWKaI/oS5soH5vfgI0/kkzZgA044F6ZyWo5S5dEwz4AEI=
-cat,cat.unstable.bitmask.i,cat.unstable.bitmask.net,199.119.112.206 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV
+cat,cat.unstable.bitmask.i,cat.unstable.bitmask.net,199.119.112.206 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD
 clam,clam.dev.bitmask.i,clam.dev.bitmask.net,176.53.69.22 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCd44smDJpmCINOnmZdyJO4x/kfziCi/UZiPMplCZN3RLEj8/eqhTo/imXNYXvx8AlwMIUsvVs4D79ukFPqICn7CF5xPuOuz+Og+Dk1rpD68Jomws13N194nOisDHlXwxmQCdFd2w+0FENd+tUmrx7AM1eQmg6D2WRw+Hmb17C7fdJwlCXz8bfTWnEWDvpwgVchpszy3WwX9Ul01j7IH3yKEM4c9GwWjJ8LgJfI1jR1jKnD6xZxuqbQ7aRoer2b6PIrIfsTB/JpuI9FtbjMuGCBusFf2+5lP/bsXeLGWU5smgGyjGNwa9ceUrhklNyXBQMz3wlBwXe4Q8u1LmM5Yi0Z
 demodex,demodex.dev.bitmask.i,demodex.dev.bitmask.net,204.13.164.171 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2iNuS97BTd7flA/8nho/w3+THNriQPf1IpgcI/TCaTxIG5T85FRIApNAIxayJjBAt9C/MM8LMUlpRTq1Y8vlpYmfcWAJj5V8bbP03TXNIkgK8rtStjN061bhWXo4AVfD1hFyL+wUrdGRX2laaJvOgMO+UCkYb9PPqEfyKCMhcu3Da7auznYucrNxcJwCU4TpVgmQDYE0DWpYkssTbGJ7YJOZAtwNWtOrZFVRzOvMy3WvAM/s0x/ME6CQi6k6dDHlSpafhPAl/B4koTtnPksmXc7xCpmaun1j68C0yvD1l9QBPKyFwJ1KCJgx+9++CqnSFbIbX3ebb0FGtMHrak2xL
 diplocaulus,diplocaulus.bitmask.i,diplocaulus.bitmask.net,199.119.112.150 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpvETs31Zg2omqF9k3dq/CJDnZtrd+987VJgWex/zM/ZsRu7MYoAb34BBm2QroVwAiei5Wczn6CpdcYUuY38fdCxUVRKClm0abz0T6LT/EsqfY3N1d9OmAjN/XEWi/5+vnaiEuh313XUgD2vASFwLR+z9NHlGmz+uBaQLWRZF2Q36i2L7TOOxUG96i6knShNIGmaajVNhv078EtJlWbNzpEcVsn6CyRhyMdx0KzV2tIvitozwHcAy5UEQGGiwACxHwOS9IWn7UBHhfxf1kj1VVmnrewf6TnApvuqD8e0d9z+NnWOt9h3HAFxF92Ggs4FQ/vY7EcxgaEoW1kroGiNGP
-donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl
+donkey,donkey.unstable.bitmask.i,donkey.unstable.bitmask.net,199.119.112.207 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh
 dotterel,dotterel.dev.bitmask.i,dotterel.dev.bitmask.net,37.218.240.50 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtwy1DFLdBQOTDwGLtlewA8hHcgz/q4nuW70BZnH3nlYFm4UqIm7KUMSCflDceNBcntedka2obzoeSEfa7j8ODzrBsrIebrPN50B3uM1svcfIivrVnNXHsAPiz2c7LBO5/+XuTfmLm0lrOeiBQxaDxo0GGqEFxo8/SFWgCtHNNSVLynroQl7uN50P3+h0G60XTJh/EYD8I6oM0cvL+a/vbBdJz3nTN/uDvDO9lATu9u1jk/L8Bo2388IOYwDibW1yg9nE3xjWX59bndod5hKrGczJ4v/hIyKxO8Bv+44whxws1qGy2s4JMbQWmt3HVy4U1wU1/ykc6ZDIjo9IJjJOR
 elephant,elephant.dev.bitmask.i,elephant.dev.bitmask.net,176.53.69.13 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDbVBsw4Hnwoh1h+/J5NP6Uj6s1ViumP6zeeAtrr/ma/NrvR3x1bXmy/O396zbuFER6a8EyhGwY6WI+vKTjKWMGlOaNyNO7s9CB/keFBx4GGTcx55oHFb/WU0BzFUBoLjfEgelx/03+NIrZyW2XaPYDPdmNOfxMtetBziLugTXsXONIZBD4/QCt+LvbYdjWtziCH/EsdFuetDZ+WZrrUjCHyg2Lm8Xd48U/QrfPUb0oP8QZfoToN5l2Mxx7CnxX1s606zc/kkeaiF6+ATUPJ/6CTTdXZUN3Mg9dFMMyyZLB4TpSX7ldnwE2Wkvc/ngQjS/L8YBoMxsywPw7Q2+rFlV
 ferret,ferret.dev.bitmask.i,ferret.dev.bitmask.net,1.209.122.123 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDR/YWDsdYumj5mYunnLgQSuoNMKcItqQT/cmPkFCRp5WERouxdu/GW/0F78K+FyRTp3xwEzJ3BCF/5lbgDH9pRBLiezH+d2Lj2STz82EL0TtOTRtAhF+sK6X2/HFJ6PiIkmAlGGFiw09VR8aGdIhY9FaJATClUWEqjtdFd9BplLWasrmuEVN4kHe2dcO6SxHAfdsmhqd7YdpvfkhenBI1ZPAPYWk72fFFdV35gYBf1H1DewBcobuUCUbd+5EvTJnOfYum9noZBcQScvjuXX/pn4yHefNxh7qBlD92V1hJhK7CHiU4nw2Z4bM2oMLr6Jw81PhQf732DACPrNT+GcEEx
 gecko,gecko.cdev.bitmask.i,gecko.cdev.bitmask.net,1.209.122.112 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQeFFXLYpG4uHjeNrZXR0aKMGL+w7j51fS4UEC/GDvU3o7NrPV3zsn1M/O7k8LZ4rRRfPAL5RScTosAZIC4GTWpZfZPeg75+4uRv4jQuzuBV7e7dhnKHJkCXmNHbpn0BmieEw7KthX8wjV1Z9YJ951fVUJcvH/Z8gf9KREMpQa6JwtybyqJh0sPNROSEm/dG25W6KmHQAEyFyiHUR5vb/5Knt0cVLpVH6c8Wwb4O6OhtNoggMkoZLhXBwiDMwqc8f4qefX1P4WWXJSWKK8Ui51346j4hrMvB50V6VE5xPp8VkA45a+wrWlBRyXC+utkwPB08ZouL1F4Z2Ak7QQ+GD3
 hippo,hippo.bitmask.i,hippo.bitmask.net,85.17.92.143 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc=
+ladybug,ladybug.bitmask.i,ladybug.bitmask.net,199.119.112.8 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN
 leech,leech.demo.bitmask.i,leech.demo.bitmask.net,198.252.153.85 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCxGPMkrINVARV9unydaLMxf16JFa5HWv2OqUXlwRXrhlYP8pBBAEjZaXAi3LMee3byg+NHhofSgRWd76zMW5+vX8HqXVMtCpXRzMk+1EpjA7u8xYW1dWEDMLWCjbB4aB1D1NLTD9u6mn0xJCRIUrqFMrMPyh5xD2M1WPB0lEM7rH79Hm5N4QvKPd0bEFQAYSDlV/hdArp5B1OhQxI8ROu+f6JCA4HEe3+qO8BrtGb4V1dyAdYiViL1IMIYvjQoC0lZm86KAsVDkW8kApYc3js5taSVFYcL58SVcMekjA34klC9pdCxeJNjg9whQP0cAg4/U4C9V8mW/EhzHgXU5FpZ
 millipede,millipede.demo.bitmask.i,millipede.demo.bitmask.net,198.252.153.83 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBG02MrdDFaqZO11JbYSAAC5q/W/FCch3AQXo+dRcpErvHLmv9kWkrV1ESqfZ+s6qEfk8Aqv0vsym7YigMiGXlBo=
 mudskipper,mudskipper.cdev.bitmask.i,mudskipper.cdev.bitmask.net,1.209.122.111 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYzyrBvN1kkOgHkfc7cH3dgJC6nxnulO+6QsaX3kQuFHb6m4rKfEOPYZyzmZlrKXboAUuUDVH55Q8/Drao7QT1XtnIEC6R73tlcMmJuSTfl2IQMEaIA9voE59+Q8cWmMu5O9nzzMssZTjrMZtpfatiJ1aFntumAyjKQ0vFK4s1owBg07Yt0LDchAwBXYpELX/4pZYE2vpHrQsgH9zV/DPOZTFtXAr9SR94NXIPa6P06LEAjtYCqY2sEu2BB+OHysJNHuFJF74/l859YM5gkdd0cbn1LX0/6ch4dtqqDvydKZNlura7tb+GLV+oTz59BQ89mOPPoRfcUX6DXpl6ERz
 otter,otter.demo.bitmask.i,otter.demo.bitmask.net,46.165.242.166 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp
+ovenbird,ovenbird.cdev.bitmask.i,ovenbird.cdev.bitmask.net,199.119.112.151 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz
+seahorse,seahorse.bitmask.i,seahorse.bitmask.net,199.119.112.12 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1
 snail,snail.dev.bitmask.i,snail.dev.bitmask.net,176.53.69.14 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc9ClDw538Yojfi9WabepcQCdANP8zhF7wExHw3h3VY08CjUfTojZZyYg6EV3X6Itqm73yj6O6+NvWWQ1zXXkCMkyhXmCPJAw/QEcZJLfQUgyv18gLFcLKo7mmhfFtB5+cLVljulwPW0Qd3CKBt/GS7WtBZTQS+mvqQSJliE3k0PBbNaYdJ0fWvfMfz739FCKsvPA0ECAiwluaLx8Mp74l+7azhajvWfXpzNy3NAwx5pdsuE+tCJ4y0bfyzn2ZuykdYrCIzoMlVZOSpELz0RsCXQc7izTJEyfa+046gCovDiDQa+SsBEcAjDEXPLgfK7Fi7TZhs4HMIZuu1Y36zuMD
-tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUCLDyb/Gko3yY2CQNVa+25hQhlSufBLA5F4akkrSZ6/gCrZg/jCa+htftkCNd8INZOs2aETY1F3Fr2eMNlIk8dE5cNiSeQJsoxKa+Lbt0T5QPpc2D8vkd5wX0aF5hVFT5EohObNvtNIgdxIoriod8dDqF/F/w/8T1rX6VeEPIMmsh3vakYqA3ynd0GjRXADQjNj7uzpv/+pZfSr4GbWwQaTb/W+Na1JGaq2nrwGFATsogDhNzqJEhKfOP2Yb8dkMSV/mq9YCMoSXv1UaGDKF7+bmq3MKjXJ4qNWj5foowkvz/YP6HMqqY9zKaesyBh3rTgljxXI6b0Viumygbt3kp
+tuatara,tuatara.unstable.bitmask.i,tuatara.unstable.bitmask.net,199.119.112.208 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT/9Z0BIVLpriNPdkk9cEsh0/tave+Jx80dcrt1/04tzFgitUl77AWnvcMIBfZKZTZpxZrakw/K165opvZEhuz/H7ztdc069HAVRn5wqpBvRVMovuhDtYaaFrFu5zo7Mg9MgJwc1Y0SUsBjItKuvgid5hRpy61N+0KDiXDl9T/QZj340kD/pMEHjqVmVoKkRn8/KK6S9cTaAAeTvbYfz/lPQHsyJ/M8emhySk/OCQIdAJ9SqMkX2MMd081tqFAa/H0D22vdgh9DhnrRlmmaZ5Z4P6P1U7ieLTWdLG5n7bTrPgWQAC5uElhzsa3uhlHyKgmHUWDr47hWCA1X0TCKZk/
 wallaby,wallaby.demo.bitmask.i,wallaby.demo.bitmask.net,204.13.164.57 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP/bJJ5OoSveoTEXAl26Gz0tqJkwzdA2fezMFeyoDDF6BCWntfzFZahoxHWg5alUfNMCJeYYOPYu/k05QzXThkQ=
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index bba13b0..498a063 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -4,6 +4,7 @@ contacts:
 couch: 
   mode: plain
   port: 5984
+  pwhash_alg: pbkdf2
   users: 
     admin: 
       password: LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ
@@ -57,7 +58,7 @@ hosts:
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   donkey: 
@@ -67,7 +68,11 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+=======
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
+>>>>>>> new unstable environment
     ip_address: "199.119.112.207"
     port: 22
 ip_address: "199.119.112.205"
@@ -110,7 +115,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
@@ -179,7 +184,11 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
   monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+  monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index b36f037..ac29b93 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -45,13 +45,13 @@ hosts:
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
     domain_internal: aardwolf.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/"
     ip_address: "199.119.112.205"
     port: 22
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   donkey: 
@@ -61,7 +61,7 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
     ip_address: "199.119.112.207"
     port: 22
 ip_address: "199.119.112.206"
@@ -90,12 +90,14 @@ mynetworks:
   - "198.252.153.82"
   - "198.252.153.83"
   - "198.252.153.85"
+  - "199.119.112.12"
   - "199.119.112.150"
   - "199.119.112.205"
   - "199.119.112.206"
   - "199.119.112.207"
   - "199.119.112.208"
   - "199.119.112.223"
+  - "199.119.112.8"
   - "204.13.164.171"
   - "204.13.164.57"
   - "37.218.240.50"
@@ -125,7 +127,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
@@ -197,7 +199,11 @@ testing:
   api_hosts: 
     - donkey.unstable.bitmask.net
   api_uri: "https://api.unstable.bitmask.net:4430/1"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
   monitor_auth_token: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+  monitor_auth_token: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
 x509: 
   ca_cert: |
       -----BEGIN CERTIFICATE-----
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index 82ff7fb..3929442 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -29,7 +29,7 @@ definition_files:
               "user_ips": false
             },
             "host": "tuatara.unstable.bitmask.net",
-            "ip_address": "199.119.112.148",
+            "ip_address": "199.119.112.141",
             "location": "washington_d_c_"
           }
         ],
@@ -188,7 +188,7 @@ hosts:
   aardwolf: 
     domain_full: aardwolf.unstable.bitmask.net
     domain_internal: aardwolf.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC11esHnJtvHtzJwmqxKx4QLNGF/jw/EU8DxVOwkuho51sFh/Fn3FZXrkJ7pbLcVigIuoYbhmhAdtGGPrPKUpknhdPOjDN4YsySE68+VlqzRm+Zp7vyyFo8j+jTgvUEGxctEeEpuidqnx+Z77vyC0NDcOOZKVKel94iny27Oipo0x50dBAL+CrRqCYEad5h6iEi2Tlnd54m/yfPk6VNDZoLuN66mY1fh2xyxArYnOBA9/GnyzMb77rsOhc9XAtEd65ZHKdM/Sv6mz79qJ5ZXPrnNWqMvZjjrvdoLEZ5tz9i6gHEq9X0QelkjSUQYHIxk0iYeUCjxS29KmWns5thOWtv"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDMU1HBNNU7daYV0sdbRBrRLhl8SfsbvP5zcAhZbi4bMbL2nC9SzvGXYqstWoG46j35e6h38Xjpi+8MfRK6kQP2fyhoBiQCZU1oyqvwg1PX2CmcABWYKlMfVIsdkl+VRgeMVuwdEl7yk/fHUg+ulyUIvcV/qH+X+ME6MWtRNeT/sdDyaALbVXZ5mIKDDMy8xnarywDRKJhzdvP00ifS2xVfWrSyo+tzUx+HzKkc5eosYBjBWPBNjfgYdQMMz1nh0T6NE4ucwloYO0TZnVW30crEMLQnqzKHTweJ4GkUGcxPVk8OYqvQ2CC68FhSs8dSJwk8jhddneOkrzGFq0OmOu9/"
     ip_address: "199.119.112.205"
     port: 22
   alpaca: 
@@ -210,7 +210,7 @@ hosts:
   cat: 
     domain_full: cat.unstable.bitmask.net
     domain_internal: cat.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlZP1jixPvDC+tI5cQpV8GpK5+OciNyCJyzdxZ0tiP6xjz76WWhynALuGQyJJilNPZLVnVnX7tLvw1aeRkvopQdF7J1f6AM+JbmX3jNqCXDjellcSPWtiKKJ2szaObfZ0yi+zkzSlG+umZ1xhMLgRHAPJaVqeNQVXygQhtuzAzd+Qpm1EAf8M8x6PJIu/Ui3S4nnB/eaZW7JtnTMhBiNzhMBsITp1ZRe4rhlH3ZrKgAztlBQix7jfRo8kXvZi65fWt0T44mjGgO5gdcZnTrGSJoJIdCN9IzESH+szc9jNJKpti0s4g3EU/pm8gfDLnI2V9J4/dOnH9/BlKfnUxbdWV"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDj61YBIu6Aj50z56wQSsPOxhlrZ9+8nOuxdf6lcszevagNEaoQDxoAcvyz3jB03NXHTRM6cTRSw5FRQFAcJqaaY1+ZrKxA5Dtjp7aC8cZ3FQ5iEOsgKhMpZgf40LBaGkSgY9qgzPvYTu6Xat9LAXISlhLlhjAY4U/Jr6Eu0EUeq2z9BrAusrOMtlG4P5/jLCt1tsXhZ/jx6LtAgrX0a04SSy/Rhb+Csuyh+PXDXTQyy2SRD0xDYH1crIugnFpkOIyXj3wAqWQIGYqehCXvZNFFbhEHOoRR6MsWxcuVIMT8b80XzOfKwPCsEulWQNJScn3SebudcuhLygJoGVW3lVXD"
     ip_address: "199.119.112.206"
     port: 22
   clam: 
@@ -238,7 +238,7 @@ hosts:
       - unstable.bitmask.net
     domain_full: donkey.unstable.bitmask.net
     domain_internal: donkey.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDeGJUfpwMo9Iw6cSY4Z5SRuJ9/DjxEUU37qF35MfhLnSzaQO8I/SATo93X5wL+wP4M9XxJoOhiB3PQh27QfAKiDr6ZT5xAqYCThG/vLx9v7bP9ROayZxaSisMxI0hVOXAzFt5CXX0W0Bh9XlM8rhmdobnAIhqm2vt1g6seYRCPGLX7O6qgddveFQ7TzL6eFco55nlhHXhM+s3rXTY5FCOCB5zETW80zpKencwdt2H8+CDhYru/rRKbv1BDvvM28+noOrMS1MLjKeCLvHKNFymNdOSqdmBwyiNE6afpuVXDq+Q+CG/0qvbyDEJX31CnGtHYkz3LBqOBh+OOi6YfqTl"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC95g1uv5y+UolV7tzgScG3Y8OxERwgPCWlVy2O+UAXO+GEiGZ9iPPJbMSu3VAzXG/7I8x3M9ZlyQGTtG9TiVKQAR/cTL7PWJir8GClhoHoqsbrj8xuQuDLvaRG5MKqaU7yLNR8bBdSRdn9ObCFr8S+tWbXCpLhLB4m3/vfuMxZAdVdrFw3cn9O5QdBp2icFiDAWAIjr9brXM5c5FBPg2lTpfEkQoUAIBIvA8W2+Tj3cvYrG5WIa0w4+LCN9c5NvYH3xYNSZESU7p1P50OnhOFT2zbKneGBcLc74ZsEhR3vwHPmpe/62yCqrGZTZF8Z6Hr3/kq5/Bd58yqjH1uUw0Jh"
     ip_address: "199.119.112.207"
     port: 22
   dotterel: 
@@ -275,6 +275,12 @@ hosts:
     host_pub_key: "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBL4iit51nt0P5yulG9s5iNP94MVGOXZTbPeHbnIqXmiYv8u5Cq8l/R4S9T8s9oh8PdZvGfWrbxewz3CaHgIvtbc="
     ip_address: "85.17.92.143"
     port: 4422
+  ladybug: 
+    domain_full: ladybug.bitmask.net
+    domain_internal: ladybug.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDB2QMVLYRTwLfZzafas9wTfh1OsHCuRFc1yfezZt/hPPYbNREkbDLW7xgvCBFAqZdRU/1EEyzTdLwUPWP7RtFRSVPrBn3Re9Y2DmVno4YR/7SklWo330tc3aNX5sVFfvgSLHqe4T/SOSmQvjPz/AxkRekIi7Rsjrew9C3SiCZ9S3PygxEQw3XnPoeh4Kju1fl7eXSzLwWVu1TtUJvRn6gbP9+qTY5/1e9MHEBD0zOXO7tAcRWwjkzMPdQ1GgMqvAqamtIXOmG2RWXApeaitix8qZQlC/eb1pJzlh2b5MNiizJPS1rCqnGSN3Jx6H5CqthKWu1JaUzxGhLacuu5AWSN"
+    ip_address: "199.119.112.8"
+    port: 22
   leech: 
     domain_full: leech.demo.bitmask.net
     domain_internal: leech.demo.bitmask.i
@@ -303,6 +309,22 @@ hosts:
     host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCab6r51XEW9LjZVDZs3q/aIpn+oKo468ovivZIQPMmYMs6NUJ2z7Oc9YROAM3lfxcHHShNBIpxg/pSKnQ743hHavV3y+mEPbo4W3hbByuR6GJRaKxHP42NMfNxJUHpaix8jCrMkNypFGMss9C403quy62yGfN7hWIH/pWFR9z+GvWaLpl0J1T+sadeqYGrjiWPwmo88ZAo/RRsXEORyPMz/X7+pa+DvYrg9FqOnNNK0EvHI5asxRQMojpbt6DRpOkkDPkFZp/gpGRQCAbnaKtalkfC/HhbHepGiqQwMRphcpTmnJvOfIGy+YnUoV3RwoRzb5HAT6FkJ9c4gsTs+6Rp"
     ip_address: "46.165.242.166"
     port: 4422
+  ovenbird: 
+    aliases: 
+      - api.cdev.bitmask.net
+      - cdev.bitmask.net
+      - nicknym.cdev.bitmask.net
+    domain_full: ovenbird.cdev.bitmask.net
+    domain_internal: ovenbird.cdev.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtsIDPQkrOkbKZIhQEckY2uQKDXXN8/rQElMCwEbNuf25rz8ec5hSaMTOidjj0aAUSe33owu7fc5xvjbm2UY8zgpp3KMUlxwB27RPuegXrheA7HfZooXGwmlrBPgzUxHEDd3bp0KyNOOzabELQAxLEeACJSnKEKrwRXg4I4yDJpxZIHC79629804ScfaAI6aamqDnl5nMrr3eozjaWfrXGd/qyOYg+q7iw9HTK9rFR0tVuy4TFc/4doCqgJ4Dqx9jY1uewjA0xMAKb+8VqvmgC9GUHXye2Q4AXGFfrzjxsGpN8KkjwhiOCG/x2nxbhXJuq92w5t9+AyJzWSP6H1UOz"
+    ip_address: "199.119.112.151"
+    port: 22
+  seahorse: 
+    domain_full: seahorse.bitmask.net
+    domain_internal: seahorse.bitmask.i
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfIO4Zdb7Xl1xP3Nw6hCSRSU9t6D2l3HpP38V1VM+2sLHDUdGDlHYWgUlfril5wZ6DdvU1DO2xrSTPDR1LrLEk/OKuFthnNUmRfE+NQQbf/KjEfj+AFj36l9evbWwef/EwECOtydQYZTEabVvrt0yprHYnfd728UklkFjXg67962X9A8DtK2OcPovEbcpPA3vo88+SZukNXAFUQcZPbX5ux0WZ1RH0GQVLVFo0dL4dQdEHZIXVYNvI9X7FzcN4WNjYyZfibiCmo3zdv15Hybh1NMQtBC6H5ZtiykzqL7cbUmmKeYzgIycFnewUxr6P4WyWx7/kPqfR/0Dw5aQqufw1"
+    ip_address: "199.119.112.12"
+    port: 4422
   snail: 
     domain_full: snail.dev.bitmask.net
     domain_internal: snail.dev.bitmask.i
@@ -312,7 +334,7 @@ hosts:
   tuatara: 
     domain_full: tuatara.unstable.bitmask.net
     domain_internal: tuatara.unstable.bitmask.i
-    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDUCLDyb/Gko3yY2CQNVa+25hQhlSufBLA5F4akkrSZ6/gCrZg/jCa+htftkCNd8INZOs2aETY1F3Fr2eMNlIk8dE5cNiSeQJsoxKa+Lbt0T5QPpc2D8vkd5wX0aF5hVFT5EohObNvtNIgdxIoriod8dDqF/F/w/8T1rX6VeEPIMmsh3vakYqA3ynd0GjRXADQjNj7uzpv/+pZfSr4GbWwQaTb/W+Na1JGaq2nrwGFATsogDhNzqJEhKfOP2Yb8dkMSV/mq9YCMoSXv1UaGDKF7+bmq3MKjXJ4qNWj5foowkvz/YP6HMqqY9zKaesyBh3rTgljxXI6b0Viumygbt3kp"
+    host_pub_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT/9Z0BIVLpriNPdkk9cEsh0/tave+Jx80dcrt1/04tzFgitUl77AWnvcMIBfZKZTZpxZrakw/K165opvZEhuz/H7ztdc069HAVRn5wqpBvRVMovuhDtYaaFrFu5zo7Mg9MgJwc1Y0SUsBjItKuvgid5hRpy61N+0KDiXDl9T/QZj340kD/pMEHjqVmVoKkRn8/KK6S9cTaAAeTvbYfz/lPQHsyJ/M8emhySk/OCQIdAJ9SqMkX2MMd081tqFAa/H0D22vdgh9DhnrRlmmaZ5Z4P6P1U7ieLTWdLG5n7bTrPgWQAC5uElhzsa3uhlHyKgmHUWDr47hWCA1X0TCKZk/"
     ip_address: "199.119.112.208"
     port: 22
   wallaby: 
@@ -445,7 +467,6 @@ nagios:
       ip_address: "199.119.112.207"
       services: 
         - monitor
-        - pixelated
         - webapp
       ssh_port: 22
     dotterel: 
@@ -495,6 +516,15 @@ nagios:
       services: 
         - openvpn
       ssh_port: 4422
+    ladybug: 
+      domain_full_suffix: bitmask.net
+      domain_internal: ladybug.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
+      ip_address: "199.119.112.8"
+      services: 
+        - backup
+      ssh_port: 22
     leech: 
       domain_full_suffix: demo.bitmask.net
       domain_internal: leech.demo.bitmask.i
@@ -535,6 +565,25 @@ nagios:
         - openvpn
         - tor
       ssh_port: 4422
+    ovenbird: 
+      domain_full_suffix: cdev.bitmask.net
+      domain_internal: ovenbird.cdev.bitmask.i
+      domain_internal_suffix: cdev.bitmask.i
+      environment: clientdev
+      ip_address: "199.119.112.151"
+      services: 
+        - webapp
+      ssh_port: 22
+    seahorse: 
+      domain_full_suffix: bitmask.net
+      domain_internal: seahorse.bitmask.i
+      domain_internal_suffix: bitmask.i
+      environment: disabled
+      ip_address: "199.119.112.12"
+      openvpn_gateway_address: "199.119.112.13"
+      services: 
+        - openvpn
+      ssh_port: 4422
     snail: 
       domain_full_suffix: dev.bitmask.net
       domain_internal: snail.dev.bitmask.i
@@ -552,7 +601,7 @@ nagios:
       domain_internal_suffix: unstable.bitmask.i
       environment: unstable
       ip_address: "199.119.112.208"
-      openvpn_gateway_address: "199.119.112.148"
+      openvpn_gateway_address: "199.119.112.141"
       services: 
         - openvpn
       ssh_port: 22
@@ -580,7 +629,6 @@ platform:
 service_type: public_service
 services: 
   - monitor
-  - pixelated
   - webapp
 sources: 
   apt: 
@@ -597,13 +645,13 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: origin/develop
+    revision: origin/version/0.8
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -695,7 +743,11 @@ webapp:
       - "199.119.112.206"
       - "199.119.112.207"
       - "199.119.112.208"
+<<<<<<< dd6dbf179b94d6949d210e9a61457deedf03b0e1
     monitor: pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr
+=======
+    monitor: AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR
+>>>>>>> new unstable environment
   api_version: 1
   billing: 
     braintree: 
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 3b46bed..5d1b548 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -24,7 +24,7 @@ firewall:
     port: 
       - 21724
       - "443"
-    to: "199.119.112.148"
+    to: "199.119.112.141"
 hosts: {}
 ip_address: "199.119.112.208"
 location: 
@@ -37,7 +37,7 @@ mail:
     - cat.unstable.bitmask.net
 name: tuatara
 obfsproxy: 
-  gateway_address: "199.119.112.148"
+  gateway_address: "199.119.112.141"
   scramblesuit: 
     password: JJAUC422KNVGMMRXIZIGM3LOK44XMQ2Z
     port: 21724
@@ -53,7 +53,7 @@ openvpn:
     tls-cipher: DHE-RSA-AES128-SHA
     tun-ipv6: true
   filter_dns: false
-  gateway_address: "199.119.112.148"
+  gateway_address: "199.119.112.141"
   limited_prefix: LIMITED
   ports: 
     - "443"
@@ -85,7 +85,7 @@ sources:
     type: git
   platform: 
     apt: 
-      basic: "http://deb.leap.se/experimental-0.8"
+      basic: "http://deb.leap.se/0.8"
   soledad: 
     package: soledad-server
     revision: latest
diff --git a/nodes/aardwolf.json b/nodes/aardwolf.json
index 63a62a1..8ba0cb8 100644
--- a/nodes/aardwolf.json
+++ b/nodes/aardwolf.json
@@ -8,14 +8,8 @@
     "dc",
     "unstable"
   ],
-  "sources": {
-    "platform": {
-      "apt": {
-        "basic": "http://deb.leap.se/experimental-0.8"
-      }
-    }
-  },
   "couch": {
-    "mode": "plain"
+    "mode": "plain",
+    "pwhash_alg": "pbkdf2"
   }
 }
diff --git a/nodes/cat.json b/nodes/cat.json
index c74847d..33bfa3b 100644
--- a/nodes/cat.json
+++ b/nodes/cat.json
@@ -1,12 +1,5 @@
 {
   "ip_address": "199.119.112.206",
   "services": "mx",
-  "tags": ["unstable", "dc"],
-  "sources": {
-    "platform": {
-      "apt": {
-        "basic": "http://deb.leap.se/experimental-0.8"
-      }
-    }
-  }
+  "tags": ["unstable", "dc"]
 }
diff --git a/nodes/donkey.json b/nodes/donkey.json
index 0600a80..c18af3d 100644
--- a/nodes/donkey.json
+++ b/nodes/donkey.json
@@ -2,24 +2,11 @@
   "ip_address": "199.119.112.207",
   "services": [
     "monitor",
-    "webapp",
-    "pixelated"
+    "webapp"
   ],
   "tags": [
     "dc",
     "sandbox-braintree",
     "unstable"
-  ],
-  "sources": {
-    "platform": {
-      "apt": {
-        "basic": "http://deb.leap.se/experimental-0.8"
-      }
-    },
-    "webapp": {
-      "type": "git",
-      "source": "https://leap.se/git/leap_web",
-      "revision": "origin/develop"
-    }
-  }
+  ]
 }
diff --git a/nodes/tuatara.json b/nodes/tuatara.json
index 42677bb..82443df 100644
--- a/nodes/tuatara.json
+++ b/nodes/tuatara.json
@@ -1,18 +1,11 @@
 {
   "ip_address": "199.119.112.208",
   "openvpn": {
-        "gateway_address": "199.119.112.148"
+        "gateway_address": "199.119.112.141"
   },
   "services": "openvpn",
   "tags": [
     "dc",
     "unstable"
-  ],
-  "sources": {
-    "platform": {
-      "apt": {
-        "basic": "http://deb.leap.se/experimental-0.8"
-      }
-    }
-  }
+  ]
 }
diff --git a/secrets.json b/secrets.json
index 78e9f2d..c78043f 100644
--- a/secrets.json
+++ b/secrets.json
@@ -80,7 +80,8 @@
     "webapp_secret_token": "43bMDssusIZfqnAsDnfrKNVt9mNuLwad"
   },
   "unstable": {
-    "api_monitor_auth_token": "pAfrMH9kd7FfdKq5m2k9FxYhghhpZ5Qr",
+    "api_monitor_auth_token": "AuAf4eu94UfDNLqnujJLrbLVnBxRHPeR",
+    "bigcouch_cookie": "hBwa3HkByLdjDZ5LdkwddTvk7XITIWHc",
     "couch_admin_password": "LYaDX9L9QKe2Re6p8dFKhu_t2XCxTqNZ",
     "couch_admin_password_salt": "b9d35fd378ba1598e843d5a784cfdf7e",
     "couch_leap_mx_password": "C3L8QnFCMpaKGQghMAW9gERSmhAuNvfC",
@@ -91,6 +92,8 @@
     "couch_replication_password_salt": "01a82aa87990d967cfb81f3ff32f8095",
     "couch_soledad_password": "35MzsnEEAeHTVNhI_FaCFNS5bhd7RGEf",
     "couch_soledad_password_salt": "7f725f3cc60c388e9af8140555e09dfa",
+    "couch_tapicero_password": "LhRqFb88ady9dDEuTyIJMcEUZSnmyLrH",
+    "couch_tapicero_password_salt": "3160126c5cc3780acfd3d2edfc78d1bb",
     "couch_webapp_password": "enfhmsmcLc3Az3GF6TFKwRk99Iqjm2ew",
     "couch_webapp_password_salt": "478bf7e8ca879a9711b279055f00153e",
     "nagios_admin_password": "r35FbwIuktJZXFfbnrVxCh8StDnIzhXj",