uc-cdis · frickjack · Oct 26, 2020 · Oct 23, 2020 · Oct 23, 2020
diff --git a/files/authorized_keys/ops_team b/files/authorized_keys/ops_team
@@ -1,5 +1,4 @@
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCfX+T2c3+iBP17DS0oPj93rcQH7OgTCKdjYS0f9s8sIKjErKCao0tRNy5wjBhAWqmq6xFGJeA7nt3UBJVuaGFbszIzs+yvjZYYVrJQdfl0yPbrKRMd/Ch77Jnqbu97Uyu8UxhGkzqEcxQrdBqhqkakhQULjcjZBnk0M1PrLwW+Pl1kRCnXnX/x3YzDR/Ltgjc57qjPbqz7+CBbuFo5OCYOY94pcXetHskvx1AAQ7ZT2c/F/p6vIH5jPKnCTjuqWuGoimp/alczLMO6n+aHgzqc9NKQUScxA0fCGxFeoEdd6b370E7j8xXMIA/xSmq8lFPam+fm3117nC4m29sRktoBI8YP4L7VPSkM/hLp/vRzVJf6U183GfvUSZPERrg+NvMeah9vgkTgzH0iN1+s2xPj6eFz7VUOQtLYTchMZ/qyyGhUzJznY0szocVd6iDbMAYm67R+QtgYEBD1hYrtUD052imb62nEXHFSL3V6369GaJ+k5BIUTGweOaUxGbJlb6fG2Aho4EWaigYRMtmlKgDFaCeJGjlQrFR9lKFzDBc3Af3RefPDVsavYGdQQRUAmueGjlks99Bvh2U53HQgQvc0iQg3ijey2YXBr6xFCMeG7MJZbPcrlQLXko4KygK94EcDPZnIH542CrtAySk/UxxwZv5u0dLsh7o+ZK9G6PO1+Q== reubenonrye@uchicago.edu
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOHPLoBC42tbr7YiQHGRWDOZ+5ItJVhgSqAOOb8bHD65ajen1haM2PUvqCrZ0p7NOrDPFRBlNIRlhC2y3VdnKkNYSYMvHUEwt8+V3supJBj2Tu8ldzpQthDu345/Ge4hqwp+ujZVRfjjAFaFLkMtqvlAXkj7a2Ip6ZZEhd8NcRq/mQET3eCaBR5/+BGzEMBVQGTSGYOY5rOkR8PNQiX+BF7qIX/xRHo8GCOztO4KmDLmaZV63ovQwr01PXSGEq/VGfHwXAvzX13IXTYE2gechEyudhRGZBbhayyaKD7VRoKzd4BZuuUrLCSpMDWBK/qtECcP4pCXW/0Wi2OCzUen3syh/YrOtJD1CUO+VvW6/8xFrcBeoygFW87hW08ncXLT/XxpgWeExJrTGIxjr4YzcsWPBzxI7/4SmKbaDSjx/RMX7x5WbPc5AZzHY17cKcpdc14weG+sm2OoKF5RqnFB/JpBaNxG+Zq8qYC/6h8fOzDWo5+qWKO/UlWaa3ob2QpG8qOBskoyKVG3ortQ04E04DmoaOiSsXoj0U0zaJnxpdF+a0i31RxQnjckTMEHH8Y2Ow8KIG45tzhJx9NbqSj9abk3yTzGA7MHvugQFpuTQ3gaorfG+A9RGUmx6aQNwXUGu+DWRF7lFeaPJt4CDjzbDUGP/b5KJkWK0DDAI61JfOew== fauzi@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwr7QDrMCalBC78pk5oXHgiyh20815E7QtE0pyOTb1PSX50VdJeXmmsQP6nYFDjIGow2+ckWQD1LbiCX24IEKYxknVujh9rG9yvaEaelSpDvpFu6owvPHye1yWgY3XVM9KGSSBWCzuNTcv9+KlM2LWUBbBn/xHEjmGhlrgJRE5YNHvKb7aRS8QNmAIN7BRpvHEv/rAQk0rizhx5BSIhH0OvbQqwfcyDC7lOvhYZgT8Lv0TPuFGrSxO6n3CRrhjG1ZjhePNik7MVgtXspyD+JWrR+n1t3zt44x+FWTnoAYVy1a0VZ3A4CJfCV5p2sxpkZ0yeOecBu6wLviVp7FwCN77G/zP9rJqstrQisrnHtFWiYzM0vpBBJG+dvHlqYf2xp5+UkUSwmrdLdUQAzxlx5uf/G1gens/LeM9zxuW1EtYsCQIIl33nvDAPxUdan3oolSKO+nBsLgXJbFX6yohw5fTEleURm0LqHQ0XTjPL57W3hhul5NOzHyn9iMh8li7EgBvLkwYR/hwzKjLVXvGxa1hiz4UnJy5Qd9gr7+DS3vK7YEzTjZxt8CQNex1E1keWTvws32FHzUcZ9t3MP6cK3gQQeu9tmNjU58PY+kQN1ShiWESXX6nGSKuuQixmwT3iiJ6/CqImozCGiESjQj3J9SzrWTG33XTJhnbEFub8zlnhQ== diw@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiVYoa9i91YL17xWF5kXpYh+PPTriZMAwiJWKkEtMJvyFWGv620FmGM+PczcQN47xJJQrvXOGtt/n+tW1DP87w2rTPuvsROc4pgB7ztj1EkFC9VkeaJbW/FmWxrw2z9CTHGBoxpBgfDDLsFzi91U2dfWxRCBt639sLBfJxHFo717Xg7L7PdFmFiowgGnqfwUOJf3Rk8OixnhEA5nhdihg5gJwCVOKty8Qx73fuSOAJwKntcsqtFCaIvoj2nOjqUOrs++HG6+Fe8tGLdS67/tvvgW445Ik5JZGMpa9y0hJxmZj1ypsZv/6cZi2ohLEBCngJO6d/zfDzP48Beddv6HtL rarya_id_rsa
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBFbx4eZLZEOTUc4d9kP8B2fg3HPA8phqJ7FKpykg87w300H8uTsupBPggxoPMPnpCKpG4aYqgKC5aHzv2TwiHyMnDN7CEtBBBDglWJpBFCheU73dDl66z/vny5tRHWs9utQNzEBPLxSqsGgZmmN8TtIxrMKZ9eX4/1d7o+8msikCYrKr170x0zXtSx5UcWj4yK1al5ZcZieZ4KVWk9/nPkD/k7Sa6JM1QxAVZObK/Y9oA6fjEFuRGdyUMxYx3hyR8ErNCM7kMf8Yn78ycNoKB5CDlLsVpPLcQlqALnBAg1XAowLduCCuOo8HlenM7TQqohB0DO9MCDyZPoiy0kieMBLBcaC7xikBXPDoV9lxgvJf1zbEdQVfWllsb1dNsuYNyMfwYRK+PttC/W37oJT64HJVWJ1O3cl63W69V1gDGUnjfayLjvbyo9llkqJetprfLhu2PfSDJ5jBlnKYnEj2+fZQb8pUrgyVOrhZJ3aKJAC3c665avfEFRDO3EV/cStzoAnHVYVpbR/EXyufYTh7Uvkej8l7g/CeQzxTq+0UovNjRA8UEXGaMWaLq1zZycc6Dx/m7HcZuNFdamM3eGWV+ZFPVBZhXHwZ1Ysq2mpBEYoMcKdoHe3EvFu3eKyrIzaqCLT5LQPfaPJaOistXBJNxDqL6vUhAtETmM5UjKGKZaQ== emalinowski@uchicago.edu

diff --git a/files/authorized_keys/squid_authorized_keys_admin b/files/authorized_keys/squid_authorized_keys_admin
@@ -1,6 +1,6 @@
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCfX+T2c3+iBP17DS0oPj93rcQH7OgTCKdjYS0f9s8sIKjErKCao0tRNy5wjBhAWqmq6xFGJeA7nt3UBJVuaGFbszIzs+yvjZYYVrJQdfl0yPbrKRMd/Ch77Jnqbu97Uyu8UxhGkzqEcxQrdBqhqkakhQULjcjZBnk0M1PrLwW+Pl1kRCnXnX/x3YzDR/Ltgjc57qjPbqz7+CBbuFo5OCYOY94pcXetHskvx1AAQ7ZT2c/F/p6vIH5jPKnCTjuqWuGoimp/alczLMO6n+aHgzqc9NKQUScxA0fCGxFeoEdd6b370E7j8xXMIA/xSmq8lFPam+fm3117nC4m29sRktoBI8YP4L7VPSkM/hLp/vRzVJf6U183GfvUSZPERrg+NvMeah9vgkTgzH0iN1+s2xPj6eFz7VUOQtLYTchMZ/qyyGhUzJznY0szocVd6iDbMAYm67R+QtgYEBD1hYrtUD052imb62nEXHFSL3V6369GaJ+k5BIUTGweOaUxGbJlb6fG2Aho4EWaigYRMtmlKgDFaCeJGjlQrFR9lKFzDBc3Af3RefPDVsavYGdQQRUAmueGjlks99Bvh2U53HQgQvc0iQg3ijey2YXBr6xFCMeG7MJZbPcrlQLXko4KygK94EcDPZnIH542CrtAySk/UxxwZv5u0dLsh7o+ZK9G6PO1+Q== reubenonrye@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzpASOT5/4dXpNDzhbejy2DYi6ktPyAI2gVBVP3XCpiF/jCiyf5qNAtnFiSU4pjUu4FR6h95ccFhtvaLDh57sWDypoBeplRDLJVREQmwoXMsoghs+sfA08ot9bpZYudGDBXsPBAfhK2QRaHozTUY3+/3/zMto7J9FZtfq67wkTLMLx+raxXEC3nsZhH3gH4EM35seq2uTiyxbbCnOAm/FLF1j4i9T6WfnQfX9IsJ1qtqlJu6Hh9rlalAwEeCvQQmk0e+WdSQxWx0stkIFa7vl75dPN6kzbHJip7ZkCGeEAbsqfijl5qTdXoF/82ckdE34LvD7gBNidL4MfZS2I0EToXX6u5oSUpW1aPbqmzNMaLOAeb9Kz3LnaXfTbGA6oUS2bYKe9E7qnGEnSxJkP4PQoUdry6XfAAZ1H5xt6dlwoLwiR0Qu2V4TBON875FbnMM7LsurIyswTHJnuO4S05K/HlvT0Ia82nO/I9cJzAgEcgBesWXZ0weCer0H1awM9PBFODheF51FtCf/b5VMURfltNAkpudE7uIUQT/n4Y3pHWe6rYvWXCAvNFbfoTh2ODHIp5kuWY2L1s04sjKe3AKCdYMYR5qZC6UOw6d/XQ4pSPwOqplkVQ7GP/zovzQJSnctfHFTrdm0BI76mQ3Hk/NYqgIf8EHJ4mQiEL3LJOFCvuw== avantol@uchicago.edu
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOHPLoBC42tbr7YiQHGRWDOZ+5ItJVhgSqAOOb8bHD65ajen1haM2PUvqCrZ0p7NOrDPFRBlNIRlhC2y3VdnKkNYSYMvHUEwt8+V3supJBj2Tu8ldzpQthDu345/Ge4hqwp+ujZVRfjjAFaFLkMtqvlAXkj7a2Ip6ZZEhd8NcRq/mQET3eCaBR5/+BGzEMBVQGTSGYOY5rOkR8PNQiX+BF7qIX/xRHo8GCOztO4KmDLmaZV63ovQwr01PXSGEq/VGfHwXAvzX13IXTYE2gechEyudhRGZBbhayyaKD7VRoKzd4BZuuUrLCSpMDWBK/qtECcP4pCXW/0Wi2OCzUen3syh/YrOtJD1CUO+VvW6/8xFrcBeoygFW87hW08ncXLT/XxpgWeExJrTGIxjr4YzcsWPBzxI7/4SmKbaDSjx/RMX7x5WbPc5AZzHY17cKcpdc14weG+sm2OoKF5RqnFB/JpBaNxG+Zq8qYC/6h8fOzDWo5+qWKO/UlWaa3ob2QpG8qOBskoyKVG3ortQ04E04DmoaOiSsXoj0U0zaJnxpdF+a0i31RxQnjckTMEHH8Y2Ow8KIG45tzhJx9NbqSj9abk3yTzGA7MHvugQFpuTQ3gaorfG+A9RGUmx6aQNwXUGu+DWRF7lFeaPJt4CDjzbDUGP/b5KJkWK0DDAI61JfOew== fauzi@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiVYoa9i91YL17xWF5kXpYh+PPTriZMAwiJWKkEtMJvyFWGv620FmGM+PczcQN47xJJQrvXOGtt/n+tW1DP87w2rTPuvsROc4pgB7ztj1EkFC9VkeaJbW/FmWxrw2z9CTHGBoxpBgfDDLsFzi91U2dfWxRCBt639sLBfJxHFo717Xg7L7PdFmFiowgGnqfwUOJf3Rk8OixnhEA5nhdihg5gJwCVOKty8Qx73fuSOAJwKntcsqtFCaIvoj2nOjqUOrs++HG6+Fe8tGLdS67/tvvgW445Ik5JZGMpa9y0hJxmZj1ypsZv/6cZi2ohLEBCngJO6d/zfDzP48Beddv6HtL rarya_id_rsa
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBFbx4eZLZEOTUc4d9kP8B2fg3HPA8phqJ7FKpykg87w300H8uTsupBPggxoPMPnpCKpG4aYqgKC5aHzv2TwiHyMnDN7CEtBBBDglWJpBFCheU73dDl66z/vny5tRHWs9utQNzEBPLxSqsGgZmmN8TtIxrMKZ9eX4/1d7o+8msikCYrKr170x0zXtSx5UcWj4yK1al5ZcZieZ4KVWk9/nPkD/k7Sa6JM1QxAVZObK/Y9oA6fjEFuRGdyUMxYx3hyR8ErNCM7kMf8Yn78ycNoKB5CDlLsVpPLcQlqALnBAg1XAowLduCCuOo8HlenM7TQqohB0DO9MCDyZPoiy0kieMBLBcaC7xikBXPDoV9lxgvJf1zbEdQVfWllsb1dNsuYNyMfwYRK+PttC/W37oJT64HJVWJ1O3cl63W69V1gDGUnjfayLjvbyo9llkqJetprfLhu2PfSDJ5jBlnKYnEj2+fZQb8pUrgyVOrhZJ3aKJAC3c665avfEFRDO3EV/cStzoAnHVYVpbR/EXyufYTh7Uvkej8l7g/CeQzxTq+0UovNjRA8UEXGaMWaLq1zZycc6Dx/m7HcZuNFdamM3eGWV+ZFPVBZhXHwZ1Ysq2mpBEYoMcKdoHe3EvFu3eKyrIzaqCLT5LQPfaPJaOistXBJNxDqL6vUhAtETmM5UjKGKZaQ== emalinowski@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwr7QDrMCalBC78pk5oXHgiyh20815E7QtE0pyOTb1PSX50VdJeXmmsQP6nYFDjIGow2+ckWQD1LbiCX24IEKYxknVujh9rG9yvaEaelSpDvpFu6owvPHye1yWgY3XVM9KGSSBWCzuNTcv9+KlM2LWUBbBn/xHEjmGhlrgJRE5YNHvKb7aRS8QNmAIN7BRpvHEv/rAQk0rizhx5BSIhH0OvbQqwfcyDC7lOvhYZgT8Lv0TPuFGrSxO6n3CRrhjG1ZjhePNik7MVgtXspyD+JWrR+n1t3zt44x+FWTnoAYVy1a0VZ3A4CJfCV5p2sxpkZ0yeOecBu6wLviVp7FwCN77G/zP9rJqstrQisrnHtFWiYzM0vpBBJG+dvHlqYf2xp5+UkUSwmrdLdUQAzxlx5uf/G1gens/LeM9zxuW1EtYsCQIIl33nvDAPxUdan3oolSKO+nBsLgXJbFX6yohw5fTEleURm0LqHQ0XTjPL57W3hhul5NOzHyn9iMh8li7EgBvLkwYR/hwzKjLVXvGxa1hiz4UnJy5Qd9gr7+DS3vK7YEzTjZxt8CQNex1E1keWTvws32FHzUcZ9t3MP6cK3gQQeu9tmNjU58PY+kQN1ShiWESXX6nGSKuuQixmwT3iiJ6/CqImozCGiESjQj3J9SzrWTG33XTJhnbEFub8zlnhQ== diw@uchicago.edu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKJR5N5VIU9qdSfCtlskzuQ7A5kNn8YPeXsoKq0HhYZSd4Aq+7gZ0tY0dFUKtXLpJsQVDTflINc7sLDDXNp3icuSMmxOeNgvBfi8WnzBxcATh3uqidPqE0hcnhVQbpsza1zk8jkOB2o8FfBdDTOSbgPESv/1dnGApfkZj96axERUCMzyyUSEmif2moWJaVv2Iv7O+xjQqIZcMXiAo5BCnTCFFKGVOphy65cOsbcE02tEloiZ3lMAPMamZGV7SMQiD3BusncnVctn/E1vDqeozItgDrTdajKqtW0Mt6JFONVFobzxS8AsqFwaHiikOZhKq2LoqgvbXZvNWH2zRELezP jawadq@Jawads-MacBook-Air.local
diff --git a/files/authorized_keys/squid_authorized_keys_user b/files/authorized_keys/squid_authorized_keys_user
@@ -11,7 +11,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD65a+FA8xX2yH2r1xPROFjCAZ+FpteEWZsDg7Xi71y
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDIUugDoNk7gNUQlj+RjXli7xBVs9LKTNXeaADzr2cHkz7FeaZihAcqPOSz51q4cPnYUvFcVL7A5JCSCPxrBW2dQYE6Ywo7LRKm1TCToJ+hZoA87RbeW+nSRbj30shVrGbAZsT0CchExYKutsP7RJKD/z8Ac68fwh16WQ8BKGwyVSqDzznrcGI1iBgKHNcDuvt3CMit49ZRN7NFLyo43iF5kAdzwI4M5RYcgB2ygkQQormx8So5jQENN8iWgK6uGKdwW/npsdF9Q7Be0DyOvSQeuCivayYVEbGnqDJN/62clygAVqJ7piZpqrK+Qb+3c+X/yNeVXemBBlv6VbjVyr+VGzhByGGV2cE1b7aM+P1CDk36SR9lqGqQ4sIBX77EjGP8KV2YrsU/ViNvRJavh05VPV3zmH81KoCgkf2rWwidmXdB0R1QuqWEg0BWmeOg32G+S5qvIV6sEcPin2pYSzZxKX0oeA7fSCOHLJTIBwWeSOFmmQ0IIvWdRdfjvPyv/iJDMdzF9gDlmkdNoUgxVpna7rytxeA7Aev/vw6rmQQqMojrU4ydEMDye7nG6n35I7LOY+CEG+Gz0fzJyixDeldjCXLf3KGDm03GfuhVBAuOitmBRlZQY2+X0s9bqPBSkDHpCZwgyEYVydmPiqFCN4sWumwMVZIvpjCS9QCgczQEQ== dev@test.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDDsI75x2yqRT7TgM4ifNsXYIrSRLAND8gsXqXfGW6I3zJlR8d6TZf/T6L5eOZQ8joC4F4LGuHCVWGBkWTEIMN3Jvg7rhAasRvnj15AqW/IKUCm8yNKrVEPARNzmUiaa9O7g4Oz3C471tbFzS3L0prXGr864ofT4Z9WTPsD7RURj5wSDyotpv4sVHotKZi4gsGCAXtHaozBC6h+zR68q6ys0H3WQ/z2jxfRYnJHZxdyXx71KfcqbsD+Oqk9UNwjWVJN72t3XWqZZ9Udk+dzMgCHJJwrHgjD1Y0o/8oWOzB4DREvbaAb9ZkHk2oeobCcUzDebola3yorpr/GSQPL4ST0WbkbcO0FHl1iUoIi3s/pZJdlqapQDd3ZbYDfaF1nUg7hWM8pQa8YUmwYeA0Dm0WEbr0Hov3tQ4Cc91GhrgF4Umjckl+E8Bm9l7bOPau49FSbQF5FVqOgm1cPfpaZJZRmOKQL5Nu4MzZDgZYVcTflitiJXAvlrRzhQQIJyT0+U3hClUc+5CKWMA1JNVRJlIzW91z6CU3Z9rKJXgxdIH5cn5dD77gyQ+FG6ordxOLboKXRNFsfvoWjEr2PbhRGmnsdpvxQKY76ozbBjNfkOap2J675xz8KxCLnmepcesmjQG32flpFr3nSw+uZxhV3cp1Kk/v2bNOEoaP+Hs6PSX2IUw== dev@test.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDFMv7ook6KbYg8L5v8ZwH2XXTGjg+0Zb5nSCUFnatjFdAEM329YAB7yCI8T7jC7y451OmPijQaoXhHejZrM4kIFAphsqbD6kVdh36F/Lncwn0U7U0j6DL4Otg/PRu5us1MLZ32WOAzG3Noy0moPIdgP1if+L6BLzHJ/x6zyI9pLCdCZJc5sD+An1LCl/i4ohOTfvnMeGLhG3GGA+mTXLdzPtGIqSX0pEQIyzzj9L56whnAZiNbYacELSREck4rWi6y2dehRnf8tpmV0qn7iVe9pYdnCXS0FQOKOZUVxFlRhv8eKD7fvDsqSrnzRQ25H09J9rVBM6854A62cwTXyR3LsmBOOAyDqroF3Wj9CKLJJ48s/nAw+S8KmkCJtbUcvdecmI1kZQk2qhg0MNLZUgseahtjjC6PMuYHHQ/0Ht7Z5nytb9qnknA9/fGI6w16yFmqS63VeXJwoX1Dfrtt9a/r4DUb8uGDbtiqVcnJcjOJ/EKe+c3xwms3wxyrfcp/zVIlRwS0B6sf66uawRq4NK2zDnRCIYxEncx+v8M2nCVo7OAvkPYLE4UjgLRr/XUt+72vnWtJAwziWLOHZk/kwgzXz1g8+Z73Nn75W0V0uu9O7u6A/BG0o8YkbQQfA5ad0YI5tHbxxOJX7qlcfVYzNJc+G4j1aQH19YoxcjAOPE0wZw== dev@test.com
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOHPLoBC42tbr7YiQHGRWDOZ+5ItJVhgSqAOOb8bHD65ajen1haM2PUvqCrZ0p7NOrDPFRBlNIRlhC2y3VdnKkNYSYMvHUEwt8+V3supJBj2Tu8ldzpQthDu345/Ge4hqwp+ujZVRfjjAFaFLkMtqvlAXkj7a2Ip6ZZEhd8NcRq/mQET3eCaBR5/+BGzEMBVQGTSGYOY5rOkR8PNQiX+BF7qIX/xRHo8GCOztO4KmDLmaZV63ovQwr01PXSGEq/VGfHwXAvzX13IXTYE2gechEyudhRGZBbhayyaKD7VRoKzd4BZuuUrLCSpMDWBK/qtECcP4pCXW/0Wi2OCzUen3syh/YrOtJD1CUO+VvW6/8xFrcBeoygFW87hW08ncXLT/XxpgWeExJrTGIxjr4YzcsWPBzxI7/4SmKbaDSjx/RMX7x5WbPc5AZzHY17cKcpdc14weG+sm2OoKF5RqnFB/JpBaNxG+Zq8qYC/6h8fOzDWo5+qWKO/UlWaa3ob2QpG8qOBskoyKVG3ortQ04E04DmoaOiSsXoj0U0zaJnxpdF+a0i31RxQnjckTMEHH8Y2Ow8KIG45tzhJx9NbqSj9abk3yTzGA7MHvugQFpuTQ3gaorfG+A9RGUmx6aQNwXUGu+DWRF7lFeaPJt4CDjzbDUGP/b5KJkWK0DDAI61JfOew== fauzi@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDq6IEOz/IO0xvP39aCluvTpQrjP0coXf9Lt5DZ2oz3WgKWoEggxS44TZ+nuohsAdGxUMBfKLTI20jS9EpX1eEolUKAdAfX6u5Xk6P861cufyu3dqoXJp+/f/d3/8NMYNuXYgIIBdBoW2IQ8uiTay2HaH38C6Jg+5QXJUK0daFDQLR78Yvsh6nsKXONo3Xg1LANmufSO6K84q6x+ZGbRK4zZRMAAHr5tDHiv1XGq/bc9xqMxXXJu/cwjp9VJSQMFPC2E2H6mHf12A1adVsuw5kfxMIzYeCXn5rfNAeEjKfe/AUq0q/IFy/n6t4koIBXZU7WhunCRR59eAaepvBtAVJhpF0QCKwYYo/vMpGNyEg4ohSqAY0rKDxFEZ08ekQI8zrnFH12GAs7ETUZ6XammcPqtXiFb1t8gWBPzmGx4XpFJYVdB+EEAc62vokthVa8b6zQrik5rE8mht76juTHGkH9sPvLHBzJz+l78899LD1JP9Z+3aUZTQiLwTfsRPzrVlWdryeq0nW2kK4kUlmxyVRdCdc5Ec/YBM0RribU+IY73WDiH9hGtVemb0AvWByRgTYjO0Lxp9BP16pbjBwK9KUJO4e0oJy1jMUjce0XIdy/F8ywkeFlA2a62lyWQ2njqCNm7Ft5kNQQIKanX7IAP/vRnwffNaqvIVDt5+ejQaxDGw== dev@test.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDT5VxB1A2JOc3MurPSVH9U6x49PCZfaHgJD1FbKXgPvCrwvm5mS18Mgawai5SE3nL8KzjTMEUtoY3yl7Y9aHKY4JH3fnUIQfapGTKgzVMLOzRguD5XkZxEn8e2DU5/Tj1QLplAA8cip4mg4dOFVWZSG/0nQl7UI9tnLdoLQz1L37XX0cp4ra4FJN4xFIuE8ISxRHOBeuQ2S9wWuczuF3w17ciRPtkPQnNdSi4rS9o67FtGVTNhIPS5jjqlr6qBqNBz9u+AfzhLHuMTZ3Keb/ZtBoafKnQsU/F/YyxD7hDoGOd9e3orcO2gmKJOb8CC0Uv7aMLpANTvIDQ4nVVPYHyR+cxLH+T9EI20lANK18zJgFxYmiMiLTSaquYS5tK2l8pdNh8C/1bMdpgzdY1X+4UeTZ50Xm3LZMpg2vg1WgAoJkikAhvegRAistqbxDXfhPJOmr7B4JRg1mDPx8RMrc3+lkgbachMmQHQd05inzxCR2q2Y6huLVRW81dddSzILhGeayT2S4sGutCb1/XopvBSf9M1ZTrJtWVqNiWfiJHS6p+ji6DvO8mt6HWOmBcPV5a5icDF4S+FZf1q1MneUv4PksMexNbvd2RXdpcidkDJGgXZOkDGBbr5DZ+o/QC1dCF4zbYIY8DO+9DxjexBTMMYaYnr/ohkZ3OPDNn9P9WoyQ== dev@test.com
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDWq1CFwCr2HJMH9gOCFcffYX/F0zrN2ZhaajDpb9p0ae2SJXmqdPc8bmzq98I5YvFvKqSxCUG8lABuvnFrZP8VfERaD71OcQ0DHmd4RIpeKFR7295qmNlhh9eRFlgnEcfVSs59Ror/VsHLSYWvcqnHzmBbY6Iyx2FBnLkFz0fOLCGzsnBaXnpe39UOx5C/+8VmmK0ZMZyj5oWZjcC3PGiEmAu9U+Mjf45GhDy8K8Mtr5dOqNYSc14/mllqdSVyYy5a3MuyoMG5X2f7WEG7dvHReXqFf7ds7CZUa4To/dK2d+L3YFAI2iUnfg9P11Hvxa+VCOX7gb1yaPLOhcfglb0btV2AyPiySE298pkyAjoW8X4Cmmvdfg/a6Ey44CKIuPK12frUAvYqzqAb6saGiy07mMyEPmxv4VJSV+saDVsLbiMtog/BhlYmtAjaxY9ZYr0+18y8j8ZKhcSPnhlF/I+9G97p+FsPXqQ2WS8YAeUdnWikKAFJsHnpjFlv/DaKdBNLvr0/AcDFQiLWvfCJ+FqP7wnM6vCK9bUKu2UcpvDBND8mdoP1nLNFNaiGbmCl2lVubtCaUvxBKTrLEG8NHew4NfdJjquwaNHdrJGQleBOvXfxHeAVi+fGUvPZ+pL3jQlzd/ePedO2FNuPdFz+VoH4pS4/ppJBLmhTsPLHlyDhYQ== dev@test.com

diff --git a/files/authorized_keys/vpn_authorized_keys_admin b/files/authorized_keys/vpn_authorized_keys_admin
@@ -1,4 +1,5 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiVYoa9i91YL17xWF5kXpYh+PPTriZMAwiJWKkEtMJvyFWGv620FmGM+PczcQN47xJJQrvXOGtt/n+tW1DP87w2rTPuvsROc4pgB7ztj1EkFC9VkeaJbW/FmWxrw2z9CTHGBoxpBgfDDLsFzi91U2dfWxRCBt639sLBfJxHFo717Xg7L7PdFmFiowgGnqfwUOJf3Rk8OixnhEA5nhdihg5gJwCVOKty8Qx73fuSOAJwKntcsqtFCaIvoj2nOjqUOrs++HG6+Fe8tGLdS67/tvvgW445Ik5JZGMpa9y0hJxmZj1ypsZv/6cZi2ohLEBCngJO6d/zfDzP48Beddv6HtL rarya_id_rsa
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDOHPLoBC42tbr7YiQHGRWDOZ+5ItJVhgSqAOOb8bHD65ajen1haM2PUvqCrZ0p7NOrDPFRBlNIRlhC2y3VdnKkNYSYMvHUEwt8+V3supJBj2Tu8ldzpQthDu345/Ge4hqwp+ujZVRfjjAFaFLkMtqvlAXkj7a2Ip6ZZEhd8NcRq/mQET3eCaBR5/+BGzEMBVQGTSGYOY5rOkR8PNQiX+BF7qIX/xRHo8GCOztO4KmDLmaZV63ovQwr01PXSGEq/VGfHwXAvzX13IXTYE2gechEyudhRGZBbhayyaKD7VRoKzd4BZuuUrLCSpMDWBK/qtECcP4pCXW/0Wi2OCzUen3syh/YrOtJD1CUO+VvW6/8xFrcBeoygFW87hW08ncXLT/XxpgWeExJrTGIxjr4YzcsWPBzxI7/4SmKbaDSjx/RMX7x5WbPc5AZzHY17cKcpdc14weG+sm2OoKF5RqnFB/JpBaNxG+Zq8qYC/6h8fOzDWo5+qWKO/UlWaa3ob2QpG8qOBskoyKVG3ortQ04E04DmoaOiSsXoj0U0zaJnxpdF+a0i31RxQnjckTMEHH8Y2Ow8KIG45tzhJx9NbqSj9abk3yTzGA7MHvugQFpuTQ3gaorfG+A9RGUmx6aQNwXUGu+DWRF7lFeaPJt4CDjzbDUGP/b5KJkWK0DDAI61JfOew== fauzi@uchicago.edu
 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCfX+T2c3+iBP17DS0oPj93rcQH7OgTCKdjYS0f9s8sIKjErKCao0tRNy5wjBhAWqmq6xFGJeA7nt3UBJVuaGFbszIzs+yvjZYYVrJQdfl0yPbrKRMd/Ch77Jnqbu97Uyu8UxhGkzqEcxQrdBqhqkakhQULjcjZBnk0M1PrLwW+Pl1kRCnXnX/x3YzDR/Ltgjc57qjPbqz7+CBbuFo5OCYOY94pcXetHskvx1AAQ7ZT2c/F/p6vIH5jPKnCTjuqWuGoimp/alczLMO6n+aHgzqc9NKQUScxA0fCGxFeoEdd6b370E7j8xXMIA/xSmq8lFPam+fm3117nC4m29sRktoBI8YP4L7VPSkM/hLp/vRzVJf6U183GfvUSZPERrg+NvMeah9vgkTgzH0iN1+s2xPj6eFz7VUOQtLYTchMZ/qyyGhUzJznY0szocVd6iDbMAYm67R+QtgYEBD1hYrtUD052imb62nEXHFSL3V6369GaJ+k5BIUTGweOaUxGbJlb6fG2Aho4EWaigYRMtmlKgDFaCeJGjlQrFR9lKFzDBc3Af3RefPDVsavYGdQQRUAmueGjlks99Bvh2U53HQgQvc0iQg3ijey2YXBr6xFCMeG7MJZbPcrlQLXko4KygK94EcDPZnIH542CrtAySk/UxxwZv5u0dLsh7o+ZK9G6PO1+Q== reubenonrye@uchicago.edu
-
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwr7QDrMCalBC78pk5oXHgiyh20815E7QtE0pyOTb1PSX50VdJeXmmsQP6nYFDjIGow2+ckWQD1LbiCX24IEKYxknVujh9rG9yvaEaelSpDvpFu6owvPHye1yWgY3XVM9KGSSBWCzuNTcv9+KlM2LWUBbBn/xHEjmGhlrgJRE5YNHvKb7aRS8QNmAIN7BRpvHEv/rAQk0rizhx5BSIhH0OvbQqwfcyDC7lOvhYZgT8Lv0TPuFGrSxO6n3CRrhjG1ZjhePNik7MVgtXspyD+JWrR+n1t3zt44x+FWTnoAYVy1a0VZ3A4CJfCV5p2sxpkZ0yeOecBu6wLviVp7FwCN77G/zP9rJqstrQisrnHtFWiYzM0vpBBJG+dvHlqYf2xp5+UkUSwmrdLdUQAzxlx5uf/G1gens/LeM9zxuW1EtYsCQIIl33nvDAPxUdan3oolSKO+nBsLgXJbFX6yohw5fTEleURm0LqHQ0XTjPL57W3hhul5NOzHyn9iMh8li7EgBvLkwYR/hwzKjLVXvGxa1hiz4UnJy5Qd9gr7+DS3vK7YEzTjZxt8CQNex1E1keWTvws32FHzUcZ9t3MP6cK3gQQeu9tmNjU58PY+kQN1ShiWESXX6nGSKuuQixmwT3iiJ6/CqImozCGiESjQj3J9SzrWTG33XTJhnbEFub8zlnhQ== diw@uchicago.edu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDiVYoa9i91YL17xWF5kXpYh+PPTriZMAwiJWKkEtMJvyFWGv620FmGM+PczcQN47xJJQrvXOGtt/n+tW1DP87w2rTPuvsROc4pgB7ztj1EkFC9VkeaJbW/FmWxrw2z9CTHGBoxpBgfDDLsFzi91U2dfWxRCBt639sLBfJxHFo717Xg7L7PdFmFiowgGnqfwUOJf3Rk8OixnhEA5nhdihg5gJwCVOKty8Qx73fuSOAJwKntcsqtFCaIvoj2nOjqUOrs++HG6+Fe8tGLdS67/tvvgW445Ik5JZGMpa9y0hJxmZj1ypsZv/6cZi2ohLEBCngJO6d/zfDzP48Beddv6HtL rarya_id_rsa
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDBFbx4eZLZEOTUc4d9kP8B2fg3HPA8phqJ7FKpykg87w300H8uTsupBPggxoPMPnpCKpG4aYqgKC5aHzv2TwiHyMnDN7CEtBBBDglWJpBFCheU73dDl66z/vny5tRHWs9utQNzEBPLxSqsGgZmmN8TtIxrMKZ9eX4/1d7o+8msikCYrKr170x0zXtSx5UcWj4yK1al5ZcZieZ4KVWk9/nPkD/k7Sa6JM1QxAVZObK/Y9oA6fjEFuRGdyUMxYx3hyR8ErNCM7kMf8Yn78ycNoKB5CDlLsVpPLcQlqALnBAg1XAowLduCCuOo8HlenM7TQqohB0DO9MCDyZPoiy0kieMBLBcaC7xikBXPDoV9lxgvJf1zbEdQVfWllsb1dNsuYNyMfwYRK+PttC/W37oJT64HJVWJ1O3cl63W69V1gDGUnjfayLjvbyo9llkqJetprfLhu2PfSDJ5jBlnKYnEj2+fZQb8pUrgyVOrhZJ3aKJAC3c665avfEFRDO3EV/cStzoAnHVYVpbR/EXyufYTh7Uvkej8l7g/CeQzxTq+0UovNjRA8UEXGaMWaLq1zZycc6Dx/m7HcZuNFdamM3eGWV+ZFPVBZhXHwZ1Ysq2mpBEYoMcKdoHe3EvFu3eKyrIzaqCLT5LQPfaPJaOistXBJNxDqL6vUhAtETmM5UjKGKZaQ== emalinowski@uchicago.edu
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKJR5N5VIU9qdSfCtlskzuQ7A5kNn8YPeXsoKq0HhYZSd4Aq+7gZ0tY0dFUKtXLpJsQVDTflINc7sLDDXNp3icuSMmxOeNgvBfi8WnzBxcATh3uqidPqE0hcnhVQbpsza1zk8jkOB2o8FfBdDTOSbgPESv/1dnGApfkZj96axERUCMzyyUSEmif2moWJaVv2Iv7O+xjQqIZcMXiAo5BCnTCFFKGVOphy65cOsbcE02tEloiZ3lMAPMamZGV7SMQiD3BusncnVctn/E1vDqeozItgDrTdajKqtW0Mt6JFONVFobzxS8AsqFwaHiikOZhKq2LoqgvbXZvNWH2zRELezP jawadq@Jawads-MacBook-Air.local
diff --git a/gen3/bin/kube-dev-namespace.sh b/gen3/bin/kube-dev-namespace.sh
@@ -120,9 +120,14 @@ for name in fence indexd sheepdog; do
     gen3_log_err "Failed to setup new db $dbname"
   fi
   # update creds.json
-  if jq -r --arg key $name --argjson value "$newCreds" '.[$key]=$value | del(.gdcapi) | del(.ssjdispatcher)' < "$credsMaster" > "$credsTemp"; then
+  if jq -r --arg key $name --argjson value "$newCreds" '.[$key]=$value | del(.gdcapi) | del(.ssjdispatcher) | del(.user)' < "$credsMaster" > "$credsTemp"; then
     cp "$credsTemp" "$credsMaster"
   fi
+  if [[ "$name" == "sheepdog" ]]; then # update peregrine too
+    if jq -r '.peregrine.db_database=.sheepdog.db_database' < "$credsMaster" > "$credsTemp"; then
+      cp "$credsTemp" "$credsMaster"
+    fi
+  fi
   if [[ "$name" == "fence" ]]; then # update fence-config.yaml too
     fenceYaml="/home/$namespace/Gen3Secrets/apis_configs/fence-config.yaml"
     dbuser="$(jq -r .db_username <<< "$newCreds")"

diff --git a/gen3/bin/kube-setup-arborist.sh b/gen3/bin/kube-setup-arborist.sh
@@ -11,7 +11,8 @@ gen3_load "gen3/lib/g3k_manifest"
 manifestPath=$(g3k_manifest_path)
 deployVersion="$(jq -r ".[\"arborist\"][\"deployment_version\"]" < "$manifestPath")"
 if [ -z "$deployVersion" ]; then
-  deployVersion="1"
+  gen3_log_err "must set arborst.deployment_version to 2 in manifest.json"
+  exit 1
 fi
 
 if [ "$deployVersion" -gt  "1" ]; then

diff --git a/gen3/bin/kube-setup-workvm.sh b/gen3/bin/kube-setup-workvm.sh
@@ -158,7 +158,7 @@ EOM
     (
       gen3_log_info "installing aws-iam-authenticator"
       cd /usr/local/bin
-      sudo curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/aws-iam-authenticator
+      sudo curl -o aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.18.8/2020-09-18/bin/linux/amd64/aws-iam-authenticator
       sudo chmod a+rx ./aws-iam-authenticator
       sudo rm /usr/local/bin/heptio-authenticator-aws || true
       # link heptio-authenticator-aws for backward compatability with old scripts
@@ -194,7 +194,7 @@ EOM
       # Overwrite helm2 with helm3
       if ! helm version --short | grep v3 > /dev/null 2>&1; then
         install_helm
-        migrate_helm
+        migrate_helm || true
       fi
     fi
   )