Updated certs for mail, demo, bitmask.net, unstable

20 files changed, 271 insertions, 271 deletions

diff --git a/files/cert/bitmask.net.crt b/files/cert/bitmask.net.crt
index 447c18b..daa22f7 100644
--- a/files/cert/bitmask.net.crt
+++ b/files/cert/bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIF+TCCBOGgAwIBAgISAwqAz462Os6oeSr6Cz52q2CEMA0GCSqGSIb3DQEBCwUA
+MIIF+TCCBOGgAwIBAgISBK0XH330dIc8ONMGSuho0ZYpMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA5NDVaFw0x
-ODAyMDYwNzA5NDVaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODA5MzlaFw0x
+ODA0MjIwODA5MzlaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
 9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
 R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
 0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -25,12 +25,12 @@ Gmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGrBggrBgEFBQcCAjCBngyBm1Ro
 aXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24gYnkgUmVseWlu
 ZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgQ2VydGlm
 aWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5cHQub3JnL3Jl
-cG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAMItemySxEnBFGBU3PDScyefbN
-Hw1nvgAzOKqS/c6gOVAHUrRDvshIrY1xBIXTddp8E4QxjQdcscZBv7ckS3+TJozM
-YCyLxZQRp3MB169MeexTsOiEz5ZizOeX1/e5rKxtrs60WGj/6WWJN5gDm9MhU1ft
-Ae/dDg/t+4SbxBbv367AIs4bJ8XoQmtOm0ONL3yVNWTNZTRQ1FTtqVAoVFMIWxf0
-a7uKMm3rkNuJYGfU1bJrqNmW7Hu2yi+ibNLpgtVObadpxP517XaK+buUh5NJlawt
-AwqP2r0bjYebY3E+aq6wf5nKnl14WLNjopgk985nQxVVnBDXHpnKM1tuia6L
+cG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQCKQbBv1qOEGNdW7vxKfseuv1rm
+IcsROFXe2xxeet2Zg/JL6FfIT2cVAyFSV2f14dhLrAjab9BaccNuwIjunG6wBFw6
+OsU58HAO3BU3DIo521q/niHrluAEuuYFzSCsSv+pg9bQYvMbr9WGxdVuDb/uwx8y
+XDIeRyYngoGHLRYYnzCc97iWMSGH1IS3Ww6e91dOzLerkwsSbrW+VNAOVXQeJKiU
+t993pvl0+dCyVTpKMgJ2WVavnVGTk75aHnUg0eNZsf58hRNphecUdhgEcU/z92og
+b+XArRj2415tmd8lVj3exNu9icUKDydiTVjCfiqs9pbl8AGUJLBQUwaFXmtt
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/demo.bitmask.net.crt b/files/cert/demo.bitmask.net.crt
index b882639..49836a6 100644
--- a/files/cert/demo.bitmask.net.crt
+++ b/files/cert/demo.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGAzCCBOugAwIBAgISA28rdLLf5A0XdXRnRG6130t+MA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISBF7OKwgjyJPD6NP3a5dIXC3/MA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA4NDZaFw0x
-ODAyMDYwNzA4NDZaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODEwMDFaFw0x
+ODA0MjIwODEwMDFaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
 CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
 qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
 ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -25,13 +25,13 @@ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
 AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
 IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
 dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAcTYW/H4RzDwG
-k6aAAg5KHOOZxaKogXGIEWWMbsZDhxJZH7EyY1SJnp1NZIflYyl3l6FztYMsE60E
-bF12+OlYbHewHAnp+wGYdHNfc5Y0mXpF/QB7tUlHXi8vw0VTZe+icMANNV5KYMsF
-ASrsooWcXG/zjm8rO/ULHQWae0bUNzruxwNXarjAh3G3ehLLxvc5gtZMJvdCYUX8
-v0Xu/oFOEucDIOLhuIRwHq5yenx+XFgF4yY2F70YdisYNxZ8gUOFeMo+fNW9ZiNW
-or9evx3NxeO9GBeu6EG4DvTMZDax+ZImQyIXAczHkJtX9s9q278COjem548pNPlb
-vNjxUGydBw==
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEACfXtd0vYlDrs
+IPK8Z4q9825r1qZIOJ43wW5dwf6yhMnfcngMbrrzekBw4BwOuey6DstV7WGexdnz
+6K87ixgQxf7cwT1kVbSDc/O6Wv4lGGPyDDX8/fI7/hLEx6k+XfjT95wE7kpZ/7G7
+xkz776OS9D7eHSIyfnDDdrf1Us1OTVOzP/ntVmVBdvYyaaeC3xZpaOTdsfTN1D6Q
+9lwrFf4DWnAXni/nIuWjAlPI0WI42CIwakmtrycayhis/HTNwoC4qazzwKvdRvU7
+MecTyPQdpWh6BkBtWy2eJL+EVjII/JuIrhM2M1QRCzJbJMaDSnwTPQHPlSmAznFq
+Fl1OajMuVQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/mail.bitmask.net.crt b/files/cert/mail.bitmask.net.crt
index 1ed7a01..b9adc93 100644
--- a/files/cert/mail.bitmask.net.crt
+++ b/files/cert/mail.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGAzCCBOugAwIBAgISAxR/MmRofrqfVdxwlug6BQP+MA0GCSqGSIb3DQEBCwUA
+MIIGAzCCBOugAwIBAgISBGU3UlarhTgt1x1XSwCxf9g2MA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA5MzRaFw0x
-ODAyMDYwNzA5MzRaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODExMjRaFw0x
+ODA0MjIwODExMjRaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
 CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw
 vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z
 UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg
@@ -25,13 +25,13 @@ CCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNyeXB0Lm9yZzCBqwYIKwYBBQUH
 AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
 IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
 dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAM98mEWTEBdww
-J7vGw+8n8HlTjhdrA3kxqxBd8Xs2jvRARcrwqqOcjj71W2cWkyquxtPU/wde4G5n
-/R9p6YMyqH7S6WESssXofECnBBet4tKkvkqSQ/9qqluyi5A6aUxQon8229QgNwyK
-2bDOmrSacGzwwSnHuLrEIvDgkebPkVOa1DDhZkiHQnKFfHyzhDJhWFtb00qYsO+L
-5JXfBEUKSj68O4pCGyVcDScJdZQCwU5jk1u2jNqmyWUAqo7hD7inLwGi23aiVu1I
-W3A2NvwPPoKbwMsbhPwMM0Aeq7CEeGNa23pAIjXIitncJcd/1gHcJbTd+MJ/U2L4
-zs+tDWuCrw==
+eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAkHy1l5RL7+wQ
+cQrBfky+EhztXY7sum8KJpbdBmuwIybvlcvuN8KbhwhcPiPP3eXrZ1QQPniSp3rV
+r8xPHuOnQVF+D3UipqN/NgLfA3qkEMsDNgoND0IBEViyN2hoyMIRQPQUOxn3c2LX
+NVJSRbsC9sZmWocWprCyHxSM5riFR+eTNlQOU06UHai315SR4qkzY+M4O8fIN5k1
+XpKXTQwg+kPYQZFhskoQEgtH0Ssy0E48KoxkrhnQZKZJdmurlh3IW6A7eEwApCRu
+J2wGuCCG/coivF9aUCA8nyogIWlBkEJC6qrT/QL3aUfoivOHNkBf2p3DTNdr201S
+/7xGJLeAhA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/cert/unstable.bitmask.net.crt b/files/cert/unstable.bitmask.net.crt
index 543418f..da6b23e 100644
--- a/files/cert/unstable.bitmask.net.crt
+++ b/files/cert/unstable.bitmask.net.crt
@@ -1,8 +1,8 @@
 -----BEGIN CERTIFICATE-----
-MIIGCzCCBPOgAwIBAgISBE8unpyvMemVquRxXeZJUhVKMA0GCSqGSIb3DQEBCwUA
+MIIGCzCCBPOgAwIBAgISBN/v9hYhh+DJxbvPhwZeh/ZwMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMjIwOTA5NDhaFw0x
-ODAyMjAwOTA5NDhaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODA4MzZaFw0x
+ODA0MjIwODA4MzZaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
 IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
 /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
 IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
@@ -25,13 +25,13 @@ AQEwgdYwJgYIKwYBBQUHAgEWGmh0dHA6Ly9jcHMubGV0c2VuY3J5cHQub3JnMIGr
 BggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVs
 aWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFu
 Y2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8v
-bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQBu
-JHQYqNO0gaJbCrU/36dUJJpz/XMW2NUZVwOGXp9PRHO9+kuqqhpRoIJ3t4YVbt4y
-IFuV/MGhWScnAqQptiJSzprYcz3yst8nl819Oamfhn6MZHPriZm32hxiUuoFIFDX
-AUgV5ZOz3DJpU5MLFbv5SLXJPb6k/6hUweMRNm0yKdyN5CIbPSYqQ6hsO5+E2UU9
-n+hYnPLd+2P0iHqogVdIE4nkGOJvEq8L5vq8n7wcWCx8T/OPHSl3cUhrXI8nYxP5
-0qCesYAkEhua/0MJ3FfuOCaPipC0W6oMEk9rbA6NtaRJgfIvK1yueI4Rqewd0E0m
-ITd2metRV2662e0j8sRR
+bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAm
+wkqlVwVjfpItE1vcd5/DxwMOZZbTyfdcFMn4sLEvUaZGwPIiTNGtNfhVoLAD3jrI
+Pje1iCuLQzEKiTLqUz2Y82arGIWkHjpm/wkKqoBdevv1/eeKIFR8B2o3E/WY442Y
+ss6hoR+9Fd7rJdjFKI0wbZNMEqTB4Q7zQKiDeNFxwcFQT/2rQJmVKNjHMUfJGoaQ
+p6nXyYisd3zyN/4Pf7Ywo4xA946n+nEQbrH8fG6+gsqD8h781iVgqEO18hoVx+kT
+A/YOZMlJTcgsj6yNGhP6PwDKZWfA9AMX0upHHfLbZSKv/pFatKYAao1FsqkWAiSp
+ZUpFMnBKhCbDFBvTcAoP
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/files/nodes/alpaca/alpaca.crt b/files/nodes/alpaca/alpaca.crt
index f7ee291..447a867 100644
--- a/files/nodes/alpaca/alpaca.crt
+++ b/files/nodes/alpaca/alpaca.crt
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIF9TCCA92gAwIBAgIQVbBM6lSV5Pl8GANTHXOoBzANBgkqhkiG9w0BAQsFADBK
+MIIF9TCCA92gAwIBAgIQN+5ECaIEnJ4kD1LB0MAO/TANBgkqhkiG9w0BAQsFADBK
 MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTcwMjE1MDAwMDAwWhcNMTgw
-MjE1MDAwMDAwWjAiMSAwHgYDVQQDDBdhbHBhY2EubWFpbC5iaXRtYXNrLm5ldDCC
-AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM/zsPdRxMOG4HB7BPyaLWQZ
-XSk7PHQPy51b+TLXweXpA/iJ+R73j+pbi3eE6AQoXk20plty4htUVGdMdcHosdDC
-bnVA393SPOEEuEeC/Dofn5XPD3rzlYICfE3g8KSTD+XVToNk4aU1TdY/fq5LtE3c
-cjyBdPsm0s28EqsmOr1VZm4tp5lIvvdtYAr4NNsyIAqbKlcmYJbXJnDR6cJtCjxe
-yi4LDNq43lpKTbL39GVOJkbw/c2PZYfOlgKglxNldP1/7rte44M8+e97htj5Y0gW
-wah3kFNXeFYTNdCTdKrsxnnyrShslr3hWg/PgZqJ8rH+JNmX6rWc8iCghu7qHUvA
-7JBMx8z6Dxg5ROc38owP3UI5S7pqpKdA3qSIvgHTNumZDPXkFga48Hxo/whV1ljx
-kj/3Fsg1XC/oc8k4Ajkm6jSI58RzH0ul9j2Jew3NSEFmRVMhR8DdzBhlCbQNesqo
-Zd5bMboFDxlm9btT4YOtWPpOnu3ga51OtXzktJTtkDvDF2K6gq5rDwSzzVJzzrxZ
-zkLWAkTaY21QsPS80DCNKTAJMYZQWW10yDdNRgFhx267MQHy+dY8DhiHwHLPDjhI
-TW4+he9WYBJgClhDP2hVAWUwbV2RWnlHF4TA8nt6lNq83xt03M0Rpwx6jqveYJUU
-a22U5piruGudUz5SWLgFAgMBAAGjgf4wgfswHQYDVR0OBBYEFAcURfXFRa+O0GlJ
-dAtGbZn7qSukMIGBBgNVHREEejB4ghVhbHBhY2EubWFpbC5iaXRtYXNrLmmCF2Fs
+BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTgwMTIyMDAwMDAwWhcNMTkw
+MTIyMDAwMDAwWjAiMSAwHgYDVQQDDBdhbHBhY2EubWFpbC5iaXRtYXNrLm5ldDCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOT8hKZpbPZnT1uI8+bSxcTF
+CdHBgpqTUtLo8/wNape0R4gj3jvQeY0Gmt1cg3Uc084ND0Gx1HXUclRHAGC8Oarf
+4kog6MUyUMxlbfY9ECiMORjZWFeoXmN/Jb+GiBlvTePEYgokO3FNcoTOcQnGmkHP
+i9Dw0YMYDnsxLIiCOBsiYmY73p1e1pOw06BG8KhNwByLFeugOimItV7vZvhGD7lN
+BiUnYsBlTqnNSGzYc7llPFirEkMtq66zRNApR4e+7DHPlZ16TJg4NB9wzECr079/
+wgaWMStzCfRHyg89OkZuoQLVR9ZVhX0kBLyKDXTQ6Nun7iZQE0mhAE6Q/0oMO1Yd
+bmQPOHmPtphaf9dF9efcQ24VtzvCl24Nk5IeBdL4nuIdex9yog2do5xTTxLi/0Nb
+js3HAYYfcOxy/UJUD3D8CrN7JhZ+MLjTeuYhcwCe/3uw16Js7YXrDrPDs1KpWmiv
+OVN1feBVbhxitc1PMM9bsc0aW91BO82G6OoJiVMmUcM0F1RDXC3otjcYq5qeILnv
+m2k1DRv4LCFektQt4e/+0ZMmhlfpRsozPm03BiUz5euAaC6PDUvYq+b1ygYH53Zm
+gH/yqxDuqyX0YjDLKmIBXVlFj99DzJWzswlyhpD1ipifhThDoeTDKGr2+T893zlX
+VC+xrjmOWmt+k8XOVtfNAgMBAAGjgf4wgfswHQYDVR0OBBYEFIFyVNiK9mg5SmMw
+rTaairvbkep2MIGBBgNVHREEejB4ghVhbHBhY2EubWFpbC5iaXRtYXNrLmmCF2Fs
 cGFjYS5tYWlsLmJpdG1hc2submV0ghRhcGkubWFpbC5iaXRtYXNrLm5ldIIQbWFp
 bC5iaXRtYXNrLm5ldIIYbmlja255bS5tYWlsLmJpdG1hc2submV0hwTHd3DfMAsG
 A1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0T
 BAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0B
-AQsFAAOCAgEAaeixMSXaz2Gfc05wwnVbpgNM1REoZxmIcHQH/QZrZwPmUqsRswo1
-xTDju9YzfPLRVDs9R6dDWVChVQfgeWWwnBPOm7mJKvQjRtVoKcUQ4jJ3N/cvKg+R
-Sjrv8MATnI9B1QwSCRUAbYdFrcWs0pg3nxLArP6Lftah26pBDvcLPMAaYxEAst24
-Fe+SB6NV89xnxclR6VrB+8umiy5G5awIQ3AGwwLtX+mcmWcdgEFr/0JdXnMvyA4M
-BGbgXzletJnIFnWaKZa9A12WF4UdDYTUIln7JV99Y+6uY5uvyiXzTGDn5Xwci44f
-Htt8Kxnh8IVNbsXE/xYmHTQvuf2kO32YY346fo9vT2Wfknn6e6+ak6P/Cbb7sfAZ
-u9BQReC1SomVzYZfh/CobPiHSewboZGEpGoDRouVaEFlxdpHfOlcMW9rtPW45L0f
-1m3U1KsYFKJ82Q1gxSeHk7eXlV/7qzqDriO22fINBcm4E2bFYsjh9ahQYzAa/oPq
-wek9+QqQUNNc2SIHTD90FO+iV9VIXA0+bId1+By173oe8F9sZTaj4+8VA50HeQ5+
-I8INd5pFMgyMUgb2tSnq6OXus3eR1DrcW1/S+WtbZR4FtBrDW8eUkCjU8eM2wbBJ
-lWj9QVuWEW88cn56onr9rZIcApKoRZnDNCqw0UuNa1Jpps4ZES5tsv8=
+AQsFAAOCAgEAoIFYxaFp0xT8IWXtHdZ35t837536o9MIUxVN9TfSEiqkQI9Z0eM0
+GvcV3DHx9W0511kiQ7ByBBFj9XKFd91Pv8DMD8qAFJdOvdNLlzUO1hkYuYC0FmwP
+24RXttpiyj46T/NRaCuVG4yjjPj82bxghdW4T8BO1j9M3SmugbAxOG9XxsitTOwm
+d2HWsNytuXR2EwNBRXL4imfKhdD3aEm18yl99GGfujLxs51P0ejWGwu2yYGHIJOs
+R8WUGVX29jDW3Hw4D3sTtgoWN7Nf17kIMzIQUSKURi7HngsIcp1pWrbMYszo66Qq
+4BDXNctBMFsVBVrEOIkKXekQyEkeYBJzrpMkAtCZaQ4GLjZwd2W1wkigRvBBrn8f
+RxASlmMheRAQ7nnlRl6WFb8f4go44vS6XgFg7gZB52HHPeVufD+YJqMXG1yUu6IE
+GvIgEfFoP+ehG9Yv8xVsdZvCFIJlL1/axHnW0ogLH8kx3bXkGUsXjzKcLw6yWQcd
+Q1Qwj0y0uwDuhzIG9WboroWOuh8jIWYS/IydLIOpC6ysrCaXdZnUC0XYOn2z7mEp
+9rCDd6s4RpKya9h1IJXafQtd1+MzGv3AHsaYfGgA+MqeBBmOsOALNH1DgT9ab1Rx
+MvRJk44UmqRTYuarHIJiCJ2kUJIPStxBnfH5B/3rjaV3ZPjMsQWZ4ow=
 -----END CERTIFICATE-----
diff --git a/files/nodes/alpaca/alpaca.key b/files/nodes/alpaca/alpaca.key
index 44f6a9e..8b0d0ee 100644
--- a/files/nodes/alpaca/alpaca.key
+++ b/files/nodes/alpaca/alpaca.key
@@ -1,51 +1,51 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
diff --git a/hiera/aardwolf.yaml b/hiera/aardwolf.yaml
index 8c871bd..63ac15f 100644
--- a/hiera/aardwolf.yaml
+++ b/hiera/aardwolf.yaml
@@ -107,19 +107,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/alpaca.yaml b/hiera/alpaca.yaml
index f90cf2f..4b02fb0 100644
--- a/hiera/alpaca.yaml
+++ b/hiera/alpaca.yaml
@@ -256,19 +256,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -482,38 +482,38 @@ x509:
       -----END CERTIFICATE-----
   cert: |
       -----BEGIN CERTIFICATE-----
-      MIIF9TCCA92gAwIBAgIQVbBM6lSV5Pl8GANTHXOoBzANBgkqhkiG9w0BAQsFADBK
+      MIIF9TCCA92gAwIBAgIQN+5ECaIEnJ4kD1LB0MAO/TANBgkqhkiG9w0BAQsFADBK
       MRgwFgYDVQQDDA9CaXRtYXNrIFJvb3QgQ0ExEDAOBgNVBAoMB0JpdG1hc2sxHDAa
-      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTcwMjE1MDAwMDAwWhcNMTgw
-      MjE1MDAwMDAwWjAiMSAwHgYDVQQDDBdhbHBhY2EubWFpbC5iaXRtYXNrLm5ldDCC
-      AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAM/zsPdRxMOG4HB7BPyaLWQZ
-      XSk7PHQPy51b+TLXweXpA/iJ+R73j+pbi3eE6AQoXk20plty4htUVGdMdcHosdDC
-      bnVA393SPOEEuEeC/Dofn5XPD3rzlYICfE3g8KSTD+XVToNk4aU1TdY/fq5LtE3c
-      cjyBdPsm0s28EqsmOr1VZm4tp5lIvvdtYAr4NNsyIAqbKlcmYJbXJnDR6cJtCjxe
-      yi4LDNq43lpKTbL39GVOJkbw/c2PZYfOlgKglxNldP1/7rte44M8+e97htj5Y0gW
-      wah3kFNXeFYTNdCTdKrsxnnyrShslr3hWg/PgZqJ8rH+JNmX6rWc8iCghu7qHUvA
-      7JBMx8z6Dxg5ROc38owP3UI5S7pqpKdA3qSIvgHTNumZDPXkFga48Hxo/whV1ljx
-      kj/3Fsg1XC/oc8k4Ajkm6jSI58RzH0ul9j2Jew3NSEFmRVMhR8DdzBhlCbQNesqo
-      Zd5bMboFDxlm9btT4YOtWPpOnu3ga51OtXzktJTtkDvDF2K6gq5rDwSzzVJzzrxZ
-      zkLWAkTaY21QsPS80DCNKTAJMYZQWW10yDdNRgFhx267MQHy+dY8DhiHwHLPDjhI
-      TW4+he9WYBJgClhDP2hVAWUwbV2RWnlHF4TA8nt6lNq83xt03M0Rpwx6jqveYJUU
-      a22U5piruGudUz5SWLgFAgMBAAGjgf4wgfswHQYDVR0OBBYEFAcURfXFRa+O0GlJ
-      dAtGbZn7qSukMIGBBgNVHREEejB4ghVhbHBhY2EubWFpbC5iaXRtYXNrLmmCF2Fs
+      BgNVBAsME2h0dHBzOi8vYml0bWFzay5uZXQwHhcNMTgwMTIyMDAwMDAwWhcNMTkw
+      MTIyMDAwMDAwWjAiMSAwHgYDVQQDDBdhbHBhY2EubWFpbC5iaXRtYXNrLm5ldDCC
+      AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOT8hKZpbPZnT1uI8+bSxcTF
+      CdHBgpqTUtLo8/wNape0R4gj3jvQeY0Gmt1cg3Uc084ND0Gx1HXUclRHAGC8Oarf
+      4kog6MUyUMxlbfY9ECiMORjZWFeoXmN/Jb+GiBlvTePEYgokO3FNcoTOcQnGmkHP
+      i9Dw0YMYDnsxLIiCOBsiYmY73p1e1pOw06BG8KhNwByLFeugOimItV7vZvhGD7lN
+      BiUnYsBlTqnNSGzYc7llPFirEkMtq66zRNApR4e+7DHPlZ16TJg4NB9wzECr079/
+      wgaWMStzCfRHyg89OkZuoQLVR9ZVhX0kBLyKDXTQ6Nun7iZQE0mhAE6Q/0oMO1Yd
+      bmQPOHmPtphaf9dF9efcQ24VtzvCl24Nk5IeBdL4nuIdex9yog2do5xTTxLi/0Nb
+      js3HAYYfcOxy/UJUD3D8CrN7JhZ+MLjTeuYhcwCe/3uw16Js7YXrDrPDs1KpWmiv
+      OVN1feBVbhxitc1PMM9bsc0aW91BO82G6OoJiVMmUcM0F1RDXC3otjcYq5qeILnv
+      m2k1DRv4LCFektQt4e/+0ZMmhlfpRsozPm03BiUz5euAaC6PDUvYq+b1ygYH53Zm
+      gH/yqxDuqyX0YjDLKmIBXVlFj99DzJWzswlyhpD1ipifhThDoeTDKGr2+T893zlX
+      VC+xrjmOWmt+k8XOVtfNAgMBAAGjgf4wgfswHQYDVR0OBBYEFIFyVNiK9mg5SmMw
+      rTaairvbkep2MIGBBgNVHREEejB4ghVhbHBhY2EubWFpbC5iaXRtYXNrLmmCF2Fs
       cGFjYS5tYWlsLmJpdG1hc2submV0ghRhcGkubWFpbC5iaXRtYXNrLm5ldIIQbWFp
       bC5iaXRtYXNrLm5ldIIYbmlja255bS5tYWlsLmJpdG1hc2submV0hwTHd3DfMAsG
       A1UdDwQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwCQYDVR0T
       BAIwADAfBgNVHSMEGDAWgBS5gYMsvayzCdikce8+ui3UlT4PjzANBgkqhkiG9w0B
-      AQsFAAOCAgEAaeixMSXaz2Gfc05wwnVbpgNM1REoZxmIcHQH/QZrZwPmUqsRswo1
-      xTDju9YzfPLRVDs9R6dDWVChVQfgeWWwnBPOm7mJKvQjRtVoKcUQ4jJ3N/cvKg+R
-      Sjrv8MATnI9B1QwSCRUAbYdFrcWs0pg3nxLArP6Lftah26pBDvcLPMAaYxEAst24
-      Fe+SB6NV89xnxclR6VrB+8umiy5G5awIQ3AGwwLtX+mcmWcdgEFr/0JdXnMvyA4M
-      BGbgXzletJnIFnWaKZa9A12WF4UdDYTUIln7JV99Y+6uY5uvyiXzTGDn5Xwci44f
-      Htt8Kxnh8IVNbsXE/xYmHTQvuf2kO32YY346fo9vT2Wfknn6e6+ak6P/Cbb7sfAZ
-      u9BQReC1SomVzYZfh/CobPiHSewboZGEpGoDRouVaEFlxdpHfOlcMW9rtPW45L0f
-      1m3U1KsYFKJ82Q1gxSeHk7eXlV/7qzqDriO22fINBcm4E2bFYsjh9ahQYzAa/oPq
-      wek9+QqQUNNc2SIHTD90FO+iV9VIXA0+bId1+By173oe8F9sZTaj4+8VA50HeQ5+
-      I8INd5pFMgyMUgb2tSnq6OXus3eR1DrcW1/S+WtbZR4FtBrDW8eUkCjU8eM2wbBJ
-      lWj9QVuWEW88cn56onr9rZIcApKoRZnDNCqw0UuNa1Jpps4ZES5tsv8=
+      AQsFAAOCAgEAoIFYxaFp0xT8IWXtHdZ35t837536o9MIUxVN9TfSEiqkQI9Z0eM0
+      GvcV3DHx9W0511kiQ7ByBBFj9XKFd91Pv8DMD8qAFJdOvdNLlzUO1hkYuYC0FmwP
+      24RXttpiyj46T/NRaCuVG4yjjPj82bxghdW4T8BO1j9M3SmugbAxOG9XxsitTOwm
+      d2HWsNytuXR2EwNBRXL4imfKhdD3aEm18yl99GGfujLxs51P0ejWGwu2yYGHIJOs
+      R8WUGVX29jDW3Hw4D3sTtgoWN7Nf17kIMzIQUSKURi7HngsIcp1pWrbMYszo66Qq
+      4BDXNctBMFsVBVrEOIkKXekQyEkeYBJzrpMkAtCZaQ4GLjZwd2W1wkigRvBBrn8f
+      RxASlmMheRAQ7nnlRl6WFb8f4go44vS6XgFg7gZB52HHPeVufD+YJqMXG1yUu6IE
+      GvIgEfFoP+ehG9Yv8xVsdZvCFIJlL1/axHnW0ogLH8kx3bXkGUsXjzKcLw6yWQcd
+      Q1Qwj0y0uwDuhzIG9WboroWOuh8jIWYS/IydLIOpC6ysrCaXdZnUC0XYOn2z7mEp
+      9rCDd6s4RpKya9h1IJXafQtd1+MzGv3AHsaYfGgA+MqeBBmOsOALNH1DgT9ab1Rx
+      MvRJk44UmqRTYuarHIJiCJ2kUJIPStxBnfH5B/3rjaV3ZPjMsQWZ4ow=
       -----END CERTIFICATE-----
   client_ca_cert: |
       -----BEGIN CERTIFICATE-----
@@ -604,10 +604,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGAzCCBOugAwIBAgISAxR/MmRofrqfVdxwlug6BQP+MA0GCSqGSIb3DQEBCwUA
+      MIIGAzCCBOugAwIBAgISBGU3UlarhTgt1x1XSwCxf9g2MA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA5MzRaFw0x
-      ODAyMDYwNzA5MzRaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODExMjRaFw0x
+      ODA0MjIwODExMjRaMBsxGTAXBgNVBAMTEG1haWwuYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyhT0kMzDz58rdxvhtMh194Ob1AkDw
       vwvh5wglRJWRzCNT+HUolygX5lzae16qyygXBaiVu2NDo+LIwjxwLZF9BcGhUj5Z
       UXuuKvkA1EZnBXxoAUhrwUSk8hgpgTfecCa96OTOs9XRxVv6Brf0IGy55s3E6ARg
@@ -630,13 +630,13 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAM98mEWTEBdww
-      J7vGw+8n8HlTjhdrA3kxqxBd8Xs2jvRARcrwqqOcjj71W2cWkyquxtPU/wde4G5n
-      /R9p6YMyqH7S6WESssXofECnBBet4tKkvkqSQ/9qqluyi5A6aUxQon8229QgNwyK
-      2bDOmrSacGzwwSnHuLrEIvDgkebPkVOa1DDhZkiHQnKFfHyzhDJhWFtb00qYsO+L
-      5JXfBEUKSj68O4pCGyVcDScJdZQCwU5jk1u2jNqmyWUAqo7hD7inLwGi23aiVu1I
-      W3A2NvwPPoKbwMsbhPwMM0Aeq7CEeGNa23pAIjXIitncJcd/1gHcJbTd+MJ/U2L4
-      zs+tDWuCrw==
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAkHy1l5RL7+wQ
+      cQrBfky+EhztXY7sum8KJpbdBmuwIybvlcvuN8KbhwhcPiPP3eXrZ1QQPniSp3rV
+      r8xPHuOnQVF+D3UipqN/NgLfA3qkEMsDNgoND0IBEViyN2hoyMIRQPQUOxn3c2LX
+      NVJSRbsC9sZmWocWprCyHxSM5riFR+eTNlQOU06UHai315SR4qkzY+M4O8fIN5k1
+      XpKXTQwg+kPYQZFhskoQEgtH0Ssy0E48KoxkrhnQZKZJdmurlh3IW6A7eEwApCRu
+      J2wGuCCG/coivF9aUCA8nyogIWlBkEJC6qrT/QL3aUfoivOHNkBf2p3DTNdr201S
+      /7xGJLeAhA==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
@@ -719,55 +719,55 @@ x509:
       -----END RSA PRIVATE KEY-----
   key: |
       -----BEGIN RSA PRIVATE KEY-----
-      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
+      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
       -----END RSA PRIVATE KEY-----
   use: true
   use_commercial: true
diff --git a/hiera/ant.yaml b/hiera/ant.yaml
index cc0b101..5ec5539 100644
--- a/hiera/ant.yaml
+++ b/hiera/ant.yaml
@@ -86,19 +86,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/cat.yaml b/hiera/cat.yaml
index 2d3085e..632c63f 100644
--- a/hiera/cat.yaml
+++ b/hiera/cat.yaml
@@ -106,19 +106,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/demodex.yaml b/hiera/demodex.yaml
index a93268b..65f2d80 100644
--- a/hiera/demodex.yaml
+++ b/hiera/demodex.yaml
@@ -47,19 +47,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/diplocaulus.yaml b/hiera/diplocaulus.yaml
index d72c40b..d935873 100644
--- a/hiera/diplocaulus.yaml
+++ b/hiera/diplocaulus.yaml
@@ -55,19 +55,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -166,10 +166,10 @@ static:
           -----END CERTIFICATE-----
       cert: |
           -----BEGIN CERTIFICATE-----
-          MIIF+TCCBOGgAwIBAgISAwqAz462Os6oeSr6Cz52q2CEMA0GCSqGSIb3DQEBCwUA
+          MIIF+TCCBOGgAwIBAgISBK0XH330dIc8ONMGSuho0ZYpMA0GCSqGSIb3DQEBCwUA
           MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA5NDVaFw0x
-          ODAyMDYwNzA5NDVaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
+          ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODA5MzlaFw0x
+          ODA0MjIwODA5MzlaMBYxFDASBgNVBAMTC2JpdG1hc2submV0MIICIjANBgkqhkiG
           9w0BAQEFAAOCAg8AMIICCgKCAgEAp7bmYyi5KdLAcnEndZUCVoJw19cZgaDwJb/I
           R1fuHhHkp98J9VPM+vke/8TElLHvdgfNWN1SpCM3uMFtdX6FS2Z4E2MchKp0o7H/
           0CkmEF/ybcNP3MdubTGtutRKkIm8MIqyOZIPNomh9Apwx+HfLi9S+/3hx1UTbelp
@@ -192,12 +192,12 @@ static:
           aXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVsaWVkIHVwb24gYnkgUmVseWlu
           ZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgQ2VydGlm
           aWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8vbGV0c2VuY3J5cHQub3JnL3Jl
-          cG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAMItemySxEnBFGBU3PDScyefbN
-          Hw1nvgAzOKqS/c6gOVAHUrRDvshIrY1xBIXTddp8E4QxjQdcscZBv7ckS3+TJozM
-          YCyLxZQRp3MB169MeexTsOiEz5ZizOeX1/e5rKxtrs60WGj/6WWJN5gDm9MhU1ft
-          Ae/dDg/t+4SbxBbv367AIs4bJ8XoQmtOm0ONL3yVNWTNZTRQ1FTtqVAoVFMIWxf0
-          a7uKMm3rkNuJYGfU1bJrqNmW7Hu2yi+ibNLpgtVObadpxP517XaK+buUh5NJlawt
-          AwqP2r0bjYebY3E+aq6wf5nKnl14WLNjopgk985nQxVVnBDXHpnKM1tuia6L
+          cG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQCKQbBv1qOEGNdW7vxKfseuv1rm
+          IcsROFXe2xxeet2Zg/JL6FfIT2cVAyFSV2f14dhLrAjab9BaccNuwIjunG6wBFw6
+          OsU58HAO3BU3DIo521q/niHrluAEuuYFzSCsSv+pg9bQYvMbr9WGxdVuDb/uwx8y
+          XDIeRyYngoGHLRYYnzCc97iWMSGH1IS3Ww6e91dOzLerkwsSbrW+VNAOVXQeJKiU
+          t993pvl0+dCyVTpKMgJ2WVavnVGTk75aHnUg0eNZsf58hRNphecUdhgEcU/z92og
+          b+XArRj2415tmd8lVj3exNu9icUKDydiTVjCfiqs9pbl8AGUJLBQUwaFXmtt
           -----END CERTIFICATE-----
           -----BEGIN CERTIFICATE-----
           MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/donkey.yaml b/hiera/donkey.yaml
index b2e1b27..f25a7bc 100644
--- a/hiera/donkey.yaml
+++ b/hiera/donkey.yaml
@@ -486,13 +486,13 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
@@ -854,10 +854,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGCzCCBPOgAwIBAgISBE8unpyvMemVquRxXeZJUhVKMA0GCSqGSIb3DQEBCwUA
+      MIIGCzCCBPOgAwIBAgISBN/v9hYhh+DJxbvPhwZeh/ZwMA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMjIwOTA5NDhaFw0x
-      ODAyMjAwOTA5NDhaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODA4MzZaFw0x
+      ODA0MjIwODA4MzZaMB8xHTAbBgNVBAMTFHVuc3RhYmxlLmJpdG1hc2submV0MIIC
       IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0u3IkbJ8qpGsFOWCm4K3QKk
       /50vHLTq/gqU4xYeGCvpHQRw59wasVCLSZWEmemVjBQtQ7tjWUYaVbFHtqRX/KwG
       IQIEZ4mkfneDczI71EVIsJMPn8sjzZrQHHyMSLFe3xIKCtsb25UlxmIL93h7KrvG
@@ -880,13 +880,13 @@ x509:
       BggrBgEFBQcCAjCBngyBm1RoaXMgQ2VydGlmaWNhdGUgbWF5IG9ubHkgYmUgcmVs
       aWVkIHVwb24gYnkgUmVseWluZyBQYXJ0aWVzIGFuZCBvbmx5IGluIGFjY29yZGFu
       Y2Ugd2l0aCB0aGUgQ2VydGlmaWNhdGUgUG9saWN5IGZvdW5kIGF0IGh0dHBzOi8v
-      bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQBu
-      JHQYqNO0gaJbCrU/36dUJJpz/XMW2NUZVwOGXp9PRHO9+kuqqhpRoIJ3t4YVbt4y
-      IFuV/MGhWScnAqQptiJSzprYcz3yst8nl819Oamfhn6MZHPriZm32hxiUuoFIFDX
-      AUgV5ZOz3DJpU5MLFbv5SLXJPb6k/6hUweMRNm0yKdyN5CIbPSYqQ6hsO5+E2UU9
-      n+hYnPLd+2P0iHqogVdIE4nkGOJvEq8L5vq8n7wcWCx8T/OPHSl3cUhrXI8nYxP5
-      0qCesYAkEhua/0MJ3FfuOCaPipC0W6oMEk9rbA6NtaRJgfIvK1yueI4Rqewd0E0m
-      ITd2metRV2662e0j8sRR
+      bGV0c2VuY3J5cHQub3JnL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEBCwUAA4IBAQAm
+      wkqlVwVjfpItE1vcd5/DxwMOZZbTyfdcFMn4sLEvUaZGwPIiTNGtNfhVoLAD3jrI
+      Pje1iCuLQzEKiTLqUz2Y82arGIWkHjpm/wkKqoBdevv1/eeKIFR8B2o3E/WY442Y
+      ss6hoR+9Fd7rJdjFKI0wbZNMEqTB4Q7zQKiDeNFxwcFQT/2rQJmVKNjHMUfJGoaQ
+      p6nXyYisd3zyN/4Pf7Ywo4xA946n+nEQbrH8fG6+gsqD8h781iVgqEO18hoVx+kT
+      A/YOZMlJTcgsj6yNGhP6PwDKZWfA9AMX0upHHfLbZSKv/pFatKYAao1FsqkWAiSp
+      ZUpFMnBKhCbDFBvTcAoP
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/giraffe.yaml b/hiera/giraffe.yaml
index 0233fc5..6fbe0a5 100644
--- a/hiera/giraffe.yaml
+++ b/hiera/giraffe.yaml
@@ -101,19 +101,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/leech.yaml b/hiera/leech.yaml
index dc5f9ba..1cec3bd 100644
--- a/hiera/leech.yaml
+++ b/hiera/leech.yaml
@@ -212,19 +212,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
@@ -560,10 +560,10 @@ x509:
   commercial_ca_cert: ~
   commercial_cert: |
       -----BEGIN CERTIFICATE-----
-      MIIGAzCCBOugAwIBAgISA28rdLLf5A0XdXRnRG6130t+MA0GCSqGSIb3DQEBCwUA
+      MIIGAzCCBOugAwIBAgISBF7OKwgjyJPD6NP3a5dIXC3/MA0GCSqGSIb3DQEBCwUA
       MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xNzExMDgwNzA4NDZaFw0x
-      ODAyMDYwNzA4NDZaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
+      ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xODAxMjIwODEwMDFaFw0x
+      ODA0MjIwODEwMDFaMBsxGTAXBgNVBAMTEGRlbW8uYml0bWFzay5uZXQwggIiMA0G
       CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCtPNOYXF7Gse1oYyj7CKkEEO9Br/3a
       qpfxscTwzgDlufrfGOfLFVQrE6YlcZOJw2ADB1RE/b4vOYKvQ/HpbzdnfSZpJtAT
       ngEHQIwmvHIdHmpxFHChyUwbdVtxH4Zb539JF2CyYsw9kp81uocFpduLxANwMhfV
@@ -586,13 +586,13 @@ x509:
       AgIwgZ4MgZtUaGlzIENlcnRpZmljYXRlIG1heSBvbmx5IGJlIHJlbGllZCB1cG9u
       IGJ5IFJlbHlpbmcgUGFydGllcyBhbmQgb25seSBpbiBhY2NvcmRhbmNlIHdpdGgg
       dGhlIENlcnRpZmljYXRlIFBvbGljeSBmb3VuZCBhdCBodHRwczovL2xldHNlbmNy
-      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEAcTYW/H4RzDwG
-      k6aAAg5KHOOZxaKogXGIEWWMbsZDhxJZH7EyY1SJnp1NZIflYyl3l6FztYMsE60E
-      bF12+OlYbHewHAnp+wGYdHNfc5Y0mXpF/QB7tUlHXi8vw0VTZe+icMANNV5KYMsF
-      ASrsooWcXG/zjm8rO/ULHQWae0bUNzruxwNXarjAh3G3ehLLxvc5gtZMJvdCYUX8
-      v0Xu/oFOEucDIOLhuIRwHq5yenx+XFgF4yY2F70YdisYNxZ8gUOFeMo+fNW9ZiNW
-      or9evx3NxeO9GBeu6EG4DvTMZDax+ZImQyIXAczHkJtX9s9q278COjem548pNPlb
-      vNjxUGydBw==
+      eXB0Lm9yZy9yZXBvc2l0b3J5LzANBgkqhkiG9w0BAQsFAAOCAQEACfXtd0vYlDrs
+      IPK8Z4q9825r1qZIOJ43wW5dwf6yhMnfcngMbrrzekBw4BwOuey6DstV7WGexdnz
+      6K87ixgQxf7cwT1kVbSDc/O6Wv4lGGPyDDX8/fI7/hLEx6k+XfjT95wE7kpZ/7G7
+      xkz776OS9D7eHSIyfnDDdrf1Us1OTVOzP/ntVmVBdvYyaaeC3xZpaOTdsfTN1D6Q
+      9lwrFf4DWnAXni/nIuWjAlPI0WI42CIwakmtrycayhis/HTNwoC4qazzwKvdRvU7
+      MecTyPQdpWh6BkBtWy2eJL+EVjII/JuIrhM2M1QRCzJbJMaDSnwTPQHPlSmAznFq
+      Fl1OajMuVQ==
       -----END CERTIFICATE-----
       -----BEGIN CERTIFICATE-----
       MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/hiera/lynx.yaml b/hiera/lynx.yaml
index fb35dff..469f74e 100644
--- a/hiera/lynx.yaml
+++ b/hiera/lynx.yaml
@@ -219,19 +219,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/millipede.yaml b/hiera/millipede.yaml
index 33a9714..bd18ca1 100644
--- a/hiera/millipede.yaml
+++ b/hiera/millipede.yaml
@@ -79,19 +79,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/orangutan.yaml b/hiera/orangutan.yaml
index c1a8757..12c875a 100644
--- a/hiera/orangutan.yaml
+++ b/hiera/orangutan.yaml
@@ -256,19 +256,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/otter.yaml b/hiera/otter.yaml
index aedf524..b1c50e2 100644
--- a/hiera/otter.yaml
+++ b/hiera/otter.yaml
@@ -80,19 +80,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: 
diff --git a/hiera/tuatara.yaml b/hiera/tuatara.yaml
index 557dfc5..97793b4 100644
--- a/hiera/tuatara.yaml
+++ b/hiera/tuatara.yaml
@@ -80,19 +80,19 @@ sources:
     revision: latest
     type: apt
   nickserver: 
-    revision: tags/0.10.0
+    revision: origin/master
     source: "https://leap.se/git/nickserver"
     type: git
   platform: 
     apt: 
       basic: "http://deb.leap.se/platform"
-      component: "0.10"
+      component: master
   soledad: 
     package: soledad-server
     revision: latest
     type: apt
   webapp: 
-    revision: tags/0.9.2
+    revision: origin/master
     source: "https://leap.se/git/leap_web"
     type: git
 ssh: