diff --git a/site/airsloop/secrets/certificates/calico_etcd_ca.yaml b/site/airsloop/secrets/certificates/calico_etcd_ca.yaml
index ebc7ffbb1..8587f984e 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_ca.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_ca.yaml
@@ -1,34 +1,4 @@
 ---
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDIDCCAgigAwIBAgIUKZfS6ZktxJnjWoipsToqMpgiC18wDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjcw
-  MzIwMjM0ODAwWjAWMRQwEgYDVQQDEwtjYWxpY28tZXRjZDCCASIwDQYJKoZIhvcN
-  AQEBBQADggEPADCCAQoCggEBALCMVUOxVRJ3abjFNLVaefTtI/XdPUqxFmv2F6Ei
-  WCDoN82CZ5DnClXEy5vORHmwhH/4wOyXtulDJun3tofFMYR6QAsLzntgybj5CCUL
-  91nllMq4wZkKiW4YexGLDA//5ywcB/YHqoIzn9inI+jF1F6kE3fTH42qCBHFup/Y
-  mjishjzxF82D+ZzprIz7VZulP0wt9dOWMZNEfLgPp+oXEaDanaGtUPiGpVpAZ9c1
-  jXZ+o12rTssJo4KRbBbj+8KdaS2fp0UXVrs+GYBrg7BNX94bAfR49uAJiRob+2X+
-  FfQDdOpxPtkeF2rBRQLWDo/L7Q6vc29joliXRh3B1M+tBQUCAwEAAaNmMGQwDgYD
-  VR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYDVR0OBBYEFAdW2ct8
-  RpspOkx9+polmt0pkCA/MB8GA1UdIwQYMBaAFAdW2ct8RpspOkx9+polmt0pkCA/
-  MA0GCSqGSIb3DQEBCwUAA4IBAQBDdhRSVlGh0iQacz16f0SMtWaX0a5NRodl6gCe
-  OjUTrX9kM09PlR35d0Gp4Ntr6l9ELA1Yc5bCkS41v7bh948kMVJq3jCe5Jw8zhfK
-  sVyCinwuBep59jZfJGfjvCV31pgCjL0URmQlND68606cebWeM/EI/ws5Lv+R9MHD
-  9sHcj5l6P7N6knPqEphZ66yZDtFKia3YTloQKoIwiEsU7OKAV4DZz5hxYtYLaj1I
-  Q4GAYE3eGqe8zggF01rKRoCbNbcRgp6HJMfAzExCXzkN0qC7vUAYN+iD7k7G8qXO
-  cWMrCHQq8Ti6vmkhZ7LxgSk/1NfUznl/vOPV5lqRMoERDBTW
-  -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
-...
----
 metadata:
   layeringDefinition:
     abstract: false
@@ -38,31 +8,62 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDSjCCAjKgAwIBAgIUJtlVmV94BFTrtgY/4YNFpyWbrkIwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMDUzNjAwWhcNMjgwMzA4MDUzNjAwWjArMRMwEQYDVQQKEwpLdWJl
+  cm5ldGVzMRQwEgYDVQQDEwtjYWxpY28tZXRjZDCCASIwDQYJKoZIhvcNAQEBBQAD
+  ggEPADCCAQoCggEBALg3qCL5QT/LOcTCPMuSnnebcpc+ccN0Lj4yugpKcGOy+vZx
+  oqDf7mrE+pfSmNIaUxqQy/A54RZVv6HU5Xq/Cqo/Qn9SFyfsHwKXQhlz8TzsR/H7
+  r/80/bfTLfYaVb4Mlk8JIOi4nsfClH2mgsikuR3c29+8mwGooFSn5QiJYz4ssoGe
+  dX0ZAq/obiCS6LeANeS3dvIhE6rKi/yoWYoQE9C1CBlnDkWHs0xIuuxhACE+gwEN
+  gSFeszQ242mQzT3/Z8dwmap3YSn+a0Dbal+0NBWNzZLlaZSY1oCYPMMyb/2nMjrl
+  YCIqvTa4sB1p/9QAf6vOXa/TdqVLI0qadVk7r/ECAwEAAaNmMGQwDgYDVR0PAQH/
+  BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYDVR0OBBYEFDZ4c6FeZBHlH0sM
+  8qF1Bht9IaORMB8GA1UdIwQYMBaAFDZ4c6FeZBHlH0sM8qF1Bht9IaORMA0GCSqG
+  SIb3DQEBCwUAA4IBAQA2Awxai2ehsNl0/Y/KG/pYDvAdule+F3x9r1E/OpEkiimZ
+  g+c3+H2vo7VIIkyF74bSJuxRZq+2CTMd4OyoJRhrvEhS6ONYHhZpct6sHHcXVQYT
+  s89OtLoIFzDmPUfSVz9LXVxBzKa6pNUODM67Ml3JbzsR1ddds9+AdkvyHxqfywLC
+  2ZcH6K3thxlwB3a2QbMvBqmYKiAyQ27B8EACHK/TelVMDYglGFoxEydLXN9wK/cr
+  HP90WtI8X/gKR5J+pBnuemaJDReoKZgj+YorgmdMmhFQlK2xrs4Ejxsu4YHTvU5t
+  V2QPBvNLy11DhXQSKDH0CQzXAswVJD/rBFghr3/+
+  -----END CERTIFICATE-----
+schema: deckhand/CertificateAuthority/v1
+...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_1_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_1_certificate.yaml
index 2602b930c..4d16b48ba 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_1_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_1_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  /96f38b35Khpj3U0sDGExUt/XA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_2_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_2_certificate.yaml
index 6d43baf12..4656eae7f 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_2_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_2_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIUIRrU9GOskETd0GnoOL97JXq/PUEwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjApMScwJQYDVQQDEx5jYWxpY28tZXRjZC1haXJzbG9vcC1jb250
-  cm9sLTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClKyw+wHXcvqlM
-  6tWmqCcdm1MAVTDYf7gXteyiPYpZ4oRpXGJND7y670jqUo5AqYDcqTjMQG+szkHb
-  GodxQqkHN1FwDjgRy8ylWx6Vmtk8wIARZ+5L2faAsj0NV4+kVNrmeiCpk2ogkRQ5
-  TZ/wrI4Bx2Qy2AuyYWoaJqbNwIICepObF2LMgjqSsBOZqltU1i26acR85qkLvyBR
-  SLA7/XGrhD8mS7+05ixdOc8SG4+vzlQfOH0Ko8zcvktlRBqAvsFgYIrlB9av5XAI
-  JPcLY//3jTJDhITGPrgpk1VfHgJAiv2SPTierv109NkAgKgcXxsnJrG+8aWpmxl6
-  aCLoc6kZAgMBAAGjgbwwgbkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
-  AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSgjvich72F
-  Usl9lV+iemfCMtKBQjAfBgNVHSMEGDAWgBQHVtnLfEabKTpMffqaJZrdKZAgPzA6
-  BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9sLTKCCWxvY2FsaG9zdIcEChcWDIcE
-  fwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAZ+o3Fpt/1hLBTnKNejB13U4m
-  942bL/cX2vljJGPu8QyluDpSzJ+Gn9taTdY3+mXJ3wLMO+GQpVN7iGdBio0a1SFt
-  b3rJJuJmYJXrxGOSfhtKtUWKIjn6xQxHGg0Ibh8GtMe2YZLATxKvaiukVUcMK+c4
-  f8OtFb80P2pl5ICYppZhCaf8egRCD/Koniz4RcGehzsG3SyTS+IWacYzKsfQmoA3
-  e3XstEhdhYmChvexam0xHgKl7TXa0h7lBgq5mOaI9tvZqNXwPxnLrgab07EO2zSN
-  E8oGJD/bfYjJ0gyMzd7NTslGYAzEPzsIB4abSkkBGRRjAbC4vaPDm+3daW5xfg==
+  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
+  NWL8ouw8rWV+6QMlNQ9dytPo8Q==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_3_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_3_certificate.yaml
index 04a9be913..f451a7a35 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_3_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_airsloop_control_3_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDijCCAnKgAwIBAgIUZ2pf/swNqs2MbbnZCCozSBV/OdMwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjApMScwJQYDVQQDEx5jYWxpY28tZXRjZC1haXJzbG9vcC1jb250
-  cm9sLTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbm+DfT7epXYw2
-  oFK3eHZVYU5xdBOv2ky/GmhfmERUbcInI/RLBRz5m992h9upsCupTtNSZqvuBmK4
-  e8zhvxs1lS/bXFCrqrnxQUFW3bU8kYRaeRFEvnsB2ttdI+zmTfkd6TXBY1BzWN+i
-  oUaDez/CZSo7WLPit7P/b5qaOH1KtlZJRFe41K3usHK7/qyBoO49ik6YMUgyTVXp
-  WSmwsbJ/rLur3hg1umb1dLgBLfbVRuo0g2+4ErYcN2oFrFYe0YXSUexv+j7+6AEp
-  DJrHvr2Y+kjgrvFfoIut0DJfCHC4cPeGd9HZ8euIuuNzFr2f9hx2Sp02xm/0Ac7T
-  /N1LHpy7AgMBAAGjgbwwgbkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsG
-  AQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQHGQqPcLHH
-  StlCoyLrPARor4zuLTAfBgNVHSMEGDAWgBQHVtnLfEabKTpMffqaJZrdKZAgPzA6
-  BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9sLTOCCWxvY2FsaG9zdIcEChcWDYcE
-  fwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAHsO9VZFTj/+PrP+mnWPT++px
-  S65Q/4onEtTvb0dJNqDB9iI1aXfJ1VFVRqMYwPbKVICiq3OimoSz3nuVajZDGvLZ
-  sz97QofMvY8wG2iyjg7n8yV7pgSxizL4nJ9CO2gHeXOi/hcOx1y+0bBfjKCxuhMI
-  nrJQeTXdofHK0kYogH3GpkT6GN/oqO+mWx6aEJ43LeWsZ5dht5XB5Afhd6s/u+Eg
-  CpftySkDY2xrCwr5mJIjBdJpbKDGV81OMCcgAUBJtLnaPb1/xfTA7woQMcF42uFd
-  FrjCpL8a5GJPpotxsQYKuJ/vRv61Efl0OVY+KoiIAx0CEZSc/jMimB69+LM7JA==
+  MIIDnzCCAoegAwIBAgIUfO5Nv/+nDvWmL3OmqUvaSM5dnSYwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjApMScwJQYDVQQDEx5jYWxp
+  Y28tZXRjZC1haXJzbG9vcC1jb250cm9sLTMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+  DwAwggEKAoIBAQDu6RAUJKLNGtPXEZKSPavSJomDrjTRfNOPes7xX3bdrNEroYI8
+  6VC+hzg464Em3HjcywiYD2joKYOSHbaK1h9VqZHGajvYlLbasTdpLkQvDvV5vfWG
+  1mAi5V/O4Hpx8+seBSialI6SZGqcPolVslFhkREaHXTkdEPfV+jCvQZdxXDprAUn
+  xPU4OUJyWF7qSCH41N4pqIiFB2p9ZiZ2iQI7gs7jF0XFinZPefz2L4WkoWJq6bHD
+  0//RnIzXV5G9L7g7k4VdzMKjZhz6OP2IVkZD9Kzn3dTMsWGFcy6d3LcyTX3KUlT9
+  gJHCIX4QlJGo+EQNQyU21iuxlFoAiWjmSVRBAgMBAAGjgbwwgbkwDgYDVR0PAQH/
+  BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8E
+  AjAAMB0GA1UdDgQWBBTKZHdTLlTzQ3BmmsyzzZr0BthJajAfBgNVHSMEGDAWgBQ2
+  eHOhXmQR5R9LDPKhdQYbfSGjkTA6BgNVHREEMzAxghJhaXJzbG9vcC1jb250cm9s
+  LTOCCWxvY2FsaG9zdIcEChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOC
+  AQEAmgDgwZLqjab+RUipWIJwoAsQLj3Zj0lIi1nr7O3QJ95HFBkj1TRz/njLkYHc
+  Nm6p80VaQDbqjAeIgli2Ht6xVhUYSdE6o+AYc4gW0A7UwzGI4y27n2doc1bvenpq
+  bNFBBGXOXceP199x21B3NfPxty7yGBQZfUw+rjqOoBKZCHga5+vZhwt+yIbXkPOz
+  vyeriPEX3Y7UbPhRyZNDoKLCme5FW6Nvdl0zSHrzmYuuMg1CTzBK8kPtG5Ni0i8r
+  ayogTlXgqFhhkAvuzfq8i7+4usnf94+5Eu2kMv9ZUIkmYp3sdyTe8XR2BsLCu0pf
+  ayYFIsvAZ1xwjJQi4v02i6Hw6A==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
index d149adbd8..0b9bdfbdd 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDNDCCAhygAwIBAgIUYc+u/XWFtzk42FgbBi6ucKmkNLEwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjARMQ8wDQYDVQQDEwZhbmNob3IwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQCxOIwuYlLq616YOZCkDm2LR7hhrZCyiG9vUPab+BWlB1qP
-  lLDjdb5kYhWwYdUbg4Rp61YZgmOJS/5iVCW8R5T7a4aNGrkjujuBO5VAtJOdAiI2
-  XMz9JVnJhvsBvlGFsfKmqT/NHpglH19QlA53J8kOjLxmDLjr78t+/FqED0G45DCw
-  7+KSeypAu0PbbQuh6MTbQGCZxyf8ybhb2edl4+UOESH68XxnFgOqVqhaJQA+kRhb
-  LQcoI0BLa83GVjazWOk70H3zMxcDfL9xsFh2nsfieuJ3rWGlOdcGEPJoK780snR4
-  q4fOxj4JzBVY/OOVZfd0+u407x2+TXi7YLzWLzVHAgMBAAGjfzB9MA4GA1UdDwEB
-  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
-  BAIwADAdBgNVHQ4EFgQUekTSkjlwvMs8rAQ7ItWbl/I5gBIwHwYDVR0jBBgwFoAU
-  B1bZy3xGmyk6TH36miWa3SmQID8wDQYJKoZIhvcNAQELBQADggEBAESWjKk1cgSs
-  4OjkRq6mc466qZsar3Se925xnMuLHToqGDpiAW6KOr+Xm2Zfiio9IqoPLfb1m0hy
-  QovQWivZ77QkX76F0FvTxux/VA9gBwCLHXV/keaB7GsK1MYqVNhNvURscyGjLdbU
-  /QZtH2bsPnpGWiTzCnAlnyC4lcaUYnpGEQBTNg1XnIrWS+e3Lo5ORCoEO7SxE9lh
-  OleAMOaZ2MTMbSn1qXrHlbiVDI2WXb9QzH5sI57Mczaf1IDdZHgcxjmDf2iTlaj1
-  GO3+10v90EktNGkeJ2L/37uxXL4mC9T2hObUiwsN77rKDjFsNjDOy7B69RgFJHwd
-  2vRs/p4ffCA=
+  MIIDSTCCAjGgAwIBAgIUByiM20rcn+57dV86CsyrvSnBqF4wDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjARMQ8wDQYDVQQDEwZhbmNo
+  b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8pr4V85XstGIvIi3J
+  GRMTPnjoF3h4n9JyVFw90lBalLzhx4lG3cbnNmJzI+0UTgaHmLMrmW8gbquCMUqm
+  ITPbrsHzXStDPrYu/1Q4+FBK0xmQvqUaIi3wc6FuUo3kh5LWeoQGpz7UlUxtCaos
+  j8yFEPuMJ27XAFhWmhae6Z2oIabK31iysOk/6kzdftg1E7Br6W8d11I21aGHITjq
+  i/2bs733INpjhnO0SO2Xw8t1Mf3a3LFMwKiNBXyz8FSYqqUM6IxPv8CNZs2+URRa
+  /+jWFuwRaPkCy/uA0tq2ci6uVR0WWBrXRiU0RJV6z2RxEjGLHIxG7YIrq7P/iTvJ
+  i8sVAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUwKbg+u5A8OOHYeo7
+  WTLZtfnZ3bYwHwYDVR0jBBgwFoAUNnhzoV5kEeUfSwzyoXUGG30ho5EwDQYJKoZI
+  hvcNAQELBQADggEBAF3Jv0vmsKeZFiM2Fsw6XkDmzcZJeaHhf5VSK6+zY7RzoQUL
+  9Y7fJAfis+5kteuG2y3P680ZlW4UkxYLMzECF5nEQIMTuXxXeD8EWCO8k+ONR7Y2
+  R3Z7PTFJbq0TM0pGLeZsXG3juponCp3OIH7VoGIThnp3LezQgQxuklVODBYhLWeg
+  kn1+DhB8nwsrwhbVkU1l4Ey0eLTstEgbQnSGKg92VFGPV7nD5kS5a1BG4YUtoK/H
+  z6sAO9kwxNYQdpNxGiA21It1cY79Sgy6YlOgUv0JtpspTqGR2scOqIbzNq/kRxZ0
+  gGmyFpZAbgMBN6sfg2Uone3ZAa4/vZIkhdVxTdg=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_calico_node_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_calico_node_certificate.yaml
index 1f89b0535..be8922bb8 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_calico_node_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_calico_node_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEogIBAAKCAQEArHTTWBky6cdN7F+s8E9bYwCRXmHwvfsFFIjpK2d2rDE1DpcC
+  6hAO318Vv+RW7w0t3CoAzzzv8ma/p8lJ1h/9xIpr44XG6PYGVNUYgQ6ZddvEfGW2
+  OAyql6jtBkOF4sTVzVaExM/rbhKBB+fG2TpQGTCYl/JYE1vpLlzCDkcDFIu3pYGi
+  mwDRwzVzdPnehWFKszXs8AaVWLJtV22qEPkz16z3VSYawcnDuPXo/74nodwyukXi
+  MYdMXDr2Z6ieZvaKw3Urt0/V7JGrieaatnd59ZODe4m4zFreF7qdZUk6qSNFWyMx
+  4W8vOeMQasXI7oB5UvXFveXIjoA3HasVmd7H/wIDAQABAoIBABTndFbRdyJvTjrA
+  vi3C8MjnYLeYF55vtwXuMpVYTUJCFLRYCbplh+f7lp9UBlWju1NcpAx6znsLiV/F
+  PnX+GrygKsPBi4Lhj5Lo4beDFYb7xK1vhs70ehk4GMMRnEEIqwHg4ucYbOlCxPE4
+  Xxolv1/OTDDe514xXeqIw90HLpBmzDId0XwKu6eh9gYG2BrMXn7bRLMDzMtI/iBh
+  3e5G2OmhaShRrpgCEcGEVYJ+V9EXEBPJGzRO0a/ulYYIkV88ainvXyNp4IrOnxPz
+  88jj4LfjuIKzN22kNbXtKgw9idcyJ0NWufctpcbmicM58bLWMi5JmalcB6jDpXsu
+  e7DlUoECgYEAx4Ai0cpEbZk/O8tLFEy9ZxzA/jFpdbyAv2Mbp/DeMo8JxX8if9eh
+  WYDMzyVdBNYSRi/tYpayHsh7rPoh3QRFPaSyq7/TaKK3usAdcIXyAfwQfRrXpdJJ
+  J++fxXGU94achPCVbYr/YldHTzTwD+2PenvsKIcyKLmA4NSwbBut7LcCgYEA3Uv5
+  5eU5b7Ba1jaLh+mbmPptmXdxj4beGvYgDG7W+IDDlpT0sAAMxeHbiH0wFB6UhVOn
+  KVLXDBpP/0oCx1JDsG2ZN28THXnUd0d/Lu6IxK3U/m/JNTy5LTGNDUWzCPnsHlaC
+  gqo8VmgDHO6PsuuMCDv5ocI/lFWJD68zKFpSxvkCgYA/YlCtwsvW3neescpa2r7a
+  geI3YM+W3psxM3XX98lA2v1JyEjXwVS8MRXhQoe5P6Jytkt/pU1WRnA01wvnQrIV
+  EbzKoJm0hu5E4UD5PTVUuBctCFg3kQY5MALdImcn9ZbJDf8L3LujLQO1AKa9CMcr
+  LTAs+DdRhQ6TYD/lOS4bJQKBgD3alJjLf0hWlK03RbzRcOpLZQL2PcmOOtpyXPbc
+  rD19UC3wqIvhF7DftkrqItwcyAqUHS8RtoXtfNqwRyKLPdw8Zgz2gPNGMDq+wy/N
+  AHFo3RXZDPZSaLfXF8PT7Xzezj6Uk5oOFxtXqzcU/xlVeSh8CwRJlRfS6KJ3p+bp
+  iCWRAoGAW60liHAu0kLJRI5smnye1AdNNZjaHhaHZTE2iFcG/n+0sHsJ+A3RHw/o
+  Mjdv2HnmPRccHT4pycm8ypJz+8Im2TkrTYGmPsKBJ+7LZePIw849fjqYazI0y3/U
+  1+GzayalmNLXaR4EPkCTvXKhfESmY43x3Rrf/WHltBR8bUOMyjE=
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDOjCCAiKgAwIBAgIUDdvFcd9fYIKJgFFziJkeOnUWyd8wDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjAXMRUwEwYDVQQDEwxjYWxjaWNvLW5vZGUwggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQC3+yBn7nxVaGRz01882Tkx/JfCyPfzYqOZi9m4
-  T6dkR5FaYX5y7BZzHlKe3+4JEqSJ19TBDN8MbPtUUI3g5LV8+GZZVAj/8DCnHEK1
-  AD8B86b6rfDeEw6Fxa080vZPw55aHo1zXyzJo0HCkWKa4xD5uNOTBn0UwxeQg6J3
-  zKftljhbdoyL/mrrGlRsCj8LbYo4Yg3Re2HfmJygEpKhcoM1ndc+CBUaFE/Gu0d5
-  7VQV15YL2EMS6VMYfcKhXlk92fbJ4ZXAkQhLTYQxm87zT13nfttNdn2FpViP4WKd
-  5YkA6Bf+OLiJdxyK+gY+SEN5Mq7CcWzoG/hPezPa0GbxajeHAgMBAAGjfzB9MA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUSgNx1D6vbMPsxSy+jrBI+GBt8f0wHwYDVR0j
-  BBgwFoAUB1bZy3xGmyk6TH36miWa3SmQID8wDQYJKoZIhvcNAQELBQADggEBAGFG
-  Ts2eYdW387QHs8tkNyKRzokq5o729RBJV7UMtsVfhxUPqOBj6/i35vSFs/qZR4Lk
-  MmdEuBkNH60JUGBaQV+/6fyRmB6wpDFy2J3/PaTr2JiDK5hhAx2q5LddyT0QMaSo
-  s9EBPSBguJBxDRBzvyJJPtPRu+kVy9JcgnFTUX5pYtf9COdPUbXseMZyh4L5+juM
-  dLefxlrI9BI9EDM6/Ut78FT7SJnOVRfZ4HbU7HbrbHeDIjehIy28fWAOQikWZLYe
-  YL4KCv5p+rw2MFbJcEVGiir3hntUJtWu0n9vgTF6EdPFdJeovARCuiwjr4iouvxa
-  g8T2oThONS5VZ3QXupY=
+  MIIDTzCCAjegAwIBAgIUanWG1bOgp9pIdJqnnHqOf2pl/+YwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAXMRUwEwYDVQQDEwxjYWxj
+  aWNvLW5vZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsdNNYGTLp
+  x03sX6zwT1tjAJFeYfC9+wUUiOkrZ3asMTUOlwLqEA7fXxW/5FbvDS3cKgDPPO/y
+  Zr+nyUnWH/3Eimvjhcbo9gZU1RiBDpl128R8ZbY4DKqXqO0GQ4XixNXNVoTEz+tu
+  EoEH58bZOlAZMJiX8lgTW+kuXMIORwMUi7elgaKbANHDNXN0+d6FYUqzNezwBpVY
+  sm1XbaoQ+TPXrPdVJhrBycO49ej/vieh3DK6ReIxh0xcOvZnqJ5m9orDdSu3T9Xs
+  kauJ5pq2d3n1k4N7ibjMWt4Xup1lSTqpI0VbIzHhby854xBqxcjugHlS9cW95ciO
+  gDcdqxWZ3sf/AgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUVEwGrM8h
+  REX+yuQM6oq+gOfYFrswHwYDVR0jBBgwFoAUNnhzoV5kEeUfSwzyoXUGG30ho5Ew
+  DQYJKoZIhvcNAQELBQADggEBAAYGeeeqTmrAVyGr/aQWHj1j8yc/r+rnodJlD5hI
+  +vNJiOwxoRJmLgNRL0HBuwt85alvNhJcF3UtAq1SEBUu37GUpb5rKArCScO045ny
+  zPu5kRiJlGgeIFnIn9HH2rm1+kD3raqUDAsndqIr6LOvrHc9/t2Xx1W6+G5PA+KO
+  xvtvAbCiOv1906v0gqZ1JVGc623fmygvJMXApuzUMh8fM2iMFkTAKZm8X1gV9Is3
+  Fc+Pirb4/kW90Kj8ftP/J4G2BQY41HdBvrVmM8i7V+U8Fx/UVCarnjyeDoKjlEDy
+  OlDoJVprbIy4ifRvkY++9tO1KgeObL1b/TZ8mrA9OiGW31k=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_peer_ca.yaml b/site/airsloop/secrets/certificates/calico_etcd_peer_ca.yaml
index 0c9cb2d14..1448d9f24 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_peer_ca.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_peer_ca.yaml
@@ -1,34 +1,4 @@
 ---
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: calico-etcd-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDKjCCAhKgAwIBAgIULdYwmQwnqXDgnDVAIEkNr6J3ylAwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ3MDBa
-  Fw0yNzAzMjAyMzQ3MDBaMBsxGTAXBgNVBAMTEGNhbGljby1ldGNkLXBlZXIwggEi
-  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDoAKBtzlgSNoO8OP+2nys6/lCH
-  hU+KIC/XD8hI0K0TUAh8wGFNWTwkQcCwwMp1+x0dxMQHMMnQYVrtO+7YBhsP0F+B
-  QbpN1otzdIEoboZEEcAG1kxleMg7WlEEkjBGxV3vf9paHjbxPRkqQlfYMlY/AAlt
-  Ht4f/iaGdHqIpLpa6lErqJcRG0yTa6OurvI46Ke/J0Hc/JCCRl6YO/x/sMUZ7K/g
-  UDj1TAfpcPhYmERezadGC5tEmDl/0zjP99NU34tUqR7Z2RcjF0mvBu6+SKJwiH0N
-  QVmqEAaM9YTl5iX+VsDMrTmZPdOoifflk/OUpIX+aEDwhjAjacWcdMY390jJAgMB
-  AAGjZjBkMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1Ud
-  DgQWBBTCGVQkCF6t31ItznQVaef7UGLKETAfBgNVHSMEGDAWgBTCGVQkCF6t31It
-  znQVaef7UGLKETANBgkqhkiG9w0BAQsFAAOCAQEAxDstmHZGFyAhudoNF3IK0Hcb
-  U/Zdt6+NPquv9iwyDOrxy6JAqvRlLJXeoa5JwPOHgUCxxitvFlZDSuSz9yTsMukY
-  rvdtR/ri3tNfPgv0Ot+F6geDl8ieCptfl4AjEnqCj95CmpQRRjOC5qBqWcMDG4Io
-  UJ0iEu7fUEWIUrGGIIHWfvX9s6yaD62ExEsP9eW1ppfj/ApgfvT2JKriD0JJbp4h
-  g4FGeV7NgdY4QP8SSMhOjdSuYPWmNsDPWbylO+znshTElL1GgjaZE3dGPfS5SH7y
-  SALs4OlCUKBrZxP3+qJONRYuXKm8c4YKyoS2QjYNNgWT+L2HX/Hfi+2zfPRC5Q==
-  -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
-...
----
 metadata:
   layeringDefinition:
     abstract: false
@@ -38,31 +8,62 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDVDCCAjygAwIBAgIUMClicHBbdbIdpjgoCTcTcqllEJwwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yODAzMDgwNTM2MDBaMDAxEzARBgNVBAoT
+  Ckt1YmVybmV0ZXMxGTAXBgNVBAMTEGNhbGljby1ldGNkLXBlZXIwggEiMA0GCSqG
+  SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDk61qN4qmxQ4R71QBJsyuzAAK+naik9+49
+  6TOwhx9uHN7YRvCSV4XJEvPdIa8gejbz6J4u9UgjIT0Wwo+Cuhx8+JMsKjIW2VeI
+  y/tr+MbBZgcbhLxrlGhkDVByxlCQg3u8zZYx5BJO5Vg0SwY9lQ3UyqXRWagaYtUp
+  v7RHjX27SDMQa8p+KGbFUhmkKGFlCk+yxBJlGZoDqqm/BHVEyVcm+1j+bpRZ84eB
+  0rFFFj2EHEVm9aG92PvajL4A8DTrHQTnb+M5RX7eEdl+81ObzUgybFaPUbGl3fr+
+  ZjlbktWKBbO2oXusMdvWP8cEhmQh9x4Omfwt7G++OPvnEf4rn557AgMBAAGjZjBk
+  MA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBQ8
+  F2/osViWgbrsKe6bwVQarOrFWDAfBgNVHSMEGDAWgBQ8F2/osViWgbrsKe6bwVQa
+  rOrFWDANBgkqhkiG9w0BAQsFAAOCAQEA1gLO8DGeL01cFXs3r+djHX5ppN51vlf+
+  4/Yu20TmQSpY5/fnFikmljBbVpg9hZgqsxArTsatInRVt4qk/hX4mSxWBvBtUMGN
+  2ZDijh4uWY2TaxHIvdgKeJ9Imf/2wBReyNsaytrXmBDtIZ/K+athxKMxe6rz1OqA
+  6kqL+5NcgPX2kT2KwjqssRq/jM/ynXB2gkS44Rgef/3lhVZOWCLpLbipbMBRSmOA
+  rrSUipJXKLuWAJbj4QmcDIQULZ70f33QTEm2eKo84Mb32/qkRgucxwZsfC4FGUuW
+  acs3R379wzP4S/viszTQGHGwMbjRlg+0a+mv4+xFdTt96kIguMrPVQ==
+  -----END CERTIFICATE-----
+schema: deckhand/CertificateAuthority/v1
+...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_1_peer_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_1_peer_certificate.yaml
index 744f780b6..f2156d33e 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_1_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_1_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,26 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDlDCCAnygAwIBAgIUWrE5Hp42Pv5vyxgA4yIHWrmDMAgwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ3MDBa
-  Fw0yMzAzMjEyMzQ3MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
-  LWNvbnRyb2wtMS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  z0Pf46GAaRPxhf0CQVyEq3VIkHr+DL/E4zm8z/f2SR60x7whusFedn1iKeanxNgx
-  NH1U8eC+IJYBwVln1rzBF1HlYHWLZbH10d+Rc8B8iaHj8BHgs5OF7PNrYCTFe3n9
-  c+pVws7WfswE79TWOm6/+o+GCV5YedvB/1FspLzIAYabMTNADnmbMDU3xW5UopHI
-  snvFXS65ScVYg3KsujJiVXbubzmb657m7971lAjgMXzBTbx8fe4R2olyxUA1SlZI
-  LNfjgh2Q8h/cCQTayjoksZYoI5YMMLlOCF4tXzqKxb4Zye2wqrlQt5zJ+TuGd3Rz
-  C/YQSRvDa943f5rctGxA5QIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
-  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-  FgQUDFvDbGKeGk77uvwWdcDmqPCmhKIwHwYDVR0jBBgwFoAUwhlUJAherd9SLc50
-  FWnn+1BiyhEwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0xgglsb2NhbGhv
-  c3SHBAoWSBWHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAAv1PpAyrDMi
-  1R6a/fvlV2UK8gxF6Fxnn7ggJgWLrS0WaBOrnLVOnAoru+s8kgOuwtL+cshjYbx+
-  bm0ccSp41MFtouFG/l5NugcetJSNhP532NbqKAsRkFC3/9QbHDCL5pKLaCQhJftc
-  IOlWli6Hb03jGYqGz+VB1mCO5WHhrhWAJR/UJ0ITKpANIg0KP8fO7R16olgUvnr5
-  guLSFlDaUyy5wyg3foT/2KZon65Xagd/68pZpVvGIDNqGyNI7jTZ8CmhpF3hFaCU
-  78LZE/++yZ5D1vVKzPxZSUhzlAYzTJfPKmWqauiMMi0zgqP3Dh2D2RElceGrsiem
-  2BX8WE9Yv18=
+  MIIDqTCCApGgAwIBAgIUVCK31syVNerrjibBdPHbURxucMUwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
+  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMS1wZWVyMIIBIjANBgkqhkiG
+  9w0BAQEFAAOCAQ8AMIIBCgKCAQEApv7At6wTflVRwC2HHeh3sy/HOeQHYt3135Rw
+  NqEOD+tJ4Puk41be+8Lz+N8WIcx6CVhBipOUCQp2kZ0rUysGpFSvMHgFPdTCFUYl
+  549z0BslqWc+Tvnx56vmHkDr6F142P0CJLFqxmNvwhaOpzfz+Us50nqHD7XQCZnm
+  NyKE6UUnAwajtruyygdY1WFGtZ26nqfPnXpxn7r4dB9ss0a5hnWpeRWMYCFXmBq6
+  DQUwW0dHXmmulD3PkpWAJbrxxMdd4Pch4B3oOsHYEs2X3BSK+zzC1i2CqOYulwTq
+  Hnu5Ujy/A78n3WQNQNUw4oANDKEyx0VmWV4BUOqTnEP1HJG2owIDAQABo4G8MIG5
+  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUblHl8oyDbfVnxgfCfGA08GaNhVMwHwYD
+  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
+  b3AtY29udHJvbC0xgglsb2NhbGhvc3SHBAoWSBWHBH8AAAGHBApg6IgwDQYJKoZI
+  hvcNAQELBQADggEBAD4erPJCvZ4ZR+dcqNAo8mgv0BdHcCaeYFzDgj8JUkYglnKR
+  Wmk0TP5LTh+niFKbcEqj2KYi/LxbwU8ggkYfE6bXk9KzzauhWiEiFqUmZL3tsf1G
+  QmStI88Qcqavm/KvGKqosoadWafgm1W4HiDXF+3Hs/QjlNed7B+NQZwl2FnQdrCv
+  F5biSxq99MhoiEL1JjWk9thxD/t+R1lWBAtO4ZejwX7RNDXeuIP2QfdLC/TBo5d2
+  7T4NrLGnRnDDFlsx0449FO9SlMho/qMaeKiU98rp42/3qMaRtQHcBclJUFEXmYRY
+  V+6Vnuho3bOQXg6i1yOawXx5GueTrRwVwp3Xyjk=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_2_peer_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_2_peer_certificate.yaml
index 9f42d9a08..9ddb22b43 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_2_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_2_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,26 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDlDCCAnygAwIBAgIUGECyAP+wrfiVkrUwwMQdJNOjlXowDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ3MDBa
-  Fw0yMzAzMjEyMzQ3MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
-  LWNvbnRyb2wtMi1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  8p8arbM/YRMcTMYbeH25s0zW8eNyuunRrsL+35QrxkzPYTXm8exwEYPDIzeym2/h
-  RT16N76t3JNkvNoMKFZ+M+i6wzwdrfXWkClQH4HmM2Y+6PoNbhv8LrfQgLz20DN3
-  x2tg+bylx774+glWUoPVtj6usQb6RtQUsyQ0VwrCmjyH9HfODcnU+DwNpgcEJG9x
-  CBiT8IOGw0kJDHECP2iShbAazgF5EusxewLmbaWJz2gLz+yCb36Qz4yQKp3KINjo
-  8FO7akc26xqgTqk+sakI/tY/gruXxo0agXjUpVKOuzyOWoW9nKZ1u9e7TqM9FtbR
-  ec+mfzSLJLFEwGuVqxjVWwIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
-  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-  FgQUViNORjt6NGYBE+ASxio1gyu00uYwHwYDVR0jBBgwFoAUwhlUJAherd9SLc50
-  FWnn+1BiyhEwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0ygglsb2NhbGhv
-  c3SHBAoXFgyHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAF/dVZCpVCSS
-  N+YddMfAli5Wm3joIs26sQ8cQS7D6iHDGLvCvNm4cWqVdDpAwXL8imO+acO8V1dl
-  rtsGRw+hL4cby7VpxTGct0Hf6nMAaO4jy7ZA2nPlG7Tzu8JSKNp5REN14FZasJSK
-  iQ8Ty019/WBFu7lSoR7Pb5rTPHTU9eNSQSZpb09Rvu5sQsjtiIHxuQSBNSNDOfHC
-  Ghu3UEj/ShzDY2Y2HjPC3VNAngZ2Eeh+Z79mbO1Z8x0ZKSDMVyhhn974tD7TIyr4
-  h2scmHBkXP2nuGhYshIQ7qaL85D1UadKodtpJHRnsBfE4pKiFEhKIYdKQj+8wZOW
-  rtneYq8QQp4=
+  MIIDqTCCApGgAwIBAgIUMftE0dunDzwApYz0PQWsuxcxFLowDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
+  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMi1wZWVyMIIBIjANBgkqhkiG
+  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqHau+/vTc/5efBtvveIhxmmTYp0ccQV3kOq8
+  heZyK5tGLybZcP6mqOP2/5Tbt2Yjd/sK6gsga/bj1JjUYTrfyfABSO/JEqBVVuYj
+  Q6VnNpkxXu2Dr8pAlj02NznB5ayMS6Eakbza3WuFBS/BpxnZTEA08GsugOwU9CCo
+  vLz36RC7vBgSWcBFpvlxwSlJS4Os/FzBe8kYnqU9zsza09y78NkkbgGVLJJxR6F7
+  0JREOHjqmVl1VQA2IAfjkCIrzd4noav/qZQ2LCRNvNdIn8JPZEPceTRnUDu+NmvT
+  QcYmCU4zMcuK5k5ctSybQ9S1WwR01L9Biv1uXDMCNjaiqDugEwIDAQABo4G8MIG5
+  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQULJIaOYnkMQhJjJCoVK6kqpNh2uAwHwYD
+  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
+  b3AtY29udHJvbC0ygglsb2NhbGhvc3SHBAoXFgyHBH8AAAGHBApg6IgwDQYJKoZI
+  hvcNAQELBQADggEBANWuE2Zliq2whxZRj9cGyL8JTbcrevuxPLDV9zrT0JjExWON
+  N4YWlf/EiHxJusfC0gYNAMlWpSZLiw56FpWmrXb5/bbvOyfLIdQpZVBhWDAcpc/+
+  MSV+FpRjklTQuTrAQqEBU9UEToaplKSpWNAdgGF00e+cKjP6fr8u7hQY/qOS738x
+  iCNXue8oeJ430Xl4hSxqI1SMkMYEDYOYlt43pvhwOzyITrfl2zSAl77I4f9b1oNC
+  PbmCpKEI8ogry6b+QcvWFlXnyozLZ9EIj/P3VTGxkz4z8UbskAwvHGVxlbQrter8
+  bA2eiBSkyQF5fUnslUx4LHe8M2lHxTHChPYEofE=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_3_peer_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_3_peer_certificate.yaml
index b97aa352f..803d0a755 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_3_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_etcd_airsloop_control_3_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,26 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDlDCCAnygAwIBAgIUBYY/tBOt5R3YRbs6kPZS9uC0CDMwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ3MDBa
-  Fw0yMzAzMjEyMzQ3MDBaMC4xLDAqBgNVBAMTI2NhbGljby1ldGNkLWFpcnNsb29w
-  LWNvbnRyb2wtMy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-  psOOBlLKOKWu5GxBkA8ZzYQX5U4EV4KB0HHK0YvOT53oiqae0HLuaNOdsI+KhUNA
-  au1XMdY1QVJ6WGEXnR7NNhYkeuzyaAoC95ElcscW0m4GA9KVhcbu1H0vINKSEJZE
-  JqOiJV6v3Rgx0ueq14Z078LNlGzmYgy1ecmVVaVmTULlOHdfGSnrwXGCmNY/ValZ
-  56InCHt4Ej3D5UEfWCwqB3D4ghmG88mprWItn2B+R6A+hlTl3mdW1u5/JunZMssK
-  v7etTfW++rs9ZPf1rR1TjOMXljR+ExSB/cn9CcXsXPULXHEUFMguLzkTio6viqWQ
-  4lFV4Xo/l5O8kR2Z101k+wIDAQABo4G8MIG5MA4GA1UdDwEB/wQEAwIFoDAdBgNV
-  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-  FgQUSZnm0HZpvFFEJrT7vKLjpAAuOWAwHwYDVR0jBBgwFoAUwhlUJAherd9SLc50
-  FWnn+1BiyhEwOgYDVR0RBDMwMYISYWlyc2xvb3AtY29udHJvbC0zgglsb2NhbGhv
-  c3SHBAoXFg2HBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAFuHvQaIDP4u
-  /ukRlS1IBVTd3n9//5E5fn7Evj6h4AWqSEM8atudwLi8nApTO3Q6o939ICDIKCL9
-  iW/a4KE/wJbs5DQrTPIfLUaEAMOtGFWGYuCUdLB7qTytbkIbeStvJhJJQEuzop36
-  vqv5nBv3lGJeGG0vKzwoefsUxyF1ae/RmsfeGsYspjG+WdJZ6odFHc1FSVQAiYfB
-  KAkIqNvUCytqKx66QBazhCF4A+6DGHJopUAsRCpqrTC8HAGT2MTJBF2BHdKYHS12
-  3K3Jgbfrw8ozF29QH8WAIaAVbMAbYs6xYBQn5e6msIJ+qzHEWLBfRHLuA9X2BQp+
-  FAPL90k7IIk=
+  MIIDqTCCApGgAwIBAgIUXnIPzuIbvvDP2AlmlPAlMkDhYrgwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMC4xLDAqBgNVBAMT
+  I2NhbGljby1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMy1wZWVyMIIBIjANBgkqhkiG
+  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvdk/I74o46oXS73+n0/mhwbBbfr1erBshIPa
+  KCNjTsYMLW9/ktMVDRFuYxCUEYGXf22a6caTgjZerK2OcmOFifgIaAu8ucA4Lksn
+  9FQ/JyrcxXIu1U10YuF4jYdZrvgewYVdVIl1dtJ6m0jwxJE4fMbZCLP2zUXFyLJp
+  lripsHJXBIyA3SB45ipJ5mTDkjxcx7rW2Lo6jxBbUyZhfeXYVTPw48CNx9PQDXBe
+  NEeW/SpsssN4DQSYJrW0w9frAJ5BNXDWOoKtS+BWxlp+6RymI5aNjXFAfxAvJ5ZB
+  cSj7xUXRpzNWX9DeU5i4OHq0x7O4+5dzbnAjuOLl6AA9qausvQIDAQABo4G8MIG5
+  MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+  DAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUxUmKipe5eB2o0TU4xBG4e6WU0+4wHwYD
+  VR0jBBgwFoAUPBdv6LFYloG67Cnum8FUGqzqxVgwOgYDVR0RBDMwMYISYWlyc2xv
+  b3AtY29udHJvbC0zgglsb2NhbGhvc3SHBAoXFg2HBH8AAAGHBApg6IgwDQYJKoZI
+  hvcNAQELBQADggEBAJi1XyWXmKCmwyOluv7Xcn2vZcCFQBAZSEXeJDcOMH+aIJTm
+  NTLwYzOzTHRJlXY9dQTXHVd6E0ebOwrSdc6NjYZ2OpL2ZGv5EaHGxIKpJOygUIIB
+  bZXlfB46NNCMKuJ0EHn2yF8OQvzXbPR1QYA0KSfOpVkH+3xWjgEya+NxH2v21FP4
+  gNXOFj8nrDg6rL0TxivXwDqQ0Ji0W8jO9c9Q+nFiFpQKyFFJoBgPzS6MSnwzrgtl
+  5YKQ+85vKgAGO8LXsYzntOaXEdojJe2Mfgeny0qvJiSq8DTr4n1d7q6DedNtJDaA
+  aF3nIVILYaNT2ApC5m29p/XVo3LieMwV2I1pBqk=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
index 7048f9d70..50f13a931 100644
--- a/site/airsloop/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIUei2RAdfWofzFdBJVsGACE8uVapEwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ3MDBa
-  Fw0yMzAzMjEyMzQ3MDBaMBwxGjAYBgNVBAMTEWNhbGNpY28tbm9kZS1wZWVyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuMk3cu6QcXlXpKWG9c6hQd72
-  gDW7wCISwiElKpfIHv3smjK6BiIy/NBNYN/HnDH39ZRiTkZqe9uuodt5JoJ3Ei68
-  +cnwjXfF3Ys49sxcnyywuV8xEqek2HCByNdvJgaKladBMya6ma9Tvf7tKgjDVQGE
-  5Glwye86j/h53mpFE4dNmQCfo5DI5zDtQRe+pKE2VAK6NUp9M8CvRn1sPLlBp6kD
-  ZPtawOu74llAQWuUGJv7PLxzWZsE+LrpRMjWXgWzXKJjcYXlwCJZm6tTEjgEQDfD
-  ICN+sZ3Gm0Q8Ly9iafyZwM+U2Rbze+itXvsIpdul5IXho/6Rrv7tZjDA2bD7WwID
-  AQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFNpKLTtt4VG1hV21ySpCz0ug
-  R5XHMB8GA1UdIwQYMBaAFMIZVCQIXq3fUi3OdBVp5/tQYsoRMA0GCSqGSIb3DQEB
-  CwUAA4IBAQARwwSzbDGaz6Qhx/gpYosQzZtoQqrNcusCExhMoTHmafRfeDF+uwGr
-  YS2xCXVInoCipYJSdvfO6994qa0KCV2Xu7RvviHdFguTYwu7I/9IHZOS8ajg6fw5
-  ALUyxcWV7+UrMDJ/B6088bOpGBBsj9tGPRzT++DOmtkdp87d9eOvo/kyQn9lsoT5
-  3wsR/RkRc6dLl6oP/t34P9umzgVA8FyC22n7eFu6vuOzG77ycilJTAOOLoNG/US8
-  bwFPxfaALYxTwkzXDM/6oXQDcYaTovKXJ1TRH0SFxORZJZE29nR57kzgog3lnvC0
-  mpVL7FJsLNV9UNgCLLUQ3NOA+rx+7KlE
+  MIIDWTCCAkGgAwIBAgIUUSs3mNDC2FX1LipndH+L4VYn6scwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMBwxGjAYBgNVBAMT
+  EWNhbGNpY28tbm9kZS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAqSpEQu0YTcI+Sk7TzLAgyXIGF5yYsNnAm9O99BF+kAKnlXON9ODgbL40Ma8k
+  /gs4x/Fmi7uDFqQQYr9MerDmNE+NdR7FsYgNcvqaLVzqyZqn3P+biB5wY+xwtXVY
+  SAdK01xfjEerSw7zD2BZt3x7jk6ETyS87Tx2puCwoPLSz/C8rNPkvt6fWRh+gAfI
+  j8nDaHzmqS4JLxccUJI7lL/T5PPAy0tVnv1JvFaBLJ6GItp8HRrCFM0tLtuwIs6G
+  PNrsMwmfzIXENNnp6luGp0unuxawspiwNfEut6HNJ9C3HqMudFq9nsCquqC7Ff7E
+  F1W/EG2vjkq+Pj0hfIrGQbS3ZQIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYD
+  VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
+  BBYEFOvLxTpgI+xUWH8UAJIamgNGMkfYMB8GA1UdIwQYMBaAFDwXb+ixWJaBuuwp
+  7pvBVBqs6sVYMA0GCSqGSIb3DQEBCwUAA4IBAQB00DCtHpBxc0TOVttumQUu/utd
+  hcUm5iSYXBrayQ9mmVZ8PKRnE3oYQlLdr1dcht+Vc5YfszR5LGxawBS1z2rjEaJS
+  vAgxmdz+sc8m7tCHdxO6QlJxEvjqcY4174/u56tk2D7T19YDPS2XrCpzgkHK3CiZ
+  sbzAqwTq0IIVneYMa3518fF99S1mWBMGPApyKcNnyEJ7FWyLRhWEY7UmiHQTp7kk
+  0XHaaU/zdM+NA/SNpis0gaLEPS0UWpTxeI+3cMFl9e2IgVdJQH9NFZ5B7+gmnTyI
+  E346KUS74eB8uBCPVNbWe42CU8D/27964ToMh8hnbM2sZIrunZVktsRmMS8D
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_admin_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_admin_certificate.yaml
index aa493fb0d..ad1bd55e7 100644
--- a/site/airsloop/secrets/certificates/kubernetes_admin_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_admin_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,25 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  JEgmgA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_apiserver_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_apiserver_certificate.yaml
index e267afa49..764aab7f6 100644
--- a/site/airsloop/secrets/certificates/kubernetes_apiserver_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_apiserver_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,28 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3TCCAsWgAwIBAgIUQ2hcp/mcU0XaeReIYToIENajzIgwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ3MDBaFw0yMzAz
-  MjEyMzQ3MDBaMBQxEjAQBgNVBAMTCWFwaXNlcnZlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAKX0N0EMcZyPsHv/FHm8f3oHl4TRFBZtpi32uUy8w2oD
-  ARLUu+GtNwNyznJRPQkV5F1jY+Ozaawwqtyv4/rZnD421RTUyE/DTl7aEhXrIByz
-  VXxkeZDmvQhoohIZQC8ulCOQfMYxkJJofUUQOQ1afcaSMAEZPRCaZQhShHJMaHCL
-  YtHc4/kn+lqjVc9Kid3COQRWMugF8cX/HZwwxVO5N8RnksWNlk5zBpRhORx532jC
-  4+M2tXFcz9bST1WSXEM/Y0J0BHZysUp6KbUR4RhxN2m9Uq0r+XxcAhz7CaGf3BL+
-  a2o/Hp7ObvqFqPtawvOUIiMB5n3kYCBEsq5Kb651SnMCAwEAAaOCASQwggEgMA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUX9DEUQxyoLZE+cKQSrR7rVMGwq4wHwYDVR0j
-  BBgwFoAUKE7O9A5lpGlrmHjcRQYEPQQJ30UwgaAGA1UdEQSBmDCBlYIJbG9jYWxo
-  b3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMu
-  ZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIka3Vi
-  ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FshwR/AAABhwQKYAABMA0G
-  CSqGSIb3DQEBCwUAA4IBAQBwO9XU0+A8PnKy71aiEZ7mR/CnMicwbRNI6jJqGcul
-  e2baKH0igQoF0PYoe+Ah7Bw1kqY0XZfPt5v9CcysQKAYRaqq8zGUBR1W8FYMnIep
-  y8+Bc6g8T2chnKyuhiiCCBC6Gm26ivaeXLTUR8if9cydu7qQJto5XcKqiM40Vq0N
-  0FODmPFlz56igL1QEL0ZLtiMG280Quwr7By8o3RuJ+8jqIElDSkCV7/jCJ2G8Csj
-  mIzpN+kOdGJLTjLp5/wHVXuYTmixD08ODP3TURmKNT0aNNIteTx1EVBXIMGB0qr/
-  pjQLrXzava+7YGp6/26s6I86wSgbNSodN6johab0v2EJ
+  MIID8jCCAtqgAwIBAgIUTbrFp2B4aLvgW3V1pU+KGzbFXikwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMBQxEjAQBgNVBAMTCWFwaXNl
+  cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJtcYeNHhv/UoIa2
+  rX73ZhRpdMEmZywnyxRUtTLt1C1thk5Fh0uZi46CnoF/IUArzi2H08PaGNz/cPIL
+  bYZzaf4/dQrc5G/SQIKYZOFwbsiEFCYSloZFIpmtBzEUjtPRRUMEFqspBZ+1rwJw
+  miI98o8xtRkyyvafbAKf6KkblVajq8O6jc+HDRlzF/ef64MVQpaRVIQHU1xV/5Oc
+  EhdofiuXJDVWqD4PvNVTUa8Fy3RshqXgDJUrGHcF59FIrY9QukkPWMVFHNrK1bzA
+  Gqj0/S76DnwlxjIbaT91bFlKcnW+VtyHdfzrYTumHrWuTOJHw1mD3jqk2Lcbo/tY
+  92cQmX0CAwEAAaOCASQwggEgMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUrNjP/+L/
+  WQ6T1jhkwMa3w0qi754wHwYDVR0jBBgwFoAUc3l25WNesqD6hWcsmjAZXC3RgSow
+  gaAGA1UdEQSBmDCBlYIJbG9jYWxob3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVz
+  LmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVm
+  YXVsdC5zdmMuY2x1c3RlcoIka3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVy
+  LmxvY2FshwR/AAABhwQKYAABMA0GCSqGSIb3DQEBCwUAA4IBAQAflsjCszqFHZFg
+  Yx8U2gOjI8pHZjTdcG8l2NrZXJDw2hCb+yGBZcxdhS4tXi2ZRsL9tsI6LVPt1eRX
+  L7l38niIGZCuFySJuIgPUf2VUkUpCWTgD9lRlrk2G66m+SWAPBVLs8XgfrFB8VGq
+  XD+hfv+jDdrN08k8yqbzk+eAjojEJHID7jz9yLwrMlsh2EnmorhWplYR8mAA5fH6
+  yU2mcpJYs8mPBcKinkvvvqyfmUBKfkkjd9mwWrTOKKMmproC7o2V1mYdyaygAHTD
+  5MswOnjS1uJbIdkOZ9ceadkrP/44TaHMpbtJRnA30eaHFrG9vIBPJirEoNq9GCd7
+  9YPpdTz6
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_armada_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_armada_certificate.yaml
index 59d9fadd3..d18fbc6f8 100644
--- a/site/airsloop/secrets/certificates/kubernetes_armada_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_armada_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,25 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  g+Vchgw=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_ca.yaml b/site/airsloop/secrets/certificates/kubernetes_ca.yaml
index 83c880041..9beb1b455 100644
--- a/site/airsloop/secrets/certificates/kubernetes_ca.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_ca.yaml
@@ -1,34 +1,4 @@
 ---
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDHjCCAgagAwIBAgIUOu9AQITkDmCdUefagskSbWbe0d8wDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ3MDBaFw0yNzAz
-  MjAyMzQ3MDBaMBUxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEB
-  AQUAA4IBDwAwggEKAoIBAQDCB0pS7oJ460b2LNlIg7XIAdAqyAveyx8+xaGhZEfX
-  YHIrWrH0014OpfyZ4YM5Io6rh14KMd1Fx8eakZTXv/hSeb/xI4lzFPt6ltfI54DR
-  IIf/jy9lumC3wbmSA1Sg2aJDSLFk39mYMFCFPzRrc/wvpEPRlxfYPtHPpjRQZBWl
-  SSgtZQ8/Gc7zG4pQ6IuHH341Mj2EQvq2n7HdmpcOPAqHVE9LWrfAb2sZ9/xevSCe
-  nneE4LEhKW1Dp64ocR6wWNPHFrppjPSH/hnY5iV+h2L18OjQjbxxi82hUp85LM5Y
-  i9phJob5YSpA0tDvkZjBSHSVEKpo7cD95crWzlJOgP7RAgMBAAGjZjBkMA4GA1Ud
-  DwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBQoTs70DmWk
-  aWuYeNxFBgQ9BAnfRTAfBgNVHSMEGDAWgBQoTs70DmWkaWuYeNxFBgQ9BAnfRTAN
-  BgkqhkiG9w0BAQsFAAOCAQEArL7nxBT57TsJoH2iFU5Lao0SXycLmj/qWfV4lZfq
-  ez1wGVSl5u60quh7qz4wKnmvjam2Xm5z13ojqN7FIg8rjV6waQrcRTCGvvbSFU1a
-  UpP/OEgyaQ+xN+OaNMwuUctOsew7qxlPItnFTyV32XA7/oSYd/IC7RVkHqxfqW9L
-  +nBLbZWJv0SeJYnpiapjcKt4LsGa5xq6xg3saoaRiKfY/IdkPE2rtXTGw/jnl/Ut
-  Eh0Q15xF87sk1KdELclTqCYis6c5+7/MWmUNvE6/ytGAk1rGw4XI6DnXpVVAhEE+
-  gTVQkuGANZyH1+cDeLruLNOCI0cf0yE1p5mv+G6JFlPovA==
-  -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
-...
----
 metadata:
   layeringDefinition:
     abstract: false
@@ -38,31 +8,62 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAwgdKUu6CeOtG9izZSIO1yAHQKsgL3ssfPsWhoWRH12ByK1qx
-  9NNeDqX8meGDOSKOq4deCjHdRcfHmpGU17/4Unm/8SOJcxT7epbXyOeA0SCH/48v
-  Zbpgt8G5kgNUoNmiQ0ixZN/ZmDBQhT80a3P8L6RD0ZcX2D7Rz6Y0UGQVpUkoLWUP
-  PxnO8xuKUOiLhx9+NTI9hEL6tp+x3ZqXDjwKh1RPS1q3wG9rGff8Xr0gnp53hOCx
-  ISltQ6euKHEesFjTxxa6aYz0h/4Z2OYlfodi9fDo0I28cYvNoVKfOSzOWIvaYSaG
-  +WEqQNLQ75GYwUh0lRCqaO3A/eXK1s5SToD+0QIDAQABAoIBAQCP01+gwfQtNhpP
-  +UbHnfpt3Ao27DsAV4k9urnpLLCkUnXO9Vfcp6GdMiVg2+2tuJQRSjLHU9c2FrU7
-  OpcepsqoOF+znCgTCoavhIlH/3NZkce+BKGZwuJW1F9+gMGGykyhm40DvXtKeOX3
-  H7b3v+48UoODJYEjZs2YIxe8T7RL4/VGrMnEzIxjqo3Zpb3en434LrN2aakaPuyw
-  xsbflDWQNOWAfrG3+s4689sl+Aye2pHxUCqw9RUfPQ6cXzzz3jvW7KGM/3W6k7H2
-  YtkwS3WlRCecS7D5jNfEnLFfF0AuxpfV2pRzyiULqK/YyL8ack0j7HnhP5HrNo5x
-  03RRVtnRAoGBAMJmMy8/1b6VVqqSeWNbC07iPmBsVM4tgNESM1AN4iRsxl86RFT/
-  IDTerFfwn2IhbuutZjQzsqphf6p3nEm/U+n8OboYXRPWfBYKe1zBS6ApEVlctwwl
-  dCSYS1rtfdnV3dVq9XFsG8FBMr0q0zlpQbHNxH92+aTraG3FZZcHrf4rAoGBAP+D
-  BAFrYxXd3pT6FsF0PpzvLxNNRkOeAmgOxgcUG09z2gXKntu2F8NtmWPrfwIi2NMW
-  jkJ93/Qp4Br/BfruDSgS3Yv5v13eYHRwh1OsSGXcW0mNqePOj0DmLteNVw+gw/LP
-  hVLF1R6v1WM/kNJ1YazYUg9trW/4uqbHKP/iKDTzAoGAC4tuNrwfwXW08+RG+TOK
-  9GBTO/6y+puRLtlZ2sM4Ttl23mjjbfjIvNsMeRx9GqLJp41gqHD5h0zK/CCmU2rd
-  XOPxua+At5DhRZ3RvaxtBVHrCdeLt1jyEMpKj1fTRYCB8A6uDNJSw6NPlBRa/unV
-  UO3bYYZ7ROQGC57RbaqzFokCgYBYL4TDZKfXFTNMIaCW9iLiER8jP0lf7voPpgGs
-  0cC3RFncI9l+JTPAbGRDezTjrNk+yYsh4cXYxFcnmhsbRuvdh91VAUaOBEEwDuJ1
-  +4ElPs927GDVUiZZFNjX5l1E9IyMkhkGv2bV54PzdC3spTyn5iU0U/tHKQZqp1Q8
-  NHcCBwKBgDOOTeHOTsULimxs7nmVgpuZz6S0LWT2eEo2ahvDA74AaWukNKD0dxTZ
-  l8l22P9NeCJIrZMokuVIS7Vm+j4wpdzFswg8LUvxnOMXgvx6UsiZDDRgrJLv6MOP
-  28SVksPgoGmHAvSb2XoLV2dr8wKo6cwtgT/G2Qj1P3yFKaMm2UBw
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDSDCCAjCgAwIBAgIUf73Te0+ds54Gg/YmAjPZiJFKTv4wDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAwNTM2MDBaFw0yODAzMDgwNTM2MDBaMCoxEzARBgNVBAoTCkt1YmVy
+  bmV0ZXMxEzARBgNVBAMTCmt1YmVybmV0ZXMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+  DwAwggEKAoIBAQCcvxKWnqd89pQkjkQerDZI7lrXqs31tFZg4OyW6hoyLvMPvu1D
+  lVxCpBZ4c6E3Gn73i1Iu5s0bojYFo4caBBhE22YbPkwuVZ5q9Ph5FOzJmPPbmOzL
+  +PFZK1MF+SmJNp4fMLz7Cv8vuEWy7tQzf1f4FEM6FyWofLAz7uaCBTJm/2JODjeD
+  fHr8ixhrNRblFrX1aey0sB6n+zJrtqY60h6JJsy+4FQqD8MRNcwJmWspHJh6Xc9F
+  tmEmnXdeRRklC0qpphZD2ZaJBBBlDHM0WfKuwBC4g9kwt2i/NOdW/whb6MDm2WVa
+  M9jIGa5Ql6KIX2RJX58u0r5jl5lOmMUtVEPXAgMBAAGjZjBkMA4GA1UdDwEB/wQE
+  AwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBRzeXblY16yoPqFZyya
+  MBlcLdGBKjAfBgNVHSMEGDAWgBRzeXblY16yoPqFZyyaMBlcLdGBKjANBgkqhkiG
+  9w0BAQsFAAOCAQEAlNSBj/hF11K9JZjs+U3SzRUc1/o3kNY1Za7ISSIyLpAAoIHn
+  /SHzQitF9Uqx3Pep1PCRu2X+L1G3edvL3gL42ShQ660VZZgNPXC0ZrjLPHT07I30
+  JUR2URjfTaAbRk+EqsdiRTJpou5PHM/EW3TESA5eqRZEigdVibqifS1+YrfT9kXe
+  wwYjNNkkQaYUb5GpXQiUKnI1KPd5iV/wclRz8JDuDcGQLZ/+aLHohAiN4o46kYjI
+  VOHEBZ/34/UjUw6yVoFNF/xaVgWUXYLuZdz0lDf7R56ZWWIZZZRsd1gkvKjNsjy2
+  TtMu6+Yjd5ht9f0kXkZo6wUb0joQbJFP+ybNtQ==
+  -----END CERTIFICATE-----
+schema: deckhand/CertificateAuthority/v1
+...
diff --git a/site/airsloop/secrets/certificates/kubernetes_controller_manager_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_controller_manager_certificate.yaml
index 24ef680a3..86f723c3a 100644
--- a/site/airsloop/secrets/certificates/kubernetes_controller_manager_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_controller_manager_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAsgpDspa6+NMmRfGCLOcBNjcvs6aMgLYbTBlI9s4oQV09V6QV
-  xMO3xn3GSw/HfmHbbsnoS3QXKtLlQAV2pmujUgwtgY7QBxBpooZCrzg1mbXAlHBb
-  C+6eQSKBd5GGi0jkrFOiIsTTkLHht6c+u93CALJMaPcd039QiQL789sNKB4xbu1i
-  Lnfl0T28zh3F31nR+btT96nBPF6AJvPsK4F6j3Cuxsd43Zs4xmt5ZA3y/4UBtzHj
-  KQYmO94MDVXcDsQbdLWKpZA41xdfAFGbd18bv3yw7KVcUMG4zxyvf8WxHUqvdszH
-  nDsSbT0Pnn1AFB5rWIKCx05hCZ6TqpS10sQJjQIDAQABAoIBAQCR3fMFGJVrU6Oh
-  3nKm00Sc5K4CZEvtEEZhHL4450L3+qpNabQkF64zw8x4px7tHsOni2j0mNJ6VXtZ
-  7p/9TWbry+pkoVsyznGdpJ5x7H2Nx+lWNI+DwSaLevfTvLkc2MXxojvOfLBRdkvW
-  KgIt7UwLQgl0XjJjm4WiG33NlwS6flRv5RlGYeoUU0A16rauclgDK1zNugGrVcZI
-  Z+RvkCtR9Ut5x52B5ey7/m0pLI+XllVPBb9PnaRvNZqkJ3DiDQRwNrJZhnA6kX6S
-  hs9znafHSaVTNzb+CNNuFptG+094fsrz+yQxTlUPpnQ44Mc4pIcUY2PmgNpbIx1w
-  IwaCl7cJAoGBANQPHJZq2y7XGblQ2i78fGF+lfBSLLcVM/mDMIAL67t1slOXsz79
-  puE/F8gHeZW4J37JJ5bvfBJuh/TlN+uq5Plvt8tVnTM7BZToKBHizq+tJ5ak8LNE
-  1ZVw2nuUyTHc4WVIa0p6KMX8ynYTp51Zeeg0CYIHfsqnrjRYyqABBlzbAoGBANbu
-  lWTGAmsaFAxydyUkGiPpxUMHn8VZDI7A6aCNX74eJ9TLdM4gNR0Yae8FKzZru+2H
-  y56E8RH6DFMM6Wcl2mQzG+yuZRPQEWcO9DIjOrDzoX0fA9yA+MQHGpODb/XiRoHA
-  HwaCVuyH9uy7vMauREf60b0zPodwwnmkHeirosu3AoGAANQOSIgiUwyEDTVDpOtX
-  kQntjALGKfDrQw5AIj/pq9HJ4Im3KYfUHw0gCqf80Zjmjpg6j1xgH7JO1aYPkdwZ
-  COBm12R+OLUCUJKXlXpNVGJYxT3fstOSAgNu1wy9vHQgbUTbJm9TuXJDWDK7dOHk
-  mAOcBeYBmMkO5SVzpSxb2gECgYEAntT7Q9hsSxeffz9Luv+97ZJA+3Lz6BQRiqEX
-  RVWUTlvclY2xCO6WMaUsC72nHHVrEHLMz51wxRci6nDdPyOjC28VkMej3ItjgOR1
-  I2QTaFbynRNBeD87FyokwqRcJboM3q/KfbXuZKdpm7J1I+H+ha7eNlJbQB3dKaVV
-  kO7dxGsCgYAvHVQ61yD6deb2+7S3q7QOCvqmqNU3qXuCoeeirTds7mqhhsZMz0vA
-  vqlJ9/VIfT9lL85hJFmXEeG/qgP43wVSUU7zpNEUe24ITwAIJGtmLP/APrVjm4PB
-  +a25rlXNP8xqm9BjpS/fEy3zn05ecGlWzaXoda4XH42Tz6CSHP4e3A==
+  MIIEpAIBAAKCAQEA1PuA+JaAdnWZKtQx5OHaPH60bMt7JdPAeuR0QUH4taAZuCfi
+  RfVReMVmiuB0FpWyQWOQcr1u7acsQpA19MjBH2WghI3hGWad+Y6ZhQR9mp1JsAW9
+  8qaFtykWMymGAI33nCB0/lAA7dn+yDAHBSHrZFkivCMz/yOj7kDXk0BOeMxNBh/4
+  qkTtiLZVcu3VvXVtfsUtzr9/gs3HTM6UNOKO+8bvP9vDsKSr8dtadR7zaibWUNP5
+  fUmXbGSE0nc49dWlHmN0Z07LtC82wVrxgD7zG6AqxzVWdk/iNbL4Ja8/Dz3pHBT3
+  qLOqNO3AkFa7NRnATi3efdVsONBoYfcDGb3u1wIDAQABAoIBAQCpvL7uXtOGlPY6
+  wd35sV2B9ODKC+jbHsU5q7RTBca2yR92OqMEahxCCeBNMdCS5z6nCjhmmT48vIxz
+  iAbYTN5MrWud+Iy696NS7ii/b/LCNDQzyn+1UK0kaeQ9ZgxbiMkbbmqO+yeiZ6e7
+  1zrhBkVZNgiOs+eOoNLW4Gpt+kQP1B2pSYwejcDGTaOsvAHRkmSOEpmz7CB0Liqr
+  Ca7cXW2YSFqiD0JecW4fK8N19Q707aigg62g2c95Q3o48Ehg60vKk48qt7gLpmn+
+  W0FwpDLiOcyq0jRce5Lz4YjWs45gzRe94VopVlTfnEw2/peTqDl0qnvFRwJmjlMW
+  pY0kiXHRAoGBAPXJM4BO1bb6QYqX4fcocGGPdjDTSoMALCjgEWMqtkSXTcFw3Bu9
+  Cax+W3eC4EXhPfshJ/vxBBZoeIbKGTyoDL01c702tqglGWHAVTPrd9emZb190ULu
+  JidwPkIqnaEbYTc1W0t8lIxUzdQaA+081sYBBUlQ/qhzjYJgfhOCtrIjAoGBAN3V
+  UmSJESsbRXbxH7KjY7sv2DBxwgjUtQOxCIvQOi5tMDPTUnzSHDwyNqgScckAlsKN
+  Cr5YwrQkNSSu3XlpOXLEYov6TVR83pNPyqP3iu4jNHPfAbgUB5RT0ctwGjp2VwL0
+  sFwUg5Wi8xOlvtQdakqSdu8vguI/5AdcIqSWnRm9AoGAIyuxZPDjABX7fvuQ6C8v
+  NaazwPTbOrexmf/GPSyFfHcyNzYRKR753WcPa6CcuyMqHV93O0QX06ULai5NQjLB
+  7+lQMIk9xf3ZDfXZu148fe1fraftY+h0KTyUjB9RAxbJ6H6IG9st3o7cDTfTzATi
+  rt7ChOVEK5KtczSfleckgYUCgYA1xZXZRNhiiJPIBx7V4IE2SJyw8YJFPbo7ENiv
+  e2P/CPycM2dVVmD9vnY9O2tVe80Pj7zA8ycPH4+6OqD44ybHyQ7SO3QvPK1/K+JE
+  6KZGn0YBqFb0VfaYX9EE7UGOVk01LDbruxVCWmNtqcmeBRtUxDgMNooVacNOfWjw
+  WInwSQKBgQDaOGxwf8xBcvLkqQmkJb2aeF2oqY8VQWqx7lL+RNgK4o+UGzRzgv+s
+  7NtEC+6B4FFieJO6nkd6iBQaHHyeGER7VgqK+VcmNfXT81ty6Wgmy440FxW3gKWO
+  RdptqSgkdzkbad7PcMPWCLwkBjp9xnEGgUyPm9HyehSV0eDCyhq5pQ==
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,25 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  mzXHHg==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
index 2cb259007..b60d4d5f5 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDOzCCAiOgAwIBAgIUDDhroAzN9zsywlxvPrr2hvE3RrMwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDcwMFoX
-  DTIzMDMyMTIzNDcwMFowFDESMBAGA1UEAxMJYXBpc2VydmVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxjnxbfwbUZlIwGbcI2fIJ3wU3nMuh1el8wRI
-  /rsKyikFPcr7xXczPJCGsaXsMIL2RZIpoJcvTWyEpvowY0gMEG8Bm3NhgUYDyN+T
-  JlGQXXANoaY1u8xCUXEXl5acEUf+n9NbbmzXLZnLJowtWoYds+VRvZ30gICBLGpL
-  7lity81/TtSpsjUIgAkIHZqruz/gQxByI97TowEbgqM6yI9qETunF0twy4ftkXXe
-  YmyaDfvjuKeRP7S9XiyI48Ao5aNTOR8YEhlQ4vYjrzqNKpTxaSpAhqJ0rRTtZCpX
-  I6r2+yXYNjsh5iTqjLxLUlUBbtyoGmZigPZp3UUr6eWNUoMt3wIDAQABo38wfTAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFFRXJA0rkdqc53RogUtY1F1Krpd9MB8GA1Ud
-  IwQYMBaAFHR97VsRAhZFGwlSoF41l+vIAWIoMA0GCSqGSIb3DQEBCwUAA4IBAQC5
-  KsUSatF95IJt8PCBYQBOP/22XX9+6CEe5qIPxlIypun4b16pVj5QR5C0OQ5ROe2o
-  rvb91qGI3J/SpbTSH60fmx3l3IRCbvzPt/JujVndGa14OS3lPoCbsNHPCOLiPr3t
-  CSlbwowzmFHxtiEzdLUR3lkXGZNPlunAMVukftXnmsqRXug2Bjg7m73o5/fYcUgB
-  fLE2LHdoGe/CSI8ZYXwVRu9s8ZWl3dmOKiQr94GmuTjVsSMzClqQhVLhSrvrWPkH
-  WpiBmGxKmeHNySFSvIZHKbV8h9ZWxOgL6AzTRi3lpnTsFo8cgh4CoYW0tI/QxKy+
-  Vyz4B7Un24SbMi4+KZx8
+  MIIDUDCCAjigAwIBAgIUKfkpqQoKbkoWzq+JXoWJo8Oyj1UwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowFDESMBAGA1UEAxMJ
+  YXBpc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3cxqa/Bq
+  iygXppIfT4uoFTzWHDyLjFG04NliYYG5HPaR61tWP38MfE0zskt/c+PjoDqs0VUe
+  oMjrNFYt1OVRDdJFpwG0IRW7sYk+T983H7UGoXVNuAqZtwn+I/v6oM1UubT1kruV
+  lvYuZEt5QU9jAkIHMQT/+ieNCQJp3w5i4OOlqdCq4v+1phPn3L/wgO5p3KL0c7En
+  P2jumRKUHljOQvJlgsMDMv++MwqlGooxS6Cq0BjVy1nA3KrQBOO0nRBV9EdT1vUY
+  AYs/PpFGUMyTG2kqDG/Nd+c1qiaKzNXvvjkBUoWEzFLa1IOliE/lx9cZw8aEN+ZG
+  G4DmAZJ81PE4pQIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
+  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFD8uOYK1
+  C6IViT+S620n18pp+wFCMB8GA1UdIwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyC
+  MA0GCSqGSIb3DQEBCwUAA4IBAQBFZz9ti9fmUrU+yfXaaIDOBMdgDbyiregqHjhg
+  UAuxWUEWeXMfE/isGa85cx58sSzEKZmuYxZdweZSJ8KCBaWJk51mZGvXw51nHZuu
+  aEtrhSIqtzKKPjfMxcfM7QkQp/OwB+8KQfXzaEoRehGpiFt89lqfuiP1wakuvQPR
+  M5dkaxkOhhJjP3isbFcTTc2vXfdqp4aUyR4H2Tt1mskrRzAc4xLAFvtfOvrggois
+  PkH/EFj0EGssGPxMf0wnffFEOa07CxjFqHkgh9Cl14xf0vbvaV35HFnkl/SGyM/v
+  54V0lpZmmr1XESjBJSqZeUaBodVnby9DPFWvSF7NZQ1tHSAA
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_ca.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_ca.yaml
index b63b91032..7700f86ee 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_ca.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_ca.yaml
@@ -1,34 +1,4 @@
 ---
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDKDCCAhCgAwIBAgIUBoQJ35z1h4v9o/AF8BhOg9H2yWEwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDcwMFoX
-  DTI3MDMyMDIzNDcwMFowGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMIIBIjAN
-  BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyUSxiNTgWjM/snNMcHFMkgaeB8cW
-  DTibcLnLQj4P1azk3aEXY+aNdXJnlUrsXteHbQ9QQBTrYivKWj3RhG2HA9/vROdW
-  mSN15bISLX1SeQE0FZlSEVwJsGtUVdxUkR4WKlt7coL22k3MPFNTE92JFlJ+DP31
-  oMgUJj3Y0ihEjHqjmu+cCJM2iLHO7LpBrpTVF9DLL8v3D5jSPycvIRYoT4dlEwWq
-  arowG1JFTcA2spxyCvfpOy1c6UXh14UHvGDCTlT0tiw9QmJHKfQlAGT19+o68QKB
-  2NNpT1/Qaa5Pcsd4m5rVfMoCwB0h/wJ8PgyDT/0w9yadC7G/+8q3KAR2PwIDAQAB
-  o2YwZDAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjAdBgNVHQ4E
-  FgQUdH3tWxECFkUbCVKgXjWX68gBYigwHwYDVR0jBBgwFoAUdH3tWxECFkUbCVKg
-  XjWX68gBYigwDQYJKoZIhvcNAQELBQADggEBADDWJoybj7eG5kkuOdygUEuBeJPv
-  lz6cy5nuBnwjUVvyZymRqHDzM1wQh+xa0hJ7l3xLmw14NKJoF7Zipm7T48l1Qcc+
-  NOCfGTmqVXAhMvrP54ZvxI30wDzcwZhGvkKe2Bm3aX8X8n/Inq8dvG/6cv6It68V
-  e9NUDqxb4YHOQONOZe9VEBQ/xDL0wgrGwZ8O6pWVpGMb956V+esXt8V+pfHcg7Dm
-  MVszqpLq18pHHiqLcP1yco5zqKbIZJ9I66zZ+uIe0l8YR4WdTpA64D8YrIj0Cp2z
-  PW1JAScucbGbwSstZUPQnLF84vF9OCongjenqxppFGuw+wWNm/38fSr8GXk=
-  -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
-...
----
 metadata:
   layeringDefinition:
     abstract: false
@@ -38,31 +8,62 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDUjCCAjqgAwIBAgIUfbkr5/1QSKkSa9/A8sBzoUL2IBcwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI4MDMwODA1MzYwMFowLzETMBEGA1UEChMK
+  S3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMIIBIjANBgkqhkiG
+  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqHMY6/uBGlyWM47EEB9TdsrvZloH8v0YiDPp
+  UsPw0s/GQYoFeiXL2utDxM+VKG81r9/FeDKrsignIpG2NdsMbMPnp4x0Cv/fIAsM
+  GKIzblT1z2aVFFm3WMfYJikMZQIMs5FzirvusNm6GjJIIl8pUCPMpQkrNyLoH5Ph
+  CQWtGJVyAulOmdHR1bUw6OQAGw7XMD6ERK2g1yIxb3eTVtKnbiH7Pr4VJke+WARV
+  T5jnrDhQ+s/umHIMrFccigydJNhr+HJud/wI8BzbXw/Yo1VhPnvfff7tQxiX34W5
+  R8lBrXu2DUl171FkNiR9IUPH3mQtOSR7v/RVINf4m6WhBnGYqwIDAQABo2YwZDAO
+  BgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjAdBgNVHQ4EFgQU1OxE
+  YBwjg0Q/FUtx87qjoFYPDIIwHwYDVR0jBBgwFoAU1OxEYBwjg0Q/FUtx87qjoFYP
+  DIIwDQYJKoZIhvcNAQELBQADggEBAA/XZIB2Z30+NtlihkYeSUm31cJ3VPmuWZrq
+  z+XRlEWRiQ+vkZRc86+Q+ljzh7aZWGXq0BMnUgP9UgxlInBilxSZsw6vDaT4ncOW
+  L7JoyadUZw5AhoWZd3m5zbTeqUFDVFjrNsEsocAESKtUYNqvQcz30U8DzDVJ9PFe
+  RJDcv+1qL8uOQJVqXXcuZoiG4U6rP3v0ykMnIdm6z4S0qjb2nrA41RSYXwZpS2T4
+  HLEO+vISIrpSJGgaY/d8LbIS6gZlf17iZfnhU2zhyfXhawgXUGiAxwVoWl5QmhzH
+  jdsFm4rAjTLWOisGR18dQFZsAgX2zzqDlMUC/Vu26ezkJNttQ8s=
+  -----END CERTIFICATE-----
+schema: deckhand/CertificateAuthority/v1
+...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_1_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_1_certificate.yaml
index 0f5a4b938..599af07ee 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_1_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_1_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDwTCCAqmgAwIBAgIUPrEej9a39Q/ijHSB7dDl2PxmENswDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
-  b29wLWNvbnRyb2wtMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK90
-  NvZK/D5BMcqAMYL+n8aVZ4s9+6ZxKK/bgyid+mUN8/UCnemNs14nMzmZX6kwWRQv
-  bX1K+XoEG/drqj6cdPxIP28mZO6wrtwb4s+awDkwUFpRxxml5j0PaP/R086VTzqN
-  JaPdiGdJHpG6BH/EvAEaG+ooMxzQ/wvCehIhXIJepuHXUspdUPBmq17I6moL0fmO
-  FWKHUoR+6KnuU/QeH5NPT0q/UaZcPRXAm7bOnlluvzYGuAAyVZ7a7J34aks1x6Kn
-  k0oAyW9nP8kK0PaRV3eLx1k8YTBd70yHtVyVIGI3E31LvxKe3oz3BomXe+7jE1mA
-  CwZW/D7cBU9AvuL04vkCAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
-  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
-  FBKPtcKfsFp+wo0poy9A3CYy4SOcMB8GA1UdIwQYMBaAFHR97VsRAhZFGwlSoF41
-  l+vIAWIoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtMYIJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoWSBWHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAGE6FvD4OoJSK+mp
-  7RCSjiodRYJX4Sj/EeUIKW1TYx0jjfBYrgzItK2p0cCsNKwiN463AVecsLL9+r31
-  g86wt0Lz5i5EJlyg8dmiw0ihYSmLvViklYDnHfptJ1wLxCOxKobPiTiWOnoBmPfc
-  VKcQXHIeQaVl00kSLvpUmeSIyzKWOAw9c3DJ0DQjZQonwHXyEGQxH8YCy3S3Ev4f
-  cQOZmrWT0Kedcg4RJOuhZw0NcFu/rEbS4QZm9joX9JkKrqoY0+OHlkUoQpLoxn+T
-  Ck1EYxvpEGV7s4XMEHiUlD6oTJc8JbJ8fPDkvSHOXRxvRH1zYAN6Zyj/FCwxbcr3
-  U2x1SU4=
+  MIID1jCCAr6gAwIBAgIUFWmXrnADbVKuruUij7gy6g4RNYwwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
+  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMTCCASIwDQYJKoZIhvcN
+  AQEBBQADggEPADCCAQoCggEBAOO1TkpzoYxejWkLhhFaHDbieIwgwtCf2vHG6u+Z
+  sRV3D8SbmGelN/3RQLpOHJTWMqftUtXsQO4SlSh2wD5Mhe9gQIb5f0vyoi1SAJL2
+  vjWVljaJz5c8gNG1b0FpIk32dcXEqLBRFtx+H7suQoL78YigKUSpnE+hVboV7V/2
+  11G1gBglQYTMP8d3co/fWmcGeVmdAuGGBhafKFoI7hIS7BiSrEz/cbCaFkp6xuKH
+  qX+VuD/mwvYk/Fq2HaQ3SS8cUJ9VHLU7VxV/RacGLUtojMLQBHbj92gX1v71kJM8
+  xLxq9fB+MjoU8T/luZloEjHr+2+rUPKmBZCe7dA0LoGZK8MCAwEAAaOB6zCB6DAO
+  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
+  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFL+zlx2c7uji/Ux8xAL9tZ/TAGIMMB8GA1Ud
+  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
+  LWNvbnRyb2wtMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoWSBWHBH8AAAGHBApgAAIwDQYJKoZIhvcN
+  AQELBQADggEBAHfhCqUju/DQTX7A3TuYRUByCLSUu5D+JNK0WJF7zXOWSsVPFzyN
+  ZiCe1lOkZPKtg696/ZZM1YBY21DCuDoxi1P7EyqDdnVmPVmetOjF/Flh3XpZQorw
+  JdtFYOQLRZ/GP9HJn1da9U7H6n2OzKu7biFuYhDiNM56ooxv7mcQLqnEKUu0SmTW
+  jsqb8qQghee3sFRcUaoAhFtfDHtdwAxI9T1bPBRxZth4FPY6/+1XN7OxYocwRBP3
+  hXVqZrQ3ecYR+NA/XuEGLpm5/oZbvYD/Fbc2uranvz6G7VRqlF93JZtcTRfdJQLG
+  ZUQZNAibCUipkg6nD0fa+C7Edx20tLflFV4=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_2_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_2_certificate.yaml
index 8b7830062..c95c7f44f 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_2_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_2_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDwTCCAqmgAwIBAgIUA4S1wahwi1Fpx0ZZNxOjY2THf9owDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
-  b29wLWNvbnRyb2wtMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKdJ
-  DMz2Bv1AT4g2TmrkEGuQMyWKcIC+qNJBpXnkLjf4JOw2m31VwuG9/wE2UGxtW717
-  FA3WycF9Q75pvS/dSjOOqPeJbaAVdmLXNuF7IG1WiSO2W24tOinbDva7SQ7I/kr6
-  RNgeS2sWzb8X9ZkAZzBriPK2tO/9XcvQGm9Aa+OVNr3iEnJmlrTF8GBZ0Or6Oc0c
-  /JhIifMLhh5mqDFmdzL0185B6RHK+KOZIjx3NtztucJZ770IIoyG5FvP+MUIWD6t
-  ZvqLUOeFpoEN+9BmvTXlqR2ohtfCOLY+Hu1dXWwTQuGJAeNHZaYqIdgFaMBKJfNN
-  inA9PW51YsrSeeWrINkCAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
-  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
-  FJ/iDUesFtee0T41TEaOByzx1lYdMB8GA1UdIwQYMBaAFHR97VsRAhZFGwlSoF41
-  l+vIAWIoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtMoIJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBADKPbl+qb82F30xA
-  GxYOboJlFtlywhvqnNrpgNl0jg+UfJKFVDarNglffAbD/T4LPIb/QDg1N/rzYZ1o
-  tqONAckomDXY2fG+WQjvBqPn93sBNhm3o+VYTbur7DUoqViWtFlH44L/MO7b2Ng6
-  5jLOyj86aM7WfvWx3A0JHHdJyWOE5aePtxlzqS0UQcZ++9l4ni5pyc0xO8svZWoa
-  rSeNcolJ4gklX6CL7K4ephgCTcpVhsjZOrUJVtH7JFAhhuYQtxqlFvcJWc3mgALC
-  mszZezLLHsz3jgS96uidFYaO6puAu7SFzyfu0syafyvEF/ORot14atRvfxFVoh5x
-  eu8bP14=
+  MIID1jCCAr6gAwIBAgIUBz2qyb4tMnThpB6JFI/ZhhI5mnswDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
+  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMjCCASIwDQYJKoZIhvcN
+  AQEBBQADggEPADCCAQoCggEBANSUUv0BN3ziFiWFg0cFzFrVy05RfSqZMGsz88I3
+  qZ7zt2S29JnOHxIuEX1aZu7FYJ0wLPPKbzCc/LtMt+tAlqiefUj8CTvWgBbF04qy
+  j6XfdYUqBIUetXHJ5btqHWEscBcjkWGfg15SqXwS6TS3zS+msxdlYnYG6FYxjs8W
+  Ll+o0iqf5ctgNnS/NTZcESioQKKXqMGRR6a1/C/V62KaAA27WbCoasmeAwzwY4vj
+  lH2AQJlf8NWbu0U/CTavZNEYGhuphEmTnSsfzSlJ5B2H/ghKAXOyXqNEw8nuBxpj
+  /TRUvHVB+8BMzlOCBuIzLJ5hMY4mJiAgFdteYKNvVk/hb28CAwEAAaOB6zCB6DAO
+  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
+  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFBw9h1fp+U9RuS4ho0k5vQH8EoSMMB8GA1Ud
+  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
+  LWNvbnRyb2wtMoIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcN
+  AQELBQADggEBAIGOq0Bzap+jADNpocY58Kt7Mz6lWCgWzkhPLGQZZLLtGf4kDbyK
+  cXknqBcOL4mGHnfoWf/3FIgFJv4OBa/aWPL1P98d+q6rPqGdEYDcDAnPdLShcE52
+  V2rGcJ23lAdF9kNimuXnrXkBMVm1njgRtDHMAbQZ+TcIPZk1DeMvDcUQqPNjp6vR
+  AtMcf1GLcs+gs/fUFekDQMrj0PZK9+aUtWB5GTqKSQS1KAgsBg/L2YAqDskcQp9y
+  jlDvnoi/8zfdq9ayJGQ2NiwKvyWuEXHY9R+6A6+iM6OpUBQSkpIwtVxvdWV1OHCM
+  RqHAelHfQCdgKVx23Lln39h22O2FTdR0UjQ=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_3_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_3_certificate.yaml
index c785e31d5..e69ae605b 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_3_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_airsloop_control_3_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDwTCCAqmgAwIBAgIUJjaZO7O0TYJX1MvcSjt3ojiA3BkwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowLTErMCkGA1UEAxMia3ViZXJuZXRlcy1ldGNkLWFpcnNs
-  b29wLWNvbnRyb2wtMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrN
-  rPFW3nTU4TP1dWU/oI80BU3/vHQlYkmpIt9cKZxUEKy9/7YQvdzY9jwt6m9bsF6k
-  W3NO1uzwyJXuqiK/ASIvthHOVbiilakoof4tcKrgUh9iaBckX7gGjWnNKpXMXkUY
-  y98dqiCZH7CW2UdjXDPfOcJTVY06BnUQSZfCg8vyqM0K7oIoG9EJF0MODJXLBv/b
-  KOlmuGxIvXSFJMxkBFgsGSNI7Ui/mzhxRAh9VVv7kdrvrB5LVP6MhworJmRUEiTO
-  k8zuAPYwrTI4DXfwCG/tyCdvDHvyRbiVei0Bwyx8FtE7KSaS9zS7xeCGTmoJtTOh
-  Aju9GQHGDoSopzS6ppcCAwEAAaOB6zCB6DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
-  BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
-  FGOxOt0XvclzFWqpcEIwVQjFQ1ZDMB8GA1UdIwQYMBaAFHR97VsRAhZFGwlSoF41
-  l+vIAWIoMGkGA1UdEQRiMGCCEmFpcnNsb29wLWNvbnRyb2wtM4IJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAFEtGkQnM0QMEYKz
-  rgiwfQIgWQBUfOwv98ybsWS6BQhrjmPmOAWt+8bLYIH6mGUKSHXWPAxV9uULDsPw
-  J0cq6osu8qn/+50lRjjLaaJEpnsm16QslUDvyTIxGQ2KKvW8Y6Q/PxgSOtcEvEnr
-  VwKgA1WnJZUaHgUfNqVLXoSaNVdW8JjeYfUZR1adW+iGP6InSIyX0UsJnk1m3pef
-  oI6fdSM6bBrbTfsVfofNPoZAMq/Goz/rmejCktYnQYxLalwEfWK+vellEyhqCv6o
-  MEFTQGQKKUznJKh6Wz++pBGzpLv0JxPbTbzrZzJ/7A3uD8ihhs0EilPeRZeHaSJZ
-  YFjGsm8=
+  MIID1jCCAr6gAwIBAgIUIZWybMCL1BkiE1HxURoZwAFO9NkwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowLTErMCkGA1UEAxMi
+  a3ViZXJuZXRlcy1ldGNkLWFpcnNsb29wLWNvbnRyb2wtMzCCASIwDQYJKoZIhvcN
+  AQEBBQADggEPADCCAQoCggEBALarIaWt81HdEX5hetFNcjLMFTqwIFX2e0uy9RPh
+  fdy14PWBabsIF2eNGIFx+u70mPy50kQOanMOvcLni+41w1pMpYPXjUt/mH3M/eF+
+  MPQvi1WohvKlwDuxo7uL/+wZzndnpjNjKMXn10a3595ElzdIi9NOpYxSaxLQgGA7
+  m6dvnxyOqgbHHf0sLDk2Uzt67FCmBwK8f144phIiGGQETO+aHkryGxIXlLZX4ZQv
+  x3aYBjtDpe/eD86wYU2v+brr/Jz1l8S+rHLQSgZrI4asoVbLHs6tlyOtW0swx21z
+  SWqH6leh8BeonWqCKxthlXVPUKaye+hpD15bHbF12oZ33xsCAwEAAaOB6zCB6DAO
+  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
+  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFCXRx4wxsoYhOSVWzWoGdmCCtRDEMB8GA1Ud
+  IwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMGkGA1UdEQRiMGCCEmFpcnNsb29w
+  LWNvbnRyb2wtM4IJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcN
+  AQELBQADggEBAIS8Dh+JphhxlcpR6RXgkWMk9gKc/FpKY2Cdg7hmUPuZ5KhXQyT1
+  VOlTtamxpTfNKjdU3NzZL9SHJ7ngSbc/DQhWWgGQMcRlEQ+w9GC+FgwdizuGQQe9
+  B/5Z3V6qUcCwTZu2Tc5t0vsZUGfEVNawsVMV7Zps6+4ItjXLfrNTJeB5WBifEaEC
+  QCGbiiWYYs1cfg1Vky7JBZTcCWFp8pUE8pOroWw1Ox9ZiGxsHrHjtxEWlJiZHaQ2
+  PFEykuq4XcSJHdeNGnxS8kAlaz1k8PVglAgAiVthVnftG5GZ++ktbJuhW0H/DDna
+  f40Ag69sbp8ceFZBoNzOuZMKc2WEWOFjOjI=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
index bec829291..25c23ab98 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIUWWt6QkJVpu9wfxK/GfPc0kXcK1QwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDcwMFoX
-  DTIzMDMyMTIzNDcwMFowETEPMA0GA1UEAxMGYW5jaG9yMIIBIjANBgkqhkiG9w0B
-  AQEFAAOCAQ8AMIIBCgKCAQEAym2nicJXkPd0IdiJ39dA2iHWOTJutIhu226KVlka
-  Ovs1l2/zbP1mgkoSymhYTpYOsz1TRklZeCpVWB54yc++p0O0gXhbqGgMUr+ZXcXT
-  q5cSDDW1B2MoYzMakEK+wWzr2w1gvNFmLN3fVRrzqFQDcM3INaObk1Ac994OIAWF
-  gGNs5pwxhVYT9aE/iLkX9cKExFV3dIrOs6LXeKO/gszsrB5gurHr8HyQLC/O3Ue5
-  Pqj/qgjLFeBTE8fI03DltDzA6F9CVJvUL83urhtniKdhVkFHEiJfi041hOCdfu+0
-  j9OiRPJ7ME5XF55WPyT6ysEBNEcfsxuNaypca7J/RG04JQIDAQABo38wfTAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFJHoOk3HVSszJSWlYEp44kqDsB3JMB8GA1UdIwQY
-  MBaAFHR97VsRAhZFGwlSoF41l+vIAWIoMA0GCSqGSIb3DQEBCwUAA4IBAQCdT3iF
-  edHbxGUeLOGyVat2kAYlRSNfLdkFIA5a+Wz2giJcOcKeHgn9Uh2ug22ZTL4wWy4m
-  Tj6ErLcAi34c+e3BRx2qNm7MWaBl/qAXPn3MFfM1sfd4oGHED44QPjdeAJfcaToz
-  S9Rt2s7AZKTQW7cgAsNV33vzTRqKLllI39lQOUbWpl6B9ClZF2FY/hrHsd2xIg/W
-  dg6RSY9fFj2Jhf1AwMb31KzBJmL/yJfyX2WGGGk3ttiISYS98nxoO18mse477koQ
-  dYePAFeLzBUqlXI422eLHPEpwUz6UXvsJSFrxPsNOGjCzFwmCXyBPOzJWTk/GH2g
-  hjLJk96zstu59rmm
+  MIIDTTCCAjWgAwIBAgIUK5uOQFxPMPsiZnOf7kVeqUMiBpUwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDA1MzYwMFoXDTI0MDMwOTA1MzYwMFowETEPMA0GA1UEAxMG
+  YW5jaG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvy82FnB+kbzE
+  DiKGNUecHkfBdcJeiNG3aYLVyT5qRVc575w4irhEAIRdiFuYRgAbGJlmrZczIuj0
+  yRBt3MM2yghre0u7CECLCfNvfF7E9jruRpTfDPrMuo2YFS+f99+xhRIdIRhqc3QY
+  ZbxMFH8vM5GWYtU96Ls0xExQtH/jSIhoJs3cu9Z8S8F1p8vgOaFJacWPBybgKFLl
+  E8ebrDoZdp0id/Vg7snd2OGuq6h3cNTwL0mPJgz0q3O8uNaB0PFup7HsHIkWgkTV
+  BTAi9/+/OqIrVoEVaYdYFWw7ilrx3BtVFGoPmPFCnnje2sUYoX3aeqVO46hskjp2
+  s20pxfD0iwIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+  BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB3dxGtjvywb
+  KvrRV2QpdeCSbaULMB8GA1UdIwQYMBaAFNTsRGAcI4NEPxVLcfO6o6BWDwyCMA0G
+  CSqGSIb3DQEBCwUAA4IBAQCZyAXLmgQYFUW1hQ/v6ZFMzr7msLzTZ3ZZtytojM/i
+  DZsNfO5MIzhN6l3Ng3imtpYk5GVkvCDgVdsq9jBOx6q7qLNEHCtlEbJXcqeV2VF6
+  tX6lKN+qv4iUHlm/RYhbZ3Nez7Iv/3/0wiqC10S1sTYbtK3ADPjzfAqO5js1qYVW
+  d2M4dunLfyAX0M4v50U19i8k+ZZQWFmbbTZ6ImiE6iyYxeptE6fWvMEJvkm9dQ2N
+  eQZBqbduiRR4SCW0lyJeZlZchTR1YBJ4ykdYLjMsE41nL2JEtfXar+hR67tS0jkq
+  CXpsEZVfcC0T2kPVf7hyAt3A/CqeOOIho9RcOv1K6TvG
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
index 6c0137ff4..e06b118c6 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAyO0JXt7IkjvTIEmzmpLQRI0JvEbM/59zIlRz63VRKbRB9kfw
-  rnbb+JbjjVWI9hfJlWOxVI8cNYio0xwXAkufbLj5KDkPcslwM9iFfL4vtZRZEiUR
-  PK7q5BmNpmQ9hi+sY/8dHyaCRh0rmW2McM2UApBN9A31De+OpQLXxj990yM74IRi
-  OoH/L3xuLuTo89BoIlz71L1oQuwM9r0+wOiYJTNp06MG+1r6Fi8+M3/vYmOoqmg2
-  9GCvAUeFbjZ7UFiRk6vNnn5fuLy1iS0bIA3AhPzEOrMg+xHGMPRsOHshFsY8edIF
-  ELSAwTX0pDWa2T3I3BWXo46PFRJmhPmkGUHlFwIDAQABAoIBAGN+5YYCIiYv08OI
-  W5TuoI1hnfGKydbHWZclZOWzCYbySTuwsiFioFkANxx0v8bFTsBYRqbN2zUzQA6S
-  OV6cngyTqGXfo6O+1n4F+UwlTbDIDjdq/ZckMxLTCI7d0o2RK/e0i/Ix+o7HwSBP
-  3By74FBIryFsi+3js6pItxrns+IKDuwxyaeZDF/4nUDo4N32f0DV8UvuBdtqZT0J
-  eNgO9HbB6iYabthQ8nW9agD7ZI9Qhr0/515l9Aw4+MPmbLNE99OdQw4xMN1FlFsV
-  v0sXfJ92ZTlK+c/KkF6Wgz3Oad8roOw0xDSkCOKYZUPgPwQ6TM6UawPmsv12QTyN
-  sZR321ECgYEA4UDEqWMF87tH3fP7tu4oo0oZVpiFcgfH+Hfn18VH2FZD06uYJsac
-  wsiydyukLPHMOIBOGq1F8mlM2sy4bUY7ee941kJCwP7m2H1ObScwZC4doREr/pbt
-  mCIBlQQ3EMd0C9aH0pdXItxiQpoXC2lC2mJ3OCIbY5ZfU9NYz8pyhM8CgYEA5Fov
-  G0DmDmVoKsYvrezkGOBlQ7R1OWuc3Gv5kjr/GPLhSSZ/6lYs6CdVIfrjC0hwdB5H
-  u0/frFmnP13HCG7t2zRNax4ydhLeFAHLrnZkuASWm0vLD1e64pz6mqacJbjY4evn
-  hM8sDXuuYHrc/kvZYdfFoOvLcvZAzBI2qMNTPTkCgYEArKRtlr30s+gYnv7/MCe9
-  Mdn7LancrZdVJxUPtwrXk/IaLkPYa+/R+mDEmB30yRXSRoPgWQXxFGispQ4/VFF+
-  CGkInn9OlolH+SmhUHu21TGbN/XnWEvpcq6ts771TYDxaplUpI2mFWwAS7e6bd6R
-  hLvvUDCj+WIpUiAsc6Zgu3UCgYBAOuW5Ir4TGo78SRasM0/Nd4DEVIQMjKpoja57
-  ZUDPwbGAo+WjAm5LNpUJo8otKEkJQGMo2sStc+JJPpV3V8xrtgB4utuyvofc1Mx3
-  3DFkWVYLhHwvapvUlhcfXPHa4m2Ozo4mmydm+30HAkga9zbEAK9EHk7xnTaIsC7T
-  tW06cQKBgHF/J3kt8JQbHn46ueCXUwaxzp1q5sUNL5RT8/6V8sWUbaFfzt0cNw6a
-  KQueiOXvBrI4wo/os4/sSZ4CPmj96neMLeVzQd8MZ61T67InpTuUEt8xzIQ83Pgz
-  Oca6J/GhlcfukSBA+q2BXDLqe4donXGlIYL5eAPzntJK/e4f8I0h
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,26 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDtjCCAp6gAwIBAgIUbqzJhjqW869DtyAIqDEHeNU/xwswDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDcwMFoX
-  DTIzMDMyMTIzNDcwMFowIjEgMB4GA1UEAxMXa3ViZXJuZXRlcy1ldGNkLWdlbmVz
-  aXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDI7Qle3siSO9MgSbOa
-  ktBEjQm8Rsz/n3MiVHPrdVEptEH2R/Cudtv4luONVYj2F8mVY7FUjxw1iKjTHBcC
-  S59suPkoOQ9yyXAz2IV8vi+1lFkSJRE8rurkGY2mZD2GL6xj/x0fJoJGHSuZbYxw
-  zZQCkE30DfUN746lAtfGP33TIzvghGI6gf8vfG4u5Ojz0GgiXPvUvWhC7Az2vT7A
-  6JglM2nTowb7WvoWLz4zf+9iY6iqaDb0YK8BR4VuNntQWJGTq82efl+4vLWJLRsg
-  DcCE/MQ6syD7EcYw9Gw4eyEWxjx50gUQtIDBNfSkNZrZPcjcFZejjo8VEmaE+aQZ
-  QeUXAgMBAAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRkPAqt7QoFADAJ
-  gb0Qj+d+IguhWjAfBgNVHSMEGDAWgBR0fe1bEQIWRRsJUqBeNZfryAFiKDBpBgNV
-  HREEYjBgghJhaXJzbG9vcC1jb250cm9sLTGCCWxvY2FsaG9zdIIta3ViZXJuZXRl
-  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFkgVhwR/AAAB
-  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQCm0ZuQiwc0jEbcYZUH19w8t9myRxYb
-  QmWnWRfPvy83YhavnRp4nYrTuqecWrtHqtvIWMCk5DEqiCAySPp33pW81Oy6uRrO
-  wTXqWAjnYQpEUC5ZLFhLK8VYbY1j80R5zMNKF9b2xNCx+QjjUIzPZ4IAw/FTH6Ja
-  8yUOmZP2QwjFGmsrlqgAaLrkTjH6uC2axZewIbuO5idwh2JE3eQslB9ykP6+muVr
-  JVWLWszoWZ4o+/aj7ffxC7OSAFmhVsNIA2JmcumswI+Ys2v7KMgLsJ1JtcukiLQH
-  s3MLofvkdX1Sy4LoYZ2XYbEGJpVahppEpfeH0CF/rrS8pVh9ESRHj6Dt
+  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
+  lMTWJBJVhbV8Uo9zGBJQ
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_ca.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_ca.yaml
index 5abfeb4c5..9523751d4 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_ca.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_ca.yaml
@@ -1,35 +1,4 @@
 ---
-metadata:
-  layeringDefinition:
-    abstract: false
-    layer: site
-  name: kubernetes-etcd-peer
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIUXXT57KobXjoF5VYlHJlfkzVQIq0wDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  NzAwWhcNMjcwMzIwMjM0NzAwWjAfMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2Qt
-  cGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMLGw9AQnEKm7lQt
-  whCWM43wel7pLhZycS1ZNaPmWP+/+dSfkKZufYWo/nsLGoMWR20FU8644FIYmy09
-  9lBGMwathfMsd07MSHxAx8czHpHNLwIGL2Jz1erVpbfoIl2+hMCxD7B2I6cH+ND6
-  7YDuCwRSgWv5GDhiINL/52uiZq3gba8KkaV5sS6pNmbB3QQ/m9Efx4qKPRDYZG0q
-  u3C4RyPfXttFKC31kqKaWKZRqpzK10SdMmdkijShitt2IKLHP13G/khESZGnAmR6
-  LhGP/kRuV6034D+5vDemtf40QVFeeGDM5QF0wWepOOst7n1A0kh72w+HIsGbVmLy
-  hlX9xTMCAwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8C
-  AQIwHQYDVR0OBBYEFJzYjFg0zX+E295VKSdonteVT3EaMB8GA1UdIwQYMBaAFJzY
-  jFg0zX+E295VKSdonteVT3EaMA0GCSqGSIb3DQEBCwUAA4IBAQCoN98689lGnIOq
-  LWK6A0s8a8W7+Em8Ra024kuDZ7eRHEGcLWRU45L+L+Eyfw8gBuOuqKgAdiQ87YR9
-  nRr09lerWwD/mTCd8B4LF3NW+nLNje3m6T6UHzbZEIbDMKEQw7MU+vAuy8tovikq
-  Mo4Bv/aTLc5nqXo0oLCJQ1BFIdqOrsKCNwV/uMUDZR7wYN2qVaPAwq1livJIQS35
-  YbgGEQAo/uEAWlMKkMCnitzQoVI75Qoxw4CTAY5EjaqvujBouzNLpWEsYuzbnN75
-  Ogh/zUZd13zk4o9oXsgvtYvThWT70um9u5ICu1Nv4jAi8/87ldkGSqWq0ctHw7qR
-  yJGGE3pw
-  -----END CERTIFICATE-----
-schema: deckhand/CertificateAuthority/v1
-...
----
 metadata:
   layeringDefinition:
     abstract: false
@@ -39,31 +8,62 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEAwsbD0BCcQqbuVC3CEJYzjfB6XukuFnJxLVk1o+ZY/7/51J+Q
-  pm59haj+ewsagxZHbQVTzrjgUhibLT32UEYzBq2F8yx3TsxIfEDHxzMekc0vAgYv
-  YnPV6tWlt+giXb6EwLEPsHYjpwf40PrtgO4LBFKBa/kYOGIg0v/na6JmreBtrwqR
-  pXmxLqk2ZsHdBD+b0R/Hioo9ENhkbSq7cLhHI99e20UoLfWSoppYplGqnMrXRJ0y
-  Z2SKNKGK23Ygosc/Xcb+SERJkacCZHouEY/+RG5XrTfgP7m8N6a1/jRBUV54YMzl
-  AXTBZ6k46y3ufUDSSHvbD4ciwZtWYvKGVf3FMwIDAQABAoIBAQC+qcVacjgUQsY/
-  3r7+b5mt0v5m1AmKbaJ+SrpoY38xcyJC0aPOV5BF+6SIm9jrAy8N+E4OqQjlNDMK
-  uYHZGK6wVcIuxZNQrkYyY1NsmozNGrZuW9GcpVl81ICxIuopK+tVmL2L9kl2Iyac
-  o1VEhUCBjaYlJKRh5STOhzRpN4MdpkBUXHx5kxmFSsxlNnFxaLfFN8THqoUh9KIP
-  8Gbj9QCnuMXO5xOohKZ8cra150yVRz9U4oeCU90PL5h0CTPWi++mYq03CwT6wF40
-  aCdaodmqiCLyLw9k7+fny6g70yciQJV5eakvtmP6PmFPjMNbT8YkbdJDdkMctXpH
-  GD73p5/pAoGBAMZH39q9U+STyHfttpli23FqSYw8cM1w1OuJIFj1whky9RH2Iqjd
-  QTbvw2bncP6crf31SN08n/AL2TlRgHZ5LnN8M5EjIsK3cRdhxqRiIXXhmsZ7N9C+
-  VFMwl3bTZ0sdE81NEr+znVb61D/499l+bE3Qaxs+YjDPumLcNB85IGktAoGBAPt5
-  vkEh09SwJ11NE+enp9jcY8DbJyfyTkb+6x/FNmpaj5toneyMOJP92wGHh6ec1Km6
-  I33rEBJ8yXwzz5qsKmZIYoJGkOudzThxPVhobsRaaEgf7Ws33Nt6qjlhDKVJv9+I
-  C2WWwcC0TsBIKVdBuMIMieOP+FNR9nChBNOAhSPfAoGALP6yddjw6LYAj/aJsVUV
-  py8PcZtlnbk1GB4OESHz4fQGWQUZ6GgNHIJcPUXYBm9XrIG0/z96q+aEbNVp6Xim
-  ad6NdSocAUPPjhbKFROPtEh17wSXLe+DAz3LoVNn5Uu76qLK1mXUFqDk+X9t/xUJ
-  Tr81DwGhFqKNEVIXId681CECgYEAmNxW/sZuOkHdm8RHjjAGQjctV8SfV5PdayB3
-  kfdR7XIhCwmbvXc6yRKtNo/IsOUPDCC+hEMHoQVDgIEJ9+4hU806PBBi9SYV4fJL
-  pNrOQgLmkrj9m4f4c11r7bcFdc+Pl3Pd4aGzIs03dYAnyQeFJEd05ePUwej3kVz/
-  TwU3aScCgYEAgfqvd7GgL2Ywib8hJgTkJ+SHo2mI2VfPy2P0JptAnpyq+f/zDOQ6
-  yWaT62QdTSDEoGDSF9Js1UrdY2rYTZZ57YKmY4diNxd4Wg/0m6Cq2HhYwo3sH0X9
-  JUDLn/rrzMcni/VgjAFzDO0n67B5WQ/kmlRdWx/cF8TlrNw/oVmayD4=
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDXDCCAkSgAwIBAgIUaWcLsCcyv+2aXpMNj90afw+SA3QwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjgwMzA4MDUzNjAwWjA0MRMwEQYD
+  VQQKEwpLdWJlcm5ldGVzMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2QtcGVlcjCC
+  ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMOuFIlB/CUYdRTa/tsys8fb
+  Q2oks0uqPdQ2GNr3olajfb0w116GYekCbsG+i2sPoLIjOSYFOQi8y59aqUosEy1o
+  XdkzzX3Y1P4IZq2zLe0sU7f9ne7NI3b1v/ur/uQwC15nNzsWNolTZ0lZ6iPLVYwC
+  LXu1UTgHnhhY4rpH+VoM95ZsJV02n8w9sUVKWgdpB4QQex3cbQkoqmJcfoPqhsPS
+  x8BiewNMIc2tFfV5zdnB4+GJEWYQUanvLWiTQAjHuZ5x9NEamCZ1UZ786AvoQyvN
+  4inoZ7IiO2Qvz3XyEL8SeLz9EXAF0JASc/IZ4B+gH5FpqBb0ndDIZcRgZ+2IL9kC
+  AwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYD
+  VR0OBBYEFC6UQ+6fwe3nrFOxWfoHJhe21CDfMB8GA1UdIwQYMBaAFC6UQ+6fwe3n
+  rFOxWfoHJhe21CDfMA0GCSqGSIb3DQEBCwUAA4IBAQCwCnyItRa0SaGUq1aqbcyF
+  R2AsMG13R70HvccFUuFEmwCXEqHK+LyFjK/np+HNryjhRAMLcHyrrAMg59kM9FCJ
+  5jzIPP2MsjqHJK8oCr5t/l5DsZw+w2FlxzijNZpRM9IUaGtU0YbK38cefCJDFMUt
+  zIvYAt2qaljVwWdK9TNyEGGbqO3vB5WHDYmZQeJdrZDdvtlsuq3+AfC96mmh7475
+  sW4QRG6cssweq/oz3Fr/lpzK//RJyskDwN3h+6XBVIUVR/dLdCSOMOgxf0TYhziU
+  E1RjI5zBx2e4rDvp3nszaCJkFEqrJgaGJbvf8Y5tklXhaIuqCJOCQFPLZ2+39N0Q
+  -----END CERTIFICATE-----
+schema: deckhand/CertificateAuthority/v1
+...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_1_peer_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_1_peer_certificate.yaml
index 466f63cb4..dd9defb5c 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_1_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_1_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUd7oZhDf7SSDAWNHdIgKNYdnjsqAwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  NzAwWhcNMjMwMzIxMjM0NzAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
-  YWlyc2xvb3AtY29udHJvbC0xLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-  ggEKAoIBAQDQS4bwNlFXANILpdhQ41mRPA8tDxD2RknysFot8k98mDJjaEPowmZS
-  9YX3Pyl2DRipC/1hDx0tblQYknP8pJkec2c2CESZe0L+uyQM3ZJm10xb1mn++3zh
-  nNx0XOu3fNBYnevxLCwIPc+MuTFrt10/eRXSOm9lQHey3QVBOak2D9PUpxTgxdx3
-  HqBis2zZas4YKjStAbKTo++xp2V5xEA/eDxbFACSNrl5o9x5Bd7xQRulfJMHCWEx
-  QSKvOvx+raXSTcRR3kJbCHvH4TwnHGL4QTXMtdy2qVyQi2Bb82FNvoLH/QVBsSN8
-  +Vs1u5E8NK+oEMSf4uVw632vWGN/YIFRAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBTHc/Qt6wa/UVBuyAmhJxuEOW4fMzAfBgNVHSMEGDAWgBSc2IxY
-  NM1/hNveVSknaJ7XlU9xGjBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTGC
-  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
-  dGVyLmxvY2FshwQKFkgVhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQBV
-  Tes3oKXsK1Lr8dd94jdi58YKzLINKyPQbN8eqN7zoYwmxSUgtw+fcTrrLe/KrV5l
-  YPoHxZJ1UvcWbuqvWk6GbYYlah+c0IrwxvqKIZs5fCsnR+P8Hex5/Sdz4pSW0kdE
-  UQVJTo9uLQ+DxlDVAvK/xB2ZxPdj2qFbj0FqXikNvqR039qExiP6XgVEihNHAtPW
-  dDi0A86WMszdo0T7sPhufOCyyJ9B2E+wMQS6fcp+gNrBOZgCrHd1APEbo7xgBcWU
-  4Xsl24nIHdeT0k7qxhW7MYsNLNfNubW5vIpVcMaWwdMh9wG1v5UJX1RJYd2ZpXGN
-  zHu0eTBh3mjlcx5ta0kd
+  MIID4DCCAsigAwIBAgIUZEhPJI3jZLE/f8JnCYIkUEB89w0wDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
+  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0xLXBlZXIwggEi
+  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDnM+DpsQmw0Hun8q0CPBGx60CX
+  q+dlDg2jIJnwPsELYzY3KpAdNbFvDEV+kq1lm4RTgNsAmqHm2h0QlacpD06oBPfH
+  eketuHS4O6wyUIDiyPWs2/kcDH1OKikbEVnOu4rgxUPIoHkmZqBHw7xSYEubLGbX
+  B6+qErD2KHuZnsrcpmgtvGP6eozalcTOVtZk0Ac9/jCrsGqkCqSwFYcfxJlpeMjd
+  A2UT/vhtTWhSvoge9OcZK4ojhL7sXVPUrdaVyGNbWYbSGJsY0L2EaqXZiQGRsF0k
+  zgIC6R5Q71B5roczedBEc6k9p7w46/wWCgo8mOqc1DwRwnXY0Qy1gfDYli4ZAgMB
+  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ5JSje8gJ/dg705s1bWlel
+  gPLo1DAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
+  ghJhaXJzbG9vcC1jb250cm9sLTGCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
+  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFkgVhwR/AAABhwQKYAAC
+  MA0GCSqGSIb3DQEBCwUAA4IBAQC/mfAKIXQMBN+AdqekzbpRhjg2xW9V8bF9qzHM
+  SY2LLl4T3GntMLGQgoOvyEv40JPRgVzt9aw9+g1RB9uW6aqMgDkfWKLfUUGvJ+0Z
+  wXkToimPyTyFpQNvxrr+Z1NF4jpczI9sMVUL6SMvy8/bSBMzM3/vGPIWw0BotT3k
+  GlDZHXjKfS+W/cFfec06+ejCnZ928hWeWBuaQ5Fe405trhAlV0bSRgE8ana7Fptz
+  zjx/9BjkF4VnWKkyNrrog+/ZwI8Sw2Ie0PZgps1dPTdLnAC7ewjiHw39b01fIORB
+  PGwAuY+3uh8qFHau4Mz+iSSYK8Nmw3M35w6aI3W79YJz8+/U
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_2_peer_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_2_peer_certificate.yaml
index 79938373b..dec9a2674 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_2_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_2_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUSSZu745sgKPXXYtee0CUP8x2P8YwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  NzAwWhcNMjMwMzIxMjM0NzAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
-  YWlyc2xvb3AtY29udHJvbC0yLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-  ggEKAoIBAQDB5I8pv+Kg+Fj7+mUPWOb+8qh2o6jPOBGol33OmlXmWs1WD7pcMfjg
-  H0wVRCKipc7ZAbBsjS5OvQCFSQOyr/bp2c25LDpnhMU7jMYzH+GPf+fv5ElFRjdZ
-  v7slhaCe6hHJyBWjblyZSZCvj5ykD9iqMuHOuWF4EKwRLwt8hGyxeFO+D/52tMIE
-  OlVWG8K5+2kx6yruqH81kp4mYm/wsBqpSpkj2JrM79g78sViCwbxhA+7yAmnONoW
-  poc4XfknB8uTNjyYxgGgKYSHsQZcf7dZy+YqKPAlSQ4v15AvRa8bg/lJgOp+2qYW
-  sxK/niq6pw/yv+UFHBvqFcwKgyKGG5JnAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBRqSkZmwFFCrdWj0Q0OzljeQeIvfzAfBgNVHSMEGDAWgBSc2IxY
-  NM1/hNveVSknaJ7XlU9xGjBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTKC
-  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
-  dGVyLmxvY2FshwQKFxYMhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQBJ
-  aQR0W7bMHHFCiX4O6x1gIJquvh7YsNHiOAwBIaqydkflHWtj+CZZ1pjQeh3zmrYJ
-  FvTe/PGPfV6qsJEyGo0wSbyPBXEUvAAMFj1QrXvFzpHSZoGKjac7v/3wh8/yJl/J
-  z+AxcC/WBoEXlUYlLVnNkA9fDj2+uiU7xIMshz78qsIiAxD7Z/BMLb7aEyetjahM
-  Av78d7sFTMsLn3OsL2xVyWd6lQ2+FyZNkcR2C106NPKdwjfwlW1UNAzFBcJ91zn5
-  1DJawcrSoex2SAfSseqbjlolmRpPTfDSkagr7pxVuv1j+KqMbFCNifHpZQJbk97d
-  W4LgwDpkB8AmbRvmrmOJ
+  MIID4DCCAsigAwIBAgIUba8aZKAT3xA+tUOoZM0W1g1v1dQwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
+  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0yLXBlZXIwggEi
+  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5JZggoUWDGXdfoxtOu2glLsAi
+  Fd718gl+oNHe566cNBDDWh7lsHS/8UWMKm0R+Jz5k9dYMDrF5P6BXe2UMAX/1NGu
+  Pngua2sRMl7cYdgAcXcKvYPw9ac6Jqm4jnBTiR54nmF6c4Lx3Fej+w/KyMwkVX76
+  XQNd7Jfb6OU+3kRJNjTd5RsPcwIxrr5is5j+tdzSqaF7wB9O0V3wnlE7cSsnlqsa
+  J42cfm1e+OULtMqHtckU158gDPjfWMH5T16NE8ZdST/svggmfAYh7Sbvla32gkVR
+  0KZfY0H2/NiGv+dbVEf8woE2/zxAgFkM46KG3Vy7UNMN9QgGbmUEVMnKVy7PAgMB
+  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQC7+1IwubB7hI0a/PzAyao
+  2E4jtTAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
+  ghJhaXJzbG9vcC1jb250cm9sLTKCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
+  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFxYMhwR/AAABhwQKYAAC
+  MA0GCSqGSIb3DQEBCwUAA4IBAQB2lyVW9VC1RGj63sNYs3FdL+ybZ7Wx3AbcoP8V
+  jWipaI/lJaJFR/3PdQmzQR3C7vYiVwxiB6XP077sEj1RFAuZyH3AZe1WQwAJSbv3
+  PCDyHpVBBWoREQTXHxb/fHK+p0IORwvNj6xBf9urxwB1Uq6kFsRRBMLPkoMc4YK2
+  lQ6bXm46/qeLw+oU+TwEXHFExw8U1VBYgngGp4DXyTURi/JHoStTQLV39eQHikJR
+  pF4qqXdUOSuu4abUstd9hG/1N9zvCUdJoKv8Sa/uKo2RIG6ahj1kwPUoY77gsQ/q
+  Ahsw/IXyx+GmnI3vFCD2pjKIp4Q1yPC1I6QT53unJG9c/GAi
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_3_peer_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_3_peer_certificate.yaml
index dd846f05d..aa2d7a7cf 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_3_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_airsloop_control_3_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEA0o/h0rkNbtKQsaJqDxTJfbAYtCsm1MYvYuMFudQbco67/goE
+  VLmcGPjFaJ5NixhQ9M112PXXvrcXO9B9DZIrXix+tbzaskVu2D51q5TIE3basWKg
+  Mr1XF02nPyNyaFzjC86QrI9o4ueTCWEEovn9CbN98lS34XFmGh37h89hVOQS0wfl
+  eTtD/yupYdu5B15nxYoG+hScwLKqSpiIOpj/8Fe7kW2ApIFcco+wMkqbkTlwyzyp
+  BtWcxYkZ5J8MvYYeqhHm17WDa8DSC2ZMZSB5jqeZtAao/frxKkoExknvgEMiNV38
+  HbX3IxTwFy6XOsBUCxYd8s+k7Ud6QQdHOPCkiQIDAQABAoIBACWOJh/4g43Vnpsg
+  Nbx03688Plu8KpPeuUrw5O+NBkw7awpXbQhThqTpkgQj3/7EGoRfNPq6dn18mHdB
+  q1xFStjkJMFzaqpLOgb1tPUid0EJfN4QkjQakzMD1aWsQ9abYp+Tezhb58A4v3/3
+  vuT2o4wcaIVVWOqr2CMmX9uMQHbsV9AbAucaa1qLMuiDOLSg1DAtPtgOQXuik+wt
+  h6O3xJjt2StmPf/Wd7EYjr/LW1Nj56A2q+XEtNII6KoicLrGxC8vLsdEcytwJNtc
+  So3TzuGa8Xr7H9ZZMbFgrtfU+odlHDt5MRDE9F8SBYk+Lbdw0fdrgeLeHxJsIHIZ
+  SoGJYwECgYEA/WERytZdejiaihGDwTpLUS+9+6wf0fNw2TUmzTROid/9NP7qk30S
+  BAID6Cur/xLlpgFWXQTH42M6AbNGO79NWG/c7OM/YpG35g/DvYL/TryBQdr9ki5z
+  qQa30s2wKK4yHEtrPwh3ptrmmI7MziMZu+UpZR5il9gSymIAqmWuTakCgYEA1L1v
+  kQIbQQyHPC+C45b9TQJDS1YUS7wmsPBEumfqkm6mNpASR/m3rDLHqXHHTPRvGi1N
+  KcRpQdUenMexzYcoTkFRE3tHUQOpYivV8Il3dpxooqm89ydI6DNJp4vByCBex5Iu
+  j2YDfA+2OVNYGy93m6AIrsp7mDq9WglYHVf7K+ECgYB/G+weEm3we2bjbqfnDoRs
+  JQQstgt8eqCZBnYBqYTg29IdfOhWtv6LrishlI8DNgqovbEClvxj0Qpvgezw2iZG
+  AFAXMmVA4JMdwbjTYF0NtbkuPVrJs63oFGuxP+hocALJePhDNc84kEXwMGsD2k31
+  mZ+rj5OsUwQSLRniYYIQiQKBgDOcHWPFag0219v+/rbt21eCVAcDw/q3k39bWqEK
+  MrsBgus7umOhrjBlRVDTHHGL3yQvl0epsYtaA4ovW/AreNi7OcsLHjsGM2Jwlf87
+  qjKpMS09Fm2zJxnFz3mJCyLcz4GE8iyxp+jB+wgfMwGtW0vy4AhfcOp2XZdpKuo7
+  fOChAoGBANh8kUC47oiVByQqGSFa9Wl48I7IATND2gAmVCC82du3kpRf/3cGcDfn
+  C24ZsRr8C0vZwxMwLzM/yJqMl3zVv9RtTruD3nldx8de8aNt84p+pzljTXLg8ViM
+  6uxK8+/xd/EPQ8fjYmW9MxryJLtvB/a5e8IwmT5qpMSbJQ7H63ar
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDyzCCArOgAwIBAgIUXFlBziu04l0L2namtQbYbzuAABowDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  NzAwWhcNMjMwMzIxMjM0NzAwWjAyMTAwLgYDVQQDEydrdWJlcm5ldGVzLWV0Y2Qt
-  YWlyc2xvb3AtY29udHJvbC0zLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-  ggEKAoIBAQDMNbeclC2Zj5HRPjGLiQdM4BXLr8siHhYzXGPM8LXVrZo+gQdltqCN
-  UgkYk0c1XN9ehkD4lF/2Nx7UP/4MEo5w1DlkQx+dDXDxyDQgqb4JbItzVCmegX70
-  2bCx848d7GZAxOPxIUq90oJH+ClBuM9mUTNSMCIZ0VGtu8ayTC0Lq0xXGpe4ZIDs
-  K1ZUdNJLK7ECFEMRZVlEnn+ZffivQeODMAsosx1B9gPaUk35gbXjdrmUNbrtofc0
-  Xu1JcF+Tzulqo61g4tfclVxsnn69dw5cjf6UyjIVEB/xOKJ58yTQgy6kVhUL3iyR
-  BlnyQJJ8jPrx21c8ge9u7u2Pkop/f61ZAgMBAAGjgeswgegwDgYDVR0PAQH/BAQD
-  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-  MB0GA1UdDgQWBBScenhVxBTM37eSLYt3ox5z+L5NFjAfBgNVHSMEGDAWgBSc2IxY
-  NM1/hNveVSknaJ7XlU9xGjBpBgNVHREEYjBgghJhaXJzbG9vcC1jb250cm9sLTOC
-  CWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVz
-  dGVyLmxvY2FshwQKFxYNhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQC8
-  fG/aET5LhKLYaW5gPliFoQMvLLMnx3ENPUXdORL60EEdaoeUU5Hr7xsTRENJ5lEL
-  7nal5NIacvkbaceGcw8z6WxQ4AD2lMCbbGXrsC9K/Pm2N/7gUwefdDfR57xcqWLm
-  q6KGdxrSGKQ8EJsJqYTF6Dxr0y8RCKMZLyq2McfF/Ztr5Z36a5FqJiF7VwbGimb4
-  /z+6YOjF9QegjusoOHjFQva3IbiMvoCsXZFOIg0yn/PetYF6X1KBGSyG54Pg0v6/
-  XGZ1GNEOx1ezHvf1HvGrB0Fb0VZOYm46UrMGV47noRonui/+BsQMPAkeYinH5Xkb
-  l66LshereDYTPsn/ra5w
+  MIID4DCCAsigAwIBAgIUZ05nUjPSCkae1zvCIMFNI93bpQIwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAyMTAwLgYD
+  VQQDEydrdWJlcm5ldGVzLWV0Y2QtYWlyc2xvb3AtY29udHJvbC0zLXBlZXIwggEi
+  MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSj+HSuQ1u0pCxomoPFMl9sBi0
+  KybUxi9i4wW51Btyjrv+CgRUuZwY+MVonk2LGFD0zXXY9de+txc70H0NkiteLH61
+  vNqyRW7YPnWrlMgTdtqxYqAyvVcXTac/I3JoXOMLzpCsj2ji55MJYQSi+f0Js33y
+  VLfhcWYaHfuHz2FU5BLTB+V5O0P/K6lh27kHXmfFigb6FJzAsqpKmIg6mP/wV7uR
+  bYCkgVxyj7AySpuROXDLPKkG1ZzFiRnknwy9hh6qEebXtYNrwNILZkxlIHmOp5m0
+  Bqj9+vEqSgTGSe+AQyI1XfwdtfcjFPAXLpc6wFQLFh3yz6TtR3pBB0c48KSJAgMB
+  AAGjgeswgegwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+  BgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRn3KM2W7BmAmwq62W5BlTM
+  lkbLJDAfBgNVHSMEGDAWgBQulEPun8Ht56xTsVn6ByYXttQg3zBpBgNVHREEYjBg
+  ghJhaXJzbG9vcC1jb250cm9sLTOCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
+  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwQKFxYNhwR/AAABhwQKYAAC
+  MA0GCSqGSIb3DQEBCwUAA4IBAQA/8ZebXM7Yk9syHZkeII33lSb7JzsCKOecm6RM
+  s35Z/YcVNniqkAUUQIxafud8cRqDm3ex/Lb3QYnlJoVFV5peURlJ2Yc2t/3Hmi7o
+  HMBdMC2Me89EWcGvQUdvySro2sXXazqB6wQtjc3e/GsppWOmS86jOeZmUdtT/Dvh
+  fPI8wg1AzvUhix23apWCYD4pxStIwNZnvVzPKMAN2aFKpQAew/6ZZT8NzJqA5U8V
+  k0PFY+0UvZPGtDEMXaJ7YF28qzSP7Y8U8w9OUFD6jMexX114iOMDX0O0p6BW2Ge9
+  IXEnvZ1umITw2SF3IJABS/7jYzNtEyXoc+NrJ4hsvJXNM1SC
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
index 02852512a..ae1c57f45 100644
--- a/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,27 +46,27 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDwDCCAqigAwIBAgIUbURQKoncbUJivyCSuDpzPqdg/k8wDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  NzAwWhcNMjMwMzIxMjM0NzAwWjAnMSUwIwYDVQQDExxrdWJlcm5ldGVzLWV0Y2Qt
-  Z2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnDqD
-  K6bGIv7dPFJPUedQnYWjyWCoc2BMpQvj+DyfM1kmKTxzMB+V2YxAl3XeOezEeWRI
-  02aXDwZX8t0dnQNInk0qIH76FViF/DBHuMczAFajTKbi/7MoStWdFjWwjioOa2CL
-  +CUNNhgND/Zl8pktLGv1OPqTZq2VBon5uZ+EctAu+dm9GUS3k96fMmRetqhtQk4m
-  LoJ5zGH77jMjdik66KYi3g+sxVlbGcEL0gEOe7vLTJmP6ZXilKLazE3tFIBpRWWn
-  kees4ZbKlywiw05p7Km4yoEkvQqaRZpW/Mb8QPCyjGweQND7du5aomVi9Xytei28
-  q1bsbRpBZQd+jnVW4wIDAQABo4HrMIHoMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
-  plAm4iF/WfyO64CN15+nHjRx8qIwHwYDVR0jBBgwFoAUnNiMWDTNf4Tb3lUpJ2ie
-  15VPcRowaQYDVR0RBGIwYIISYWlyc2xvb3AtY29udHJvbC0xgglsb2NhbGhvc3SC
-  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
-  ChZIFYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAQDmyHQmbMG5VvwG3
-  qlOK4S/j6BIxwW2AwWlh4OilBtwx6W/vOkLkhRJ2DlPhfSwRpnNGylNf2RkW1Kqm
-  Nd46EAD6L+SqBzmlRC0D+cDD74EVTFPtu7/RtqD4JyVTxNzwG8N0eQt9XWCX5/W9
-  HvhR9b8dzGhhDOK3vM0VPZrRMkiwYni1rDYc7ZqxA+t7EZKQ8DxvS0L91r8fru2z
-  F4YHtogzBqWJLm5LtbRMTswYgPHKVIbEAX69uZw9CbFRdAxzshy4guE+cmi+wpg5
-  RKBfzp7qUxxdb4CLG1AzKY7+3CGDam0a6IQkTLM+nOEBuZF0aTcQRtSo+pOrkp1D
-  qlKpuA==
+  MIID1TCCAr2gAwIBAgIUXgv8+s+CissBpqgkDkVZdRfMvOMwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMDUzNjAwWhcNMjQwMzA5MDUzNjAwWjAnMSUwIwYD
+  VQQDExxrdWJlcm5ldGVzLWV0Y2QtZ2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0B
+  AQEFAAOCAQ8AMIIBCgKCAQEAuKoyzX17CGMaRNCXtaYln9SjkcdKW+u6SDiXgQmu
+  4G4yUeBG++vrveln5j3hhpmmekw5trjqn81S/xY3N6YIPqcW56NzQXeUDewwicKS
+  t7MbYjqY1wxitHHGcMgVUYyd700M6elEbfPZ7Y1+vqfDEP9P6xgijVw6vjO5i7wU
+  4ElNEKfZr2Mx5baRYgTrvmXmKpsop6i7TT6d8cuK5rdi+r+k4cLZFHnfmpMpAkua
+  hYWRSSvH2hKeY6jUfd17XWmjDimxQp01ujz/R7fGqDsMQpi3KT/2vR0Djr96f7qw
+  iZcG249QY1YSsqdT9EPTFlj4wyN+CYk9Gmv22jHxmBCgiwIDAQABo4HrMIHoMA4G
+  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
+  VR0TAQH/BAIwADAdBgNVHQ4EFgQU+FW0mvuR7Oid76A/DDSp0hqGnLIwHwYDVR0j
+  BBgwFoAULpRD7p/B7eesU7FZ+gcmF7bUIN8waQYDVR0RBGIwYIISYWlyc2xvb3At
+  Y29udHJvbC0xgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3Rl
+  bS5zdmMuY2x1c3Rlci5sb2NhbIcEChZIFYcEfwAAAYcECmAAAjANBgkqhkiG9w0B
+  AQsFAAOCAQEAKyxHF+ctXmJuIEJJl1RlmCYLkH9We9A/WXsd7Xpandz2+hfojg5t
+  an6uPV8ITyEQlo64WEmshHhKTpxMxmf9pDIatQVt5rKjBM/JPiSdNI2DyZuBwKQi
+  S6ts+G0yjzLrRv+adowwa4MUO3xO1lVJcgwlvN3q+Kh2Qca9ExjO/PoKoQdmGkuj
+  UAbzJeRZAQtJ+u/0ES7d3hOAQ6SQi41Y6NTqTJBwq4ZrTULvLXW6p0QBtfwRwM7D
+  gpFvMIacKGadJaMp/8PxPgqq8G/9vQVMWVZxu8vy2kT3VXrpgXn+1tEsFwzoNJar
+  PsaCsTYb7SWYz0LbDvE+iZfekIQOZz0wgA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_compute_1_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_compute_1_certificate.yaml
index 12d6e90f2..aa7a1aaef 100644
--- a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_compute_1_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_compute_1_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  1DbzYntEeDpfR8j4U2LwoPaP
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_1_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_1_certificate.yaml
index 434d67e30..c0603026d 100644
--- a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_1_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_1_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  uUkpoIfrCbXxj+3t5il2BsyG
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_2_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_2_certificate.yaml
index 7402d8b54..f83060b16 100644
--- a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_2_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_2_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAsU7+PGhoeIxhD14JmcYIuqcgT/jzSdhFbo2JxA1TtmxnqV8h
-  GnBYKgPzqIZpab6v9kxrKvY7ofSRuvUnaRC7B0bAoItmg25RGeRfvx4FK1EFCHFf
-  YvjDAGhlUrIkV4djtHPX4vrDXsTFnjtN1nyUuv4RKaxPl79v8GQQftgMq4aeBq3Y
-  /Tz9OW6uiG3aPKa7st2ulUydzOyIZ4JyTYjQo5VMNO64tBmp3B6bUpvTserqKesH
-  gt22/iZN5TZ4AnkaOj7vxztl3M22/khNG7R7XcqZhesjM0CZhNNnFe/1dLMI8gmW
-  EyIE7Nq6YeR+A+ZDQ3XBJDRbVoQ6hsWXXsX49QIDAQABAoIBAEAQyswI7bahAnEL
-  CW0GoSDQQlyjF0UXX/8SJTUxm43OnaYVOWDUNwb3ZpL9/hi3Td0wv4hGcEWUmRN0
-  gUj1Qp7ecbuQovnaYnN4kR/9OODt5WOnk0+vksYS8olu1LLLuLr7IIZjFTSo5L7H
-  rthRK2xlYM4t9JRgF5JElbE/X1SaNXV//Zik0O8ilEPXdLBs7So36AmOd82CahWc
-  pYhv/Z3kblc6tUyN6mZlaisl1W0Qd4lSL9QF8usNfwpZwX6zP8gH70gokSEnUs1y
-  oNPiJSCbHsnTTDkunQyoeWgeHgAcbt0QUangk45MXEGsJouef5ydYqqIgGK/umt3
-  3YflJgECgYEA28xSGzkSS0OFJjXdGCNR3Y6wJjwEY6TwZ8RDikGX6x6ee+GNWWz/
-  gVbT8VXgdPWGdC8P4n9YfNBhLkS8JV7rEdOCki/Emw0DKoGMcVH7ZxEj2zvmCaiI
-  ynezylk8yT6W42ADD48LX66SgtQ2AOfEc3Dz42E8m4N+U2yd+KQKIxsCgYEAzoMe
-  /omtA2Ndu8yOw2XEomNuX4Ll9r1+/GZJVlkzQLLz6fj9mrOxx8g79IhSMkAiVd/E
-  Yt717juadowlF5BNtAqheckFvY+G36K6qpff5prVG0uN2yL9cxSssVCCrJOTVhK5
-  6YTt2gMgUbGRr7T8VAbHEC8gzICvyvWh/NROBS8CgYAaYK3l2HaKk8LR8Brlf6+e
-  cDZRkFhSgQPc4B/e4rpRnC4W3d2xwrPzGLF8v/qc7q5BGTjFzNSYvgU7oUIXFgoN
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  On4KwHEy4MYY4HsQ5BNSv1XO
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_3_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_3_certificate.yaml
index a283e78d7..8744a671f 100644
--- a/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_3_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_kubelet_airsloop_control_3_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  NZWCsdNl0N3rJjNs74sAfuFN
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
index 121f99a2c..f63c5723e 100644
--- a/site/airsloop/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,25 +46,26 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  iGeyxCDUxgz7MXePy8nJ2XWl
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/airsloop/secrets/certificates/kubernetes_scheduler_certificate.yaml b/site/airsloop/secrets/certificates/kubernetes_scheduler_certificate.yaml
index 9f9ff1eee..518ead624 100644
--- a/site/airsloop/secrets/certificates/kubernetes_scheduler_certificate.yaml
+++ b/site/airsloop/secrets/certificates/kubernetes_scheduler_certificate.yaml
@@ -8,31 +8,31 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
@@ -46,24 +46,24 @@ metadata:
   storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDQjCCAiqgAwIBAgIUU2xVlkOPKaECSiqCtHhxHliITo0wDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ3MDBaFw0yMzAz
-  MjEyMzQ3MDBaMCAxHjAcBgNVBAMTFXN5c3RlbTprdWJlLXNjaGVkdWxlcjCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKIGA4IIq5QOcHZJMTg4pq8pNR8Y
-  XMCDpob5QU3D+HsmtpxvO84JqWyukPU0bfuWU1WA0jU3GXX8PE7YMD+fG/+yPTVE
-  rktJ4rpCToyrhxVPBrhDzqlGpcvFusF105nSaaA8twNV0vaMpVOnpTxanzR8cxqc
-  w5nvSML54sSFRln38STAF3CkgG1+AQLK+RwR17OBqP6TsogB8PeDULyU4rOiYA9h
-  FQjh7/SFuSFGIBs7kzdc7OGlFxYGRzDnYh+6u+dZRxbydv8F9yAU7ic70byMcQi+
-  TYTLPlYyjh+lWTZHGxuJAcbHtbpqD5uC0f3dJC9LKmN+03zhoxdj7VAzBe8CAwEA
-  AaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-  BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTwT1mAyekvtSzXfFycbjV6M04a
-  nTAfBgNVHSMEGDAWgBQoTs70DmWkaWuYeNxFBgQ9BAnfRTANBgkqhkiG9w0BAQsF
-  AAOCAQEAg6zIvCeXAt3xqJ4xwZlqmzvmvpdS+rjzIJELuzu9oyajG/Q8adItQMHW
-  b1cDE2QV23jaV6XdepjuV+/GUEp+g0z9oZUbMmJp0EX6K1LeyUdh34vZEAg0bauO
-  +K3t5qZL5+aBsHraK1xqoZTQx1UX+mLX1oWhuX/CMHdbQIqrkM7q54T0c2ZSTa4X
-  6lxXO2Zz0j8CQ1nf6XvStXnIJmm/S1rSbjor8cr3asO3Y+Xle5ipDKaeKLGum8Ma
-  R9GjHpfKwGftMNKMM64b5B4V2bS8+1ufL9PCzXzr+0aE3NibP/PjUGMKf6ssoeSB
-  gMJfyHSKGhkSReQ9wp+FFT4cJ+LeIA==
+  MIIDVzCCAj+gAwIBAgIUHf9PDR4wwjZ3MMLiV1M57e+kUAcwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAwNTM2MDBaFw0yNDAzMDkwNTM2MDBaMCAxHjAcBgNVBAMTFXN5c3Rl
+  bTprdWJlLXNjaGVkdWxlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+  AMRQVCBpiTfOD+CumFA8fM/aNmTE7xzh+vNXTm4hclkpcVAuewpjyq38s18rvcTS
+  WauJYdx9YRcQ7yqhxHdp4jTkOLv0QDqkQGipFXszTNcY6xCdejBcGef3Jia6t8im
+  moXLo8nfnsoN87s80eYSFJJdrI/HW1oC2vL6liXKV3vmo2qw8rHG85Ooo6Gri+Y0
+  xnOv1JnbhKfcIJUT26V/jiCcFlOTUp0GbOYWQD/WYhHsIBP4Pkxyi0BwperAtDCB
+  p1dD1294XFbc9XO1rqdm6LMINP065UfzXHzDEzqnMAopiPA1zfPrKTCRSji0UjGE
+  bzp3rqXdHTz+mvUH64LgY7MCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+  JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
+  BBRNtAWJiI9VwvzHmR8YhVAiKkDUGTAfBgNVHSMEGDAWgBRzeXblY16yoPqFZyya
+  MBlcLdGBKjANBgkqhkiG9w0BAQsFAAOCAQEATo5SWCjE91hGFq4XySJUHFZi80Bi
+  L9uR76VZHPUqsQNE+hEK47/0nrN7OLcT6WYixaTyOJlUZQT3di1I/LVpXd8P9X+L
+  kInPnycXMunbDxMhJrUjY45ZUADZ0laXYgwmVdbJDoekL6sWOe/shjECVzAeaKqv
+  1oQrsHlcV0jRjaIOLcwUPyXEmP5EClddmkT2q48c74dnGZo65GH063j9VtHIqUVl
+  5MSRND9LNV2F/YgPy7OAT3FMR9NGHgmz0lUIPg0JQfq2VowhiJpQjR5I01NrtYFW
+  MWK7+Z8Qbr9Sa3TGHJU2sCGpMROn3+OFAIJFZBZ1vcEFJI3FKTkE8qbF5g==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_ca.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_ca.yaml
index d8fcf9834..8b20192b1 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_ca.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
index 3fbaf07a1..1700ba43a 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-anchor
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-anchor
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDNDCCAhygAwIBAgIUCGPNxg0GLQsqop9+06bwFzNAyxcwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjARMQ8wDQYDVQQDEwZhbmNob3IwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQC44/tVmRrnjcLMMXl41O3SUPReYOLWOkeP1CqK14nAlUje
-  HHC8NLSnluCS4vlM9/WH6MBPTSh6n+HnvZ7p/H9DefjbPhhV93Xg6MKAjyNVKNsX
-  mT/MUqxF7dSc+THes0T5PeZrymZVSg/U9cwkcU9RsU13yhIG/46pNgQDoew5LPh3
-  /Q7MWoyHxVAF5WFurEYTEoTLPkXEmIkFOtYxA3wyh8CAUVD0Ri/34nrVXJFmHHBi
-  sJWKg3r+cZAO7Gg5t2x7/D+MJzdmI5X3Fr8+TSxn0exI5vmx5T9Cz/H2pLFCvJeD
-  Oj9DRcOGs0WSt69xH2+NeAEh/aKg31tW4Nt/dJINAgMBAAGjfzB9MA4GA1UdDwEB
-  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
-  BAIwADAdBgNVHQ4EFgQUE6YsOcr4EeTPvJClUuA+nJRircUwHwYDVR0jBBgwFoAU
-  kHGuhhbM5XQ/WvRB7o0IY2qvrpswDQYJKoZIhvcNAQELBQADggEBALnhPD1cb/un
-  I+YMU3x7nKiPHEqvPP2woRfYKVkXWcMg+z3dSaki1pwv28C7dFhjCbkEK4J4Dknt
-  qjjsSa9aGkdux1tpN1W+/kyce3jhU7PcrHWc6DiuEyK3j+RcX4rIFlLWK8vzB7lh
-  /7bIeWrR/Vd3r1RVMA2ItdsL31BcWEpHnNXaBc8owm3XslCYB5ChjH1XXL/93Y+r
-  BTO84JrCmoPulJDTSj7CoUXoBh2XYcd0I+sXyzCWhLMDLPf1ZbboSO4fJmGf7KJH
-  lVHNIHLg/hRVD0M0R1Qnrd5/ytoSFcw2wh34tvhz6FRasaXWPIWtEve2XliOXd3c
-  vrSWczJU248=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-anchor
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEA0md1xujf4V186P9HW3BO74NNGorJy3V1icrpQUTizs6OzIH2
+  D6rluX81yY/zd+6BTm0qXmkZea3H/6SP8q5M4fVFb7oMR7lyKrzWEMTKbQS9G6Oz
+  5zgg1r/4QJbLJVw8rxzGZI54EF60qDetI2+w2Ih8AExvDSjgEymoZ696Lz2zOAzO
+  1+KWGjoZIjdHMBPdg1XHQltdb/rvk1MWV/12aqz94jHLP1dSbgEtUY63K4rZ2NZk
+  3KvJ/ZxXoksKrSxKvpHanh01RCKMNvRm1TQxQF8ivek6Kp8oSBiMOASomVSl1Fbe
+  OwU2+yRqIVl8iUirh2V004iX6lAyEMT8LEO4rQIDAQABAoIBAF3kqZxwQ6hQjfN0
+  KCXYAoHD+F6F3POcoS0yjdEAqq5bY0JEJMhtHUMgT6J5SM8WckHLWYL0J9gzAvNE
+  PrCvs8OKLshjICPJz/beejDVgPgRi0qQTTI7y/vJg0FfiZxMgxAqKSaqpU241anT
+  3sHXj/WxQpTnhw86VHR4vJw4pK/7auXegIr1TMCg9cJVgJHOJcbPB4r3LJB4qR6n
+  PVhpno74g1X+a2Xg0zcp4Sx8PUXBsfhO9rgLD+CZHNBvX+pUAzp90npCFNzRkzfz
+  zNwIY+MsSAkv/cIEsiV55DSA7MZ6x3pgmJ9DKnicsETO4HhJjeER0AHJS5YR5ohB
+  YTmxGoECgYEA1WHbgfAJT+Das3jkZc4F7hJYpvhHeDIryVxcwM1ib/j1SnAdc3RS
+  BKjNC63Cnbcn2gfIyrqSn9Z5XjfTXRdCzCz7EF0Qd64gmdvSTH3R4zhNa1gVv9Mk
+  sgoj/Gxh9DzPsv7trrALFFr9gMOHwe3oeRN8Tc/MZCo565w/NsaOY9ECgYEA/G1V
+  OHHxVLzeJFmoSZs1GfTpdot1dtj1xcbGwEPexHlS16UdEQvGo0peBZvET6NHUtnH
+  4ayT9QXq9UVREqL9favkcO8zgg4v4kWA6XJZ0JUi7rA/JzPUsJcZVBghO0XjGYxa
+  20RbZ5YX0ClKCoPCUgv+bluW+JDbx7kY0GrISh0CgYAWH7ZNq6CbipnCX/d2Yr0U
+  qQxOC5IFcVY+43eued0J9Qshs6wqC1ZxqzrPSi3Sgmn8XjBAbMXFEsy0qx8cGMxR
+  NRy23p9VeVVh/nu4eJcpcu38Aj8HC5JTb1+5zVb+pst2KJ5mLVSIwMJl9l/+CHfB
+  DfcmbjQn8oTc2+9l84JR8QKBgQD2NOW0Ql6y2eyJ4/EiqgHnKVw1RdzyaLd/ilv8
+  17YGSJemweNR5vx99GE0czPMwWMlykkNMri1emorhMqItPUuiGQuSwEgTxohRs1v
+  5Rr5OR1zVfCjGgjPnPEVdtui5o2VM7LCvy+wH1Nms38GNnFoeU5W8XqVQyU67qzn
+  S9/DeQKBgCkEDtV9ZTcVsMncu9Xajx2OPw5vRmRjSfe2M5PaAWnEzGjwwVQs+3ZQ
+  MezkbIDeEeiDSqO5XlzYXJsCNORvv0EPkeqvjesn/f2D3CXr+nI7u+oSUophotus
+  uB+M0db78gAfMl3ZTHjjMR3T1dv63L5mZR6N80iWN13Cnw9IFtxj
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-anchor
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDSTCCAjGgAwIBAgIUDe2KEwbm6fcu6TJhx+PneJ44t8gwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjARMQ8wDQYDVQQDEwZhbmNo
+  b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSZ3XG6N/hXXzo/0db
+  cE7vg00aisnLdXWJyulBROLOzo7MgfYPquW5fzXJj/N37oFObSpeaRl5rcf/pI/y
+  rkzh9UVvugxHuXIqvNYQxMptBL0bo7PnOCDWv/hAlsslXDyvHMZkjngQXrSoN60j
+  b7DYiHwATG8NKOATKahnr3ovPbM4DM7X4pYaOhkiN0cwE92DVcdCW11v+u+TUxZX
+  /XZqrP3iMcs/V1JuAS1RjrcritnY1mTcq8n9nFeiSwqtLEq+kdqeHTVEIow29GbV
+  NDFAXyK96ToqnyhIGIw4BKiZVKXUVt47BTb7JGohWXyJSKuHZXTTiJfqUDIQxPws
+  Q7itAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUaWSzdecv/MrN7UAn
+  GQVBqNDoNXkwHwYDVR0jBBgwFoAUNjJ0K4ZtGmgoxXnlhFWsASc4bFgwDQYJKoZI
+  hvcNAQELBQADggEBABQ79v8MZJ6i0e9G+OyCEr4NdxN4JhKR26vax3m+F3qFS2Tx
+  1ZaM3aa2MHr/1eC+JuQTL3wKBLlpEpTZ9YS8eCw49trKk6WPk43BdRkFhzNKDvPB
+  MI0YkViarjlDOQuE1e48+5WjQskVqBIZ/9osbpfEKhpy3lW668VdzSa4tEjfD+DI
+  zgu2EbGhaUK8Brs3ZpXom3ycJaF1bVvQEnHFEdb9VYi8bdQuVWLVuPcKmORd/VCR
+  6mBC/ysVRpjRA2SJXyV5TDR0HTRUQgE0FDla2ie5u95rkjlTDCAmW/2Z5TIpTZb5
+  7GrKLART+EjBbvR1oVSgEJRfrh94+6AeTFVuJIs=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_genesis_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_genesis_certificate.yaml
index 8a72bd98c..7e09e55e1 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_genesis_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_genesis_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-genesis
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-genesis
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDbzCCAlegAwIBAgIUSELHD4mtLBA/UPR3HNJ6lTGVF74wDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAeMRwwGgYDVQQDExNjYWxpY28tZXRjZC1nZW5lc2lzMIIBIjAN
-  BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3mtHtyjhsNLBAWHD1Kalu8O64AQZ
-  Nq99YCRx3oS6ulm6h1s4FWniepiCU+KWMcEZ4/DeoQn9EB4mg93YFMPe9lJngMi7
-  gX3P5clPUGML5e7878HfDNXK+e2DHPJc+gxsMuxEO6yRhsPbRDPPKRMw0j9KzbeZ
-  /Tfn2Ufu3ZavGqSjs6BoeK6xhTuVR4t0U4ij9sWliJLhVsxPcki55hKGCCnzjTxP
-  ATVwIRog89X2Sq8iscOnMTqKMrIf89u4fQ9Wtwkxxnb4MNfwKbya/yfOvaKTXBxk
-  0aanFIXRToBwV7THDp+x65ucxAq6A3l9EGzoCMv9ezpuN49vCbAEf4yGHQIDAQAB
-  o4GsMIGpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-  BQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUYzT11y8KYDio2l9ctIvunuUD
-  CgYwHwYDVR0jBBgwFoAUkHGuhhbM5XQ/WvRB7o0IY2qvrpswKgYDVR0RBCMwIYIC
-  bjCCCWxvY2FsaG9zdIcErBgBCocEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOC
-  AQEALE3j6LRTax9EJjlHDR7Ry0PpPamSN6SegY12V54mI9rpVUo7wYceI9OYATNB
-  kYVBoHEd2YNbGLKSekPlCEyQwpKPd0RFV7t3XmYWx4wanZbkDDY+q4gj2y6cl22A
-  /v7UbUgdL9+d11JYMvMCCHbbi9h5hHZN67BP0EQH/o8P0kg1OsR1AJL9RKlZmLrd
-  Yo1/4/KSBgCI9kTA6SBBGCtQlgfQdH+1RiTeg5EXnLgKerhRQrB2ASbhH9stSzVV
-  1L+4ogzkhsyjafvFdbyPCNOk0TvZqb/UgwU/RkD/0+cGOOH87qhjvVhYkghNU+Z1
-  fB6Z4gQQzw/5fBcZCcAhG7RaPw==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-genesis
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-genesis
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDhDCCAmygAwIBAgIUGOgOXTcSNqVg68OO9YjO9t4u+5UwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAeMRwwGgYDVQQDExNjYWxp
+  Y28tZXRjZC1nZW5lc2lzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+  ylDJ6LDb8NanUqlrOUdNtz3FJ9DL+KR2IFssXd61+qEVAQCp4ARCi0Iiinz+rdZI
+  N0EVCk54UB6KIoGb11zZiEoBNHTmzndW1dw7ru63aQcUBYj84QI634DPqaM1rvDp
+  o9qGNlx6YttG6zcTh+01Op+ybcwzgxTfAtXJKDd1x8JHE/gsGvx5eK15CfQbqM0J
+  D5GxOhuN0KG+b1Ciewrb8GbKHvgKkBgNeNJVozeySkRPx6iK+PbjZHRo40+jncVR
+  Pmv/WCILlmtSf3P7sCDtln6Zj3QJgR1CWSDnwTl7ArL0+9yhbmqVYL3d4Vzt5RSZ
+  TudFcjbaM1/rlO+Rk/BUxQIDAQABo4GsMIGpMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+  HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
+  FgQU1440j8oCNKQ1vbCE77/dqIyIHLIwHwYDVR0jBBgwFoAUNjJ0K4ZtGmgoxXnl
+  hFWsASc4bFgwKgYDVR0RBCMwIYICbjCCCWxvY2FsaG9zdIcErBgBCocEfwAAAYcE
+  CmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAHLlSuEVkZdzwCZcOLBbFqMZPYjHi8Vkq
+  0Wzl7aRDzQUZhrAeD2PHl/2++CUJtFoEG3cuBrmu0/Ezul5CNj07wZDC7Q8xY1cT
+  zFpziy9QtJD8K1O0pTFg68PSnkz3jpU+LBg4PfvATux+DUdoEhJs4o2OHEZh8THX
+  s5wWwyykZmTYgJ5hhRFqM5es97WE5ZdgCbXHbHh8f9wdHDEComSS5CJ20kK7jh92
+  /j13qmah2sABgfHgRgZt5eSP8PbkJlKoHj9CKenoqXChLysHprcG09YAhXGwtvWf
+  p2OGX7aHfmJJqOy6gLyhyI1RuQATS3GykQMcUS9EMw0nqRIZQv7PSw==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n0_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n0_certificate.yaml
index acd2980ef..2eade9539 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n0_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n0_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n0
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n0
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDajCCAlKgAwIBAgIUUn3+/kkZFzPCTJNoyJPvDzjaZ8QwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAZMRcwFQYDVQQDEw5jYWxpY28tZXRjZC1uMDCCASIwDQYJKoZI
-  hvcNAQEBBQADggEPADCCAQoCggEBANCuPrjhKSmUz8yUOvr8/K9VhIgWILsB1LDy
-  yOz7QQgKTCQD6vYI6hz9hbnjs3VW5vuwKtbqdxiEefVJRFJcfd+YvbxpUmbUBZWL
-  cZDaAxSiO5RCXA/iv1KEYvGx0AXGIjcx6bF4f95oiCcNdguWzRbls9/ckbyJjyTD
-  vqk4SXSl8hpUT2ieCuobeD506GVz05CGFZ2/uF6XgZvOt8m57BHIB5H5kq3E1Ucy
-  0+NnWbFSckAGY9m8Owjy/SPZEo8Wo/38+ofBhjvbjlDbtg0WfJV2+9AWW7+UKvpt
-  mma4kKmB7bM6Y+o7RdgcBuKpenbwZblSMF3JkB4MiWxw2rF6/w0CAwEAAaOBrDCB
-  qTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-  MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFOIStOOXEp+1LyRtODIAuI7Fp3AaMB8G
-  A1UdIwQYMBaAFJBxroYWzOV0P1r0Qe6NCGNqr66bMCoGA1UdEQQjMCGCAm4wggls
-  b2NhbGhvc3SHBKwYAQqHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAGjk
-  k6L0ClF3351PcJgFvVv+sufLFpV2wzETDb6H5z9PVB+ut/Wuh61e5uIRgwwYlmlI
-  rjXNTHDeG60VYe18KfPSf7j8vl0ynE9cbI67CrF+zZBF/Ing8DR5jomrPdEDHhST
-  WyM/GtRnqUmiTRpGsvt8C4F5HY7hSdZz7oIJwtS8K/y1Qo0tQunzKPFXktu1+h0v
-  ajfG8G+RJ0JXP/+b7d/hdVqsftWTEWBNPpBdfzfS3NtRLYjyArDEj/WngGHPFwLW
-  NlrAdA7YvbvltI6u60Nx44sZxxNkmarLQdez76PuAeLGrM+sBioDRIPs4blJMZBR
-  ftO4bn6XRcEoPyEQgrY=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n0
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n0
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfzCCAmegAwIBAgIUVZz1OPFO2SsPooIpZ3OCEfCYdmkwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAZMRcwFQYDVQQDEw5jYWxp
+  Y28tZXRjZC1uMDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPj1L3VW
+  dg5bLB5zI7G8vUmtTQqX97r7vbQ+F5p3Q2c/U8BiTZiBsjokJ6eFl+Re3Zqwtgxj
+  lBF1QtL9lokEt/m/IhT1MQN4HpkDOlx9rsNdTgGz4ZN6gWVeZ5n2fvYWtbQoOL5g
+  itKGi7nY7iCrgM1D2MAENoTQ0iKbj+4eusSj2jm1oL7bWOfniZUjJwXgRZqtUkSz
+  JrRu7lPa94KIE1idco+yJ7Dd1t+Q1TBuO6M7yBC4ufLT8st91BTZMWNtn19aXv9K
+  s6O0YcMWOBq6PKzlmp1RkBdQ8XHHh0EOutf6/e4QIgyLiXjAVSoMyA8WFQsVxWep
+  9xvqbRX2mAPjXjsCAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBNT
+  fAMU+U7MCx8BX8hrWIqtCF/qMB8GA1UdIwQYMBaAFDYydCuGbRpoKMV55YRVrAEn
+  OGxYMCoGA1UdEQQjMCGCAm4wgglsb2NhbGhvc3SHBKwYAQqHBH8AAAGHBApg6Igw
+  DQYJKoZIhvcNAQELBQADggEBADDundmxCAXbWBWZ4vlBvSd+qPf75iqOn5UXHk1Q
+  esFWCsPfXcoIY0zskSvjoRjOp96HsGLEmekOy+Gnq+9gpmV6ivOad8vM047Dcj5y
+  ome1dR40OlrlK4hBFGTS9khSE6gQ8tBzq7IY2kjLUeCTfw4yOBwISAGV2nePL/X3
+  2Mcs0l+UZXcbVl9PNNO7qrcsil3KCkosPwWny8CZgtA6Ufish7z4nk8fO0A1zE8g
+  MXp1sxOg2E0vihpZJtGuziVzCdDt0J6p+GG8i+9uSTAQS/4fU4hUpFk1Bj4EFWJV
+  t8auUmfp+tlZftt3I/wls7/VilszBJd8h0xzxIeQFUGczGk=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n1_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n1_certificate.yaml
index 1c85b9ec0..add69dd0c 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n1_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n1_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n1
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n1
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDajCCAlKgAwIBAgIUTA3+uVyEeBVHf0E5hYkD4Rth3yQwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAZMRcwFQYDVQQDEw5jYWxpY28tZXRjZC1uMTCCASIwDQYJKoZI
-  hvcNAQEBBQADggEPADCCAQoCggEBAMwX4FLweoxFsAQa2y+T9DyQTHN5TukrHyp9
-  nxknGCaH6ATYvaxoue2Qy8dVhy6QJj4UkIhqrT2fODIsxwR8qtjGvR5JlCDW5xUq
-  SjGYQLx59R7OF1MHXNe/RaB2z/3gfZnAcVEzuSgaMzFiU/Ta4okmPP9sBTOQvtAZ
-  At9z/1RrijGtqnSheW4shjVKSfPNDDYtF6Yo4Gkpjf9PfZ5W2RJK48O23TlvTiZV
-  5ge3b4+TYgb5dKGbaiqvzrCbfvbDPMQbXxF0iYRbpCxTDDOy+wyZfCVDqDwWAuor
-  7d5q9/Hxzrskyy/s8uZ1KKT7EbGGHtU407sK1BEmdqeja09VO9MCAwEAAaOBrDCB
-  qTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-  MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFMh+F8ar9aQ81pmthNryLMQAz87gMB8G
-  A1UdIwQYMBaAFJBxroYWzOV0P1r0Qe6NCGNqr66bMCoGA1UdEQQjMCGCAm4xggls
-  b2NhbGhvc3SHBKwYAQuHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAIFp
-  mJTwl2Q+rULtZzpH8mmOa5qUleRTsBWRODc7/JUJlVQpIW8Avcoe+aWqNpe6FqR1
-  dtqG6OdpI9neX0M3TVBC1FzH51rZISmuoqYB9h20cknZ5CCbmCEm8VOpr9i6kaiI
-  J/MsJ+oLxRv2Wdev7ueWJZCH1gFJpetaUa1AoNX6z2qcyLNQtDaPvUCCgQUWXmDB
-  snyCj8kZOFNwdOeUx7jnBvDRagalTc4at1gD6u7cT4xUznwHYgT6pqf2H0lQ8rbN
-  1z7ptHzZDEFbKAdojFRs7YtyVOcydjtE/kUwECIcMjxZFjiNu6bBSrE364IFcciC
-  Iy6x8pK+G3qFfAllswE=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n1
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n1
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfzCCAmegAwIBAgIUFLKQEJpRZ2AEXcbrcAlm3H6/ZfQwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAZMRcwFQYDVQQDEw5jYWxp
+  Y28tZXRjZC1uMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKtJAydr
+  K31e5Dr733V4l/yo2G+hHGdQIIZTrg6vuvpvPT+7/X4l4xeryBqz2jHFyw5wLg2a
+  OJbKQ43tyYvrCt+CwVZYJ29RWAAL6P8HvaGvZZE2ZPaboSgTadAW8ZDaBG/v8qQz
+  6p+4KtHGku8Z2PHk7kadY+dK7+vyiK1aW7bdSLfgZSRfnhQsRd3nTIh/Ta0CQA1k
+  ABibRUtAQ4/k7D9toszlI2HgMI3q/dTUTVqP3VSf7c5hQB3NQGQfdzxZdAlFahYF
+  vKogYx9De+xkk1CWoIeAP4eObyAY5fSIxiPDqjTSIK18o7aLwJB9A2R5am0iGziL
+  0iMfkalB15ch82MCAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFMLs
+  4t4Gyu+y9F5RsdkCS6G/JyrpMB8GA1UdIwQYMBaAFDYydCuGbRpoKMV55YRVrAEn
+  OGxYMCoGA1UdEQQjMCGCAm4xgglsb2NhbGhvc3SHBKwYAQuHBH8AAAGHBApg6Igw
+  DQYJKoZIhvcNAQELBQADggEBAEKn6YGHrc2OqPT5ZqKoDpr+W/rQzlq09B/hWdjm
+  tTJ/Wo1eOsxGxOQ7tevMdCtOrVzGQyBEFpW8vHu0BZB00VwGbXTXCcsxdkFDHTcJ
+  E09eEQhAHRIz1tMswyrtxnQCchvRI5EqVRIoPriJZxys0Q5GqdFpVjP7pQm2cWoz
+  JmL4JLUKwJK0cOkb4AqIqnvG4cyT/ilVw8fWcKCOaDdoOlmsqobKwz/+EN1wNRd2
+  SzU5mcdLeJXSKhNaAdSobiTscwfADFq8WwXLfjOb2tAoO5m7MfGNhqgNk6JYQVV7
+  7UPX2/TdfA9vWWEmIZvtRR1v7ZLyyGrWK4yLDKeYE6iwdLQ=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n2_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n2_certificate.yaml
index fad561b4b..eba4d68be 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n2_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n2_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n2
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n2
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDajCCAlKgAwIBAgIUJVaxqFxtN4WwWwtNatFLaBCC1NQwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAZMRcwFQYDVQQDEw5jYWxpY28tZXRjZC1uMjCCASIwDQYJKoZI
-  hvcNAQEBBQADggEPADCCAQoCggEBANCWj4a01tFQIbBCu27AKq32ZhGT/aGHrmq+
-  0eDXRf1V36GxPB/0CbXittpRuOeSz+0CTv8tJetxGwBP0HDJAMv5jqErZ1kTCITX
-  9FY0HfVKX38TZp+FoktN/V7Gt8f1TV/828GHP9GMSbSHJfv6pxgJh1mrUu+i8BVb
-  t9jp9hVYDJ9R7cSGp2XJ7QXDCHKwnA+K10/f/L6Ak9h/yDXlINzQidH21t8+Dxss
-  eBawtowoHy3h4i7A+FhoNuJFQmtRcAGzM3E4cnCpfBf2b7RhwTcq2T5R7zjTL+3b
-  mhHxzSyl7Q/RjdSyNe3nMfEIvYfa8MxduZYsm8XNGF+utk4Hla8CAwEAAaOBrDCB
-  qTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-  MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCvjB8eyyaKXkbl+ssSWjnaoXs30MB8G
-  A1UdIwQYMBaAFJBxroYWzOV0P1r0Qe6NCGNqr66bMCoGA1UdEQQjMCGCAm4yggls
-  b2NhbGhvc3SHBKwYAQyHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBABoU
-  KGC2n9b4mEjvGOmD3r0VOaLZHpJOI0SLtyVzgTRJY+iGn/WxZZY+tIIXLjYQOg6k
-  t0SWSrYEjr7rc0b/huWzotlFyWCw6Fb/Sfg3t9V42IddrXTvNH616gRcsubEYVIx
-  borzyZJu0ys5REuW/WmC8BlMfUBzkfGj3UlNEIuyUnj0njjAZL2dXyrAqUv2Yuq8
-  xIXCUhuV0PKyqQROSYqmcUMH+ydVdlcl3hpWegStBAWQgwPWsdPfsZ6e3NmTqp6f
-  Rx3Wz1Ghj0cqgGNNeJQAilx7xqj9MBa085KgFRpCt0ckGt+GlAgxRnx0Ap0sN6gH
-  dXjgwwCPtiWwK9rSIpg=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n2
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n2
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfzCCAmegAwIBAgIUaFCgNK6uTVZoLx/3cTFdBEu9me8wDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAZMRcwFQYDVQQDEw5jYWxp
+  Y28tZXRjZC1uMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaC6X37
+  aJM+30HLF62BKOWKLHXI1Xbhk7DW8Y8ATDdOkxKLsEy5an6FnqM9rhqxjd72RUkM
+  bImc8mTjfUXrQrQFyKMADRMJ/oHgb7UBG/u5FBn+wxXij7n1jvE40GSKx7hlx75P
+  WZH6vsdlzDJQXFU35DLlwHEsUwcYZfBCCR6MDG26vo19MTbN6UWyltdjhv9INRKF
+  U7aNocoJVupRAT39ZLaUmjdfOU83W2rC9Oq81Tq8rXKPDd/1H4lC1mtI6cNdMcmx
+  Y7pppRJWRCCVpqFkQZm62aXJaGLVx4a9ZR+awEubKMoqS0ScfnfPGd6jtuY4a2UX
+  KuI0LA4Ns+8nMjsCAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFK2Q
+  AeHO37YyMnLZe940IRCLPHxHMB8GA1UdIwQYMBaAFDYydCuGbRpoKMV55YRVrAEn
+  OGxYMCoGA1UdEQQjMCGCAm4ygglsb2NhbGhvc3SHBKwYAQyHBH8AAAGHBApg6Igw
+  DQYJKoZIhvcNAQELBQADggEBACl/bAUS4YurlrsR31vf8kUOQZnzQuN9SUOlnbdZ
+  lwTTvAMIuBbmDrYsoQXDHHgjxBO0TnYgPyplA90PZFKCRQoQmhMZfDf6E4PKdfcI
+  6mkkEgFi5YAlKTMEmkrDvHKLaZ6GsJ8VMlZtGG/5jbDZQtRRzb47Mqjs0zkLpA8l
+  nGXHpkgUWIbDkEMF8LAEgVmYMzTuMko5E7bQV8eNJqB4VHzhq/sqQ07L8mvdWtbf
+  Hp2Ubre+UW21PNyMDKgsAb1XkfqdkgCWgKCzAJ0yXdYjKMkzFD1UUQEvQq1nKPYb
+  dq6pW7JjnTvHept9F2IEPTU1qHjlAequrgGu0WLRv3Z+QBk=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n3_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n3_certificate.yaml
index cb894f74c..58ff743dd 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n3_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_etcd_n3_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n3
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n3
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDajCCAlKgAwIBAgIUU8IPSeSV6ifskGI+1LNGE17mV7AwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAZMRcwFQYDVQQDEw5jYWxpY28tZXRjZC1uMzCCASIwDQYJKoZI
-  hvcNAQEBBQADggEPADCCAQoCggEBAOGYx7h13kD+MNk6jboXnPbU4HMKVoFXyvXa
-  7UVa9Q53Fu4ArrE/UFz7484wrYivdAut8pt5x0OlEDQfPy9owrX1hYF25eF3X445
-  ICTy/5oJh8/M+VSzdQmEw4wO68G3igKtnGSy6e24yv1JqHUleg8F7DLHFF10Y2tm
-  /q/I+UuulGd8kdnbMoUqznAPfOe3ED4zYTpoNXV1esbKrSFywmfPX61zTz83JSFX
-  h0TYB0PStBLqOSIRnEJQJv/gRGKa2aPYPYQ1wZCRa5PclAzPdt3O+w7bDIGUSc6A
-  P2N85dK8w3TqN31fqHVv+H4uMwPfp0mWUY88fnu0h1Y1jCn8K2ECAwEAAaOBrDCB
-  qTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-  MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFIbakO3DBCRb6QJgZOVoAXBHIIebMB8G
-  A1UdIwQYMBaAFJBxroYWzOV0P1r0Qe6NCGNqr66bMCoGA1UdEQQjMCGCAm4zggls
-  b2NhbGhvc3SHBKwYAQ2HBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBAIx0
-  WBK3ZA7EoaM0atm0hVnfVrXdAt6FQFsbIcmW8L91GlgbThiZM8Wee7ampEWUi8la
-  Fn/lVGVeycEcfmxSW38xi7uO9zy8U4o4mTfuMeE+odQGyin/WC9tB9qrf35r/QzN
-  Msqu5uaT+tx98RRy3+soaBjPqCJqRIDdDV3sX9u8I7WDzSgRXkB/kD9bx9LG6ZK3
-  NzmxAFU/5OHkcW+MHIUYSdd1Hr4GvKnyjs/sS2VG18TSnvJI/+COn24LnixqGwp5
-  ww9H4C7qpLvtU3l1vdkLuSmLkF72C/B+CLO0gt0qIY2sQDQXpRbs8/mFsZQf1FHl
-  Uw/lS8Wy16AYbuicW8g=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n3
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEAs2LQaJKfgnLS9avFURlhHEJ4fBEXd4inG43yDY1YVdtkYI77
+  6OBzZNCL9+Pt3SMgQMi+dtiMlCkGxCxox0WX8VfxuMSgG3dyB4fwGms1nKWf0ELP
+  fVT49bWWKzczFnV4Gu1AuBADZEeOwrDFHEYSOyPIFKRGMXapQczqBMCMQlTKfmUc
+  e5g6KLHPrfQ0lvtB6piVhXh2WYHTXRv9IHbeGQMJYhQAxqdP1fbPsyAGMM9MEmq+
+  IowEv4ePtV9m1SMe+uHMGOQ2EA+d3UZHZAXDLvO6cA9vh3khF2QETb7FAQm3Q1tP
+  0HguwUSitrezdr9fdCLmDt66WzKUiUykCt9/tQIDAQABAoIBABa4pGcqczPFsXzW
+  lfaQvWEj9jjYvV0xnOD7mLYouhCd6lfkpHm5vEP/ukravu0sntA13RIWma/Ghong
+  iiD7aqRyHDboCNORzIqxqDLgc3j07YomfDuGwMX2ix/MLRdiJ6VZecIWnSddfPKi
+  C0VqhrKg9J3QtOdc/VFNUDLr5JgeCOtw/N+q876sEtBgvlwxGJ3+HeL+H4Cz0yHd
+  cJzu5ozvqeYxIBA7hj6GbxsqM3gmR2cowOPzB5WugKjTQmMRpWsoVo78YZ0xZwtY
+  KLm34/U99xcsgBOPLjgy4EIkvJYKTLl+FkCjIFAoJoDGZRsTFlzHnRTvGTXUv4q8
+  qR3H7t0CgYEAykpKBW3aBYfQmUGaPeU2YIwGo+6tv4omR5iq1k+8S/HYvkhIkMip
+  pcz5mFGwXalUqp9zq6VWinLs3WR8pbdQfVKKpJPlbt/E+d2/V9pLMSyc9kRypOXn
+  1JF8pXFM8K8e5tpf+jha+w8hHSOEPxLAZDTQ89z4XmBrHUSZtIMQcicCgYEA4wO4
+  o+DQoo1007jwn5rvA2IAYl3E3sCy2662lnln59yG0UH6XhgYDFm02Nat16Qy0aNR
+  H1vAFeTrLXLXvPFpo2QB3FKLHGGC2p98crPt5cP7x29hO4Cfdg1pCYb1D3oyhgf/
+  Mnnw8tTRrw6AR6ibudcs4Y4yh1+ImmkdRnwWlMMCgYA4xqUD5RMeHkJj4U/DM4QR
+  kPuEI0dMzR91VNoOEI8O2bA1p+AGEuvahy8+mx7fCtmikeJLOLqTXTIx6TQ65rqG
+  khYrnv70IYYNgzljFPeps5XSYN+0fHqW5MaRQL2Rh/UqYfwyJIMUl+h5XzCM61xo
+  Q5Kp/0kOZA1sR4bEbUy+XQKBgQCcO6Bj8EHFzVJ8r4eyYB9kFZssF1p47udo9wmj
+  73PKB2QlOaIEBdLvFQG4Ra6ofNGYoyweR7efmcccpS/CUeag0x/QsGIaqyUyLpao
+  Hhp4iXOK4qVpHPEhfsMuElovR6rjwTcpVvCzPjH8px8zsd9Se7rglEtEDURm+DZ0
+  nsuvnwKBgEv/mtlttbsTh836A/LALTOKkPs9Y7Ngd9OqgDTuywMPKr/vhoiYshtn
+  S8Ciqt5tfx+4pEq0mhuYCNuJtT8rviBrgOeYUVjryC6cGkUahymuWXzb5PEE38r3
+  VWeNIOWCK7zZ6uLB3l0Dd196QrmVJGbjrJRBaHXZ+GIaMVbZj7LR
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n3
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfzCCAmegAwIBAgIUWePaQBn2hqQsOdJEP67ybqgOU+8wDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAZMRcwFQYDVQQDEw5jYWxp
+  Y28tZXRjZC1uMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALNi0GiS
+  n4Jy0vWrxVEZYRxCeHwRF3eIpxuN8g2NWFXbZGCO++jgc2TQi/fj7d0jIEDIvnbY
+  jJQpBsQsaMdFl/FX8bjEoBt3cgeH8BprNZyln9BCz31U+PW1lis3MxZ1eBrtQLgQ
+  A2RHjsKwxRxGEjsjyBSkRjF2qUHM6gTAjEJUyn5lHHuYOiixz630NJb7QeqYlYV4
+  dlmB010b/SB23hkDCWIUAManT9X2z7MgBjDPTBJqviKMBL+Hj7VfZtUjHvrhzBjk
+  NhAPnd1GR2QFwy7zunAPb4d5IRdkBE2+xQEJt0NbT9B4LsFEora3s3a/X3Qi5g7e
+  ulsylIlMpArff7UCAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
+  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJWm
+  fCuYGLerJLc0C0ikT4EibsosMB8GA1UdIwQYMBaAFDYydCuGbRpoKMV55YRVrAEn
+  OGxYMCoGA1UdEQQjMCGCAm4zgglsb2NhbGhvc3SHBKwYAQ2HBH8AAAGHBApg6Igw
+  DQYJKoZIhvcNAQELBQADggEBADiYyUbLuYRWl6pJmlUwSb8sGhW47h/G002+IpD3
+  8L52ciE9EmNKVXvCKPNmfpd8uREDa+9+dE3jW1PlHL/udoIqFVV4pViBmaWlvhoq
+  RCQLIa33WgK/6cssRSrfkJ4jTG5FSN9W+s0EeIxicqirTlwtadpo0yDPjzwqix1X
+  o6GXNMdEZoc9dE3OgyGg4GYE08kZaqVthr/HELNj/eotUTj8jAYAEiw/VTUgPb49
+  XsTSh9dWMUhWgosBUAzql8bW4Zroh7S1huSL48FVP7tNcL7AD/yO7AYW5PV/govm
+  lgAjq0a00zT+IvPXSziGy0F91w6m7ZNveLXg3aUTjassQRU=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_node_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_node_certificate.yaml
index b50f2157c..96682c8d6 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_node_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_calico_node_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-node
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-node
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDOjCCAiKgAwIBAgIUZMFdrh3vPMUmT2eFPAK75kfgolIwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0OTAwWhcNMjMw
-  MzIxMjM0OTAwWjAXMRUwEwYDVQQDEwxjYWxjaWNvLW5vZGUwggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQCthqtbAYO+bWThREfAh5lK6g97XTWuHLySKvKy
-  bXlT0gw/qM17f5j/Xjyax4l1UR6Ch+T7RPIfsed2mSOpx2nNhWaIpKLj8nKf1vPh
-  5Fyg6PrMPiJTDtZVIICzqWmn8ug83QhyfDS+feYw1f5s7cPndzgIiY7ngybvoIxH
-  MuLuDhDGo3KCXdRah/isL2WJGPjQikNYp4PyHL+hCKTm+cuxJxNN2+YfR2PkjV1w
-  pj4EpBHio6mFgL540qrbi1oXmQiWnlrPYjwPjWSJoMx+rPOERyaTiNoyAbKA2u94
-  AYW7oLQYvmZPcvkFUirJzEuZegdZZ3fxsB/ItkPlcIznd+5XAgMBAAGjfzB9MA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUBWTcrU4PYcKsgQ23mpnKzdp6FfswHwYDVR0j
-  BBgwFoAUkHGuhhbM5XQ/WvRB7o0IY2qvrpswDQYJKoZIhvcNAQELBQADggEBACD1
-  dopYj6yvL6Fn9xKxgiBfm6NMcBIU3di63wmJLUvFg2MnVhRsYaJrgHIapKRXL5kz
-  OREu8re3USg5JZ06dWTY1mNKwUzQVywJ/e3etGtAWCqF8MUlt7y+VFbw92JrIwMp
-  lztKJgJWApiMybiaOD22GlHdtn1Z4deSh1xn6rcKHtfk9JNvc56UIG1tVUN9UCJL
-  P5QFtg/1kuRaRShVtJUL0us1uORMu1zYdqIvD/0kKOSa3d9tdW4al2lYJTI1uNqg
-  9gYY7i+Yaa/F8IEw+cvQJTobWd+H3OShjdqTa3OzEi+wTPQ/JGozE57+ECqfCPgA
-  gnCOF3lD72E9Ea6xE0M=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-node
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-node
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDTzCCAjegAwIBAgIUdbfgWjcgl2I6V3DMy+k589fixV0wDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAXMRUwEwYDVQQDEwxjYWxj
+  aWNvLW5vZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDG64u2SiPv
+  zPJLPVuTRWVmSYVTnGIkwTpGVNHlg7XzDkUM0KPiicFaY4OP8wr7YOeQZrYEo6Dc
+  krsI5eVHJLbioTIv6UVyO+RJh/PQXjnNP4k6DbPqd8k04oUZ7M2zqapiQ2K/W499
+  /JUljjsl3CZvpWaNGDR0xICdArQ8CsQvGiLUq/klVCxK7D5wmIwYMQtijUmdTFGn
+  2IKiUP8c8CTYPGtvi19CSVkwIeSDD4O7CNHOwQvjvkGGWrUMmCoXfAYoCL3LTisN
+  bzoGxRw5stAOBfrZ7xe3FDgWsWr7TNgAJsuRsQZ7BG+i7xh6vdWR8HJ5Azpex2g+
+  sovhJWag/pDxAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUZv/inGZu
+  Qa+4y8eQQb3GzNOLwO8wHwYDVR0jBBgwFoAUNjJ0K4ZtGmgoxXnlhFWsASc4bFgw
+  DQYJKoZIhvcNAQELBQADggEBAFXSfr87h7uR6zG7JvZyQTGAu/y6xGDqYdXGUbI3
+  LYJ/6JYvFOR1t5rmN/KZE42w7wrILo322iba1IwTDUd1qr4z/8QP6NF/m1Dkb46T
+  6N0KMSLz1P1Oy5GPobmnPuvyR2SaAOr0RxO/0KDxjHbBcdCZMEYa44lrZjQ9SX9j
+  V3Tt6lLEsH25l7Gmk2ntvS4ZUnEkamPvwHwUbjC4lmSiUtFhb0NV+gv4I0zQOz5f
+  vrTTZke61MfgK46xALPxUyJ53VxmxJefXLvqTfX+S1YD5n3ZuQQErP+PV8gDNXKC
+  wWqV3NbNYvA60knJgbs/bG5uT/HGdd0pRpvpjMpSM1mAH04=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_ca.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_ca.yaml
index c7f39292a..08d8763e3 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_ca.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEpQIBAAKCAQEA6hFS+G/ezWkfcCHv72rac0XlMSxWvvzf2qWJEdTo5XgxXebB
+  CwZosi6zJAhZgnjQOBC3fLqRCBkn2vSLFdmK0XOG/PR5h3Go/y716hQKJSzw2Z90
+  XJ9LfLqyQhXL+tpGlp8iAe3V3rMOy1PuI8MGmTLsH2wcp8i/jf2BMvmtk+rNMwi1
+  EUliRHLbWA/oeZc+nzt/5ADnkG96wEOPe83GernpKNVXRBX6HvHM+tGmP5DhHRWH
+  utAWdCbZIuhbt1oLSvZ50Kz0kJRCa3RKOzqKujLVMa+CdkfgrrabQgjdLHfjnEb2
+  lnkXFqUJvpxX0DNguopJ6WZvg6Yb8zxjQiQmzwIDAQABAoIBAQDNeVXHp5UD5wNl
+  ETWqi7emt7Xhu9WOpTfxnZ09HRUx05gqoVXXUtH3kQ1LVVUWNu46OVqJ0NFeNY8K
+  I+Aw1x6IjYzzY72Hi9xZ3ySbTuo1BkWMFPE2GdRPcyjm4HGHDbQnpxxYayty6ubS
+  0SPdGugg9lXXo7VoCM83W1HeqNWaYTfobkwzOmpxFzSSd2eqPzP/P4nOTdycNb1t
+  ti+lbcQv1Q4XCZ94fUdONHF4H4jwzIOxiIh/4latue6bgBAS38DQu1WcQvQMBgNt
+  pS3TfQOniC+3ZsouttZkesWhppZKbZHNoyPT6ZTey0ljgpa5+Sk0z9Tzpdnse6Z4
+  XFeZQu8hAoGBAPUhVF3lp/mDnENnaAou7GNOsYzNSaGMOJQpMX7iVgibMkadmkvE
+  Xbb4EyEAQPGSH7VcO747O+nayZ4LFgblnNwWCkjCWCBLkmnE63OM2DyXkXftYk+J
+  0c8IqkKq6C3R8QK+pbRt962jIWnPSjzkzM/1tBsOEzLOAkcUh5jsL99RAoGBAPRy
+  ajoJEP0f0yDuqrKi8CyYvRBbCOeuUH9ZUFjEhHlluZ16x/ZreXNAcr+XQnXs4EQo
+  /gRbrcIG1JOmimuf6meGfsdu+BTGCqDNjCWqikScPk6JEhFVo/Rc/bgaVlPIGUeG
+  jE6L0XbevVwZU6KD2JKH98+f/iMZfqvyAFNS51wfAoGBAMQQg42S+jbNuPgExqeW
+  foaz07meHW20XTDMfgVR/aRmleD7gAVoK9kENTCpJkjSKsCB5Fs0v6g90hOyJE0h
+  7MPwcQtfPuOd7p7g3b6Pggl85eJ5oa+iuYkSEjS+xHSZvl8GpD1b08Yze69JGMT5
+  8IPJr+QP7vUs54948Tg0ednxAoGAGNspgg059QMvbMHYCaIX2fEOCIO5PBW1ib2D
+  NgOFlPKLFUBO5Pe4ucdr45912pfjlgq1Caxo1rnrE7hzis4P/8blTVIzV6lrmz5L
+  aekVdjSNAV9evvR+X3K1OeszrAFE0MkVq0b8XaH4j0zj/Dp74yqAQFR8ewU0pDdP
+  YSmk7PECgYEA8W+X6IG3jkldO4dfUfFD2jLrjVdU1x5CbPXGH//BeQKpKi/RzWFR
+  XXqpRdIXXcAZeITtUsNkHXUQEF/6WoCJaL31qqcsimViuzjiD9yjZ3LuxNkp8yyA
+  Yrbdcntpy68oxebMy19u2StlUTC4F/YzzbOR1dVDG7F2I8pTuTfHaZo=
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-peer
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDVDCCAjygAwIBAgIUIrFpVUmv1DYnN/GgKuVkIgWZ9eowDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yODAzMDgyMTA1MDBaMDAxEzARBgNVBAoT
+  Ckt1YmVybmV0ZXMxGTAXBgNVBAMTEGNhbGljby1ldGNkLXBlZXIwggEiMA0GCSqG
+  SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDqEVL4b97NaR9wIe/vatpzReUxLFa+/N/a
+  pYkR1OjleDFd5sELBmiyLrMkCFmCeNA4ELd8upEIGSfa9IsV2YrRc4b89HmHcaj/
+  LvXqFAolLPDZn3Rcn0t8urJCFcv62kaWnyIB7dXesw7LU+4jwwaZMuwfbBynyL+N
+  /YEy+a2T6s0zCLURSWJEcttYD+h5lz6fO3/kAOeQb3rAQ497zcZ6ueko1VdEFfoe
+  8cz60aY/kOEdFYe60BZ0Jtki6Fu3WgtK9nnQrPSQlEJrdEo7Ooq6MtUxr4J2R+Cu
+  tptCCN0sd+OcRvaWeRcWpQm+nFfQM2C6iknpZm+DphvzPGNCJCbPAgMBAAGjZjBk
+  MA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBTJ
+  QudT327TVDrVdpUMOD0MidEymDAfBgNVHSMEGDAWgBTJQudT327TVDrVdpUMOD0M
+  idEymDANBgkqhkiG9w0BAQsFAAOCAQEAXAbKwEU5u8DXUHGU5PKdVG+G1qR4ePF8
+  iTqkE1SkONmejes07D4lpHL5OToyIyJcrKsY2E8OqrqOnl8OFW5CTVEdwd5+IQgw
+  43YfYkIleyXsX8S9cQY8D/4DTzEJUMk7yamlsNjAzXFk+DxhAJisYtVF9YZ/cTE6
+  /8kCmVpooU2s5+4eC3Y3xwq1uP6dbks2M+4os5FWNtxxqDHHOJFEinpXnLzl27iB
+  beGVnigoLoxLLhrKMs23DyJ2jW5bus/7ssZyRzAff3gFyxTNrwoMm52b+bDgB0+6
+  Y4tzNDaJleHvvqfAy6AoQl6JqaSW7KmeMVncAaI8bF5+uJj/yzxhhQ==
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_genesis_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_genesis_peer_certificate.yaml
index d9196fc46..bd42d9013 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_genesis_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_genesis_peer_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-genesis-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-genesis-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDeTCCAmGgAwIBAgIUVSyJdNo+pY59yfeUehlaCc88p0wwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMCMxITAfBgNVBAMTGGNhbGljby1ldGNkLWdlbmVzaXMt
-  cGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMZdH0mLShoJiGzq
-  spfWGezUTNIU0xSfdcIleY/YO3lFQpFLhogvdMBGEnHF2CCvr/b34FlxRZX7XWU5
-  HIDEZkJaiiv154UHquivmjGHLdzSqSdREO+fPHXdSGjB9PyAsq8rZx3ludvuXDCI
-  7NIgJxQ7yvrbNkRFRk+oneLSDYgiBxn5fFCR2cANziepKDyslPlK74DPEWkcdihK
-  VhN5Uo3XUKce0P5nPtD787rlTlwzwygPB5VXjt8D5N/dJ6ID3bhjdzD8QA/YdZlR
-  5BWVglMrKmJDl4r6tnPbKymt/1M5EJY4O2NlzpjwJWxPfk7XCkw1z+X93Im2WHui
-  bAcQdQUCAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
-  BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPfbX09xGJ94
-  lMrD0dwSnDO23ShbMB8GA1UdIwQYMBaAFLpzzYtiEAOB+2uxtX/Dhc9//iDmMCoG
-  A1UdEQQjMCGCAm4wgglsb2NhbGhvc3SHBKwYAQqHBH8AAAGHBApg6IgwDQYJKoZI
-  hvcNAQELBQADggEBALms+hzJB5l1i7JsYlFW4wRWFifzOC618GH8f2bgcN0GIMX1
-  0ZMsyMPGyfxZwObx4XYJyX7w3Amy1LM5YNjvvON8y/O6gsbC8TUGadlmw+HedRkc
-  dA8rNEWSrtMRK/VdyHLaqEl5pGBoumzolVeu8WgnetL2d5u1MlFigMhOgReHM7VF
-  LLWW1HIVRQ6JtS0Xx5lE2zQUFPznebhS8WXpve/AButbUG1ypOfBi1uFYeUwdKu1
-  77uar6816n7IX+aknZJqsk32SJC6ZJU5nm5N+c3SmITDp7ntcEBcYWrBJAlh00El
-  G16htit592m6vTjo6ovCEYepRWoAp4DD99bxZjM=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-genesis-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-genesis-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDjjCCAnagAwIBAgIUWxNiZ47d2phs927n9jMwIgLgt8EwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMCMxITAfBgNVBAMT
+  GGNhbGljby1ldGNkLWdlbmVzaXMtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+  ADCCAQoCggEBAOITf1goAgV7XZzLS71JZIe5hLSD2dKExHe45CPtVJOLuhvnhSae
+  xfsXQF3OBMncYghxyJnbJN+6odROaGYtls7AldJ4jm0frKnPCR0634yAZN+DkcDz
+  PeqZadXanL+/FafqcccHgs19WXZWRwMpYp3YlNiLZuuF7j+1knPWmXlUMFW0y4aI
+  uP33Ibztbs8z2/gyOxj7NaO3F+aCj93px9r8VHLgvPzdafTN5xnbF5SRkqvsr8Gc
+  Jj923DM/jBc2UCjT080x78+kog5hdcqBfp8lm5I4m4c92onD4yh4fyfV7gXeNV6Z
+  QkodhRliCYT+fC9dCESsoWDE3GSTvy2rtgECAwEAAaOBrDCBqTAOBgNVHQ8BAf8E
+  BAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQC
+  MAAwHQYDVR0OBBYEFDpWfp2POuMVdIQOFpLx+2peaCj+MB8GA1UdIwQYMBaAFMlC
+  51PfbtNUOtV2lQw4PQyJ0TKYMCoGA1UdEQQjMCGCAm4wgglsb2NhbGhvc3SHBKwY
+  AQqHBH8AAAGHBApg6IgwDQYJKoZIhvcNAQELBQADggEBALvJOvZBSbuJJ/rYkrLT
+  AqE9o1WXeynDIsblcMLcQUZGWUBdmDmF2ENk/w1ern5HThMMd5SqZfFnVex7X/I+
+  6JOc3LdSxuxZC3vx0G86J+TndC67CvZmtmGv6+jEQhb2GFlr92B0ECAADB4l7/Rv
+  Y2cmH/eqUUJU6AdfQUwHKa2kQ/8YqcdY82YTTgXdw49pxrxXiLffK4WiEq05sYPK
+  gCTdU5zpyDLV835bYYC6mRq8WcEM1IeqCtZPNNtoslfWJ2bFVZ6X2mdASVgLt5t8
+  YSy8yCibsVDwFVIGjdgM7aVwdGwAdYHJf4yym1bc7ADuT75vrfMIgMKjWXmi3bQ2
+  nbc=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n0_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n0_peer_certificate.yaml
index f543aee79..b262b2ecd 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n0_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n0_peer_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n0-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n0-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDdDCCAlygAwIBAgIUW/aNgYtPpJtvLKr08jYdI7+rnkYwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMB4xHDAaBgNVBAMTE2NhbGljby1ldGNkLW4wLXBlZXIw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCt4rr4fi35/R7PBRsxUKW8
-  J+GpZDDjWsTTLdhoxLabBONDLZ5WHUbR9c0CtF3pYG0Se9k9lUl6LvX/5/sACyJT
-  TJW44LLNsEkR4N0WL5bX0TtHOhYCoqS6P2h/ak/C8Gf8QABziq71j2Cb1D8Hr34R
-  K3Q72uSA0XwRuipsB9nBWUfCNr/EZ13+E+SQU8VtS15cv1Z2FeZR3rnRLVCo9TOw
-  QP+3Ane8FCUbHH0SE4eF4nTBH7Ya3PvKfKUcuPfe98Lv8UQltRJj5ptu5KPFZEv9
-  l1HK8P+pz+kq7F4Bv9mQeXrTzGpZdjp8QM32qnPjt7cNeqgDLIN67WWPX9C7G0nn
-  AgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-  BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRA/TxebOkUOGUNClMZ
-  myZJnnm0LTAfBgNVHSMEGDAWgBS6c82LYhADgftrsbV/w4XPf/4g5jAqBgNVHREE
-  IzAhggJuMIIJbG9jYWxob3N0hwSsGAEKhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEB
-  CwUAA4IBAQDMhnSS9KikYLSdrBGQTqQDrUHCUCN4rVfFXvfVkuGLz2fhbXq0mTz+
-  5lFTQbnla6k0rtCnJTPeqybr4mBzzo9FurpnCaqcPoySgrTTEay8Hgq8SAa9y2oR
-  aphKkaT4hql8haSciiHNF6EqbOntlKZPMSWMd6DILANBcJ2KQaFumISNRqyY9f3B
-  hdG2rMZKPE7qRz2Qx8m3TwqKeHna0n2nItoD2+x6Rq2ixQA1B3Xf+L321O5DTwFN
-  KzUN9ztrYtpZsIJeGbhxvgpu16zFz8LQiDXJF8J72W3+Kv06fn97znI8wWpQ2NBG
-  KSv/0qFILBUGud5rQYbt03imQkJi2PeV
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n0-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n0-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDiTCCAnGgAwIBAgIUZG0srLH8z6kf8cSi6UgLqoQkddcwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMB4xHDAaBgNVBAMT
+  E2NhbGljby1ldGNkLW4wLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+  AoIBAQDXFRSPK7s7yttpMnA/kbn/kv6ehXUKgKkHB17HUcKsQxpyWpEFfxI+jCe7
+  UnabK3V9bQOu7IYvKzc3FcmrOgMDfF5UHHfnnmCOeTRP8V7mZhMyQGxtKbP3+S/s
+  vQkyTQwnrvEU3tMeNmf5tji3UCg+SU01MBXHMWJCD/HkCvQA4U26Ue2AMN6gIG0Y
+  gDNsfWAztj7KvNxdS78OIphdIMxUzbFjmxyPdvLBvApCxm0RbDZpv8L/yhY3brPg
+  0WWOFkeZQD6jyZTpXtT74YK4tlsd8hrqDJl+YuWiGBLkLEdFg7ihReYL4JyxNupC
+  UiQ4EpcQzogsNvCZawraT26hivePAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWg
+  MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
+  A1UdDgQWBBTZUDehAIXg7BRmXe8MeR1wzl231DAfBgNVHSMEGDAWgBTJQudT327T
+  VDrVdpUMOD0MidEymDAqBgNVHREEIzAhggJuMIIJbG9jYWxob3N0hwSsGAEKhwR/
+  AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQA0+zAU3Ky9iv/jBybbkNyLjAi7
+  xiSeGsxIl0SVDtoNGWvQrYUw0i19Dkr6jYh/WzFk1mrfj8UenHgjDFn4F+bC/xoG
+  d6aTMPASa46ymaN0dATgPf1Gm+e7v90+98Kuuwa1GGGhJoJmwK/mgonayW4N50rd
+  ykvP/kY1/AYVTzKixGuzTvt8FHOBUaLHBwSXMxHTiHOJoHlc2SnEPbj8nQShMJe6
+  5yFBwGhDM7Mjg56w7AKbZTLXoud7NuJtZDS9FPXy3mFFsLovO4M0T/2JP3V0hQTl
+  +7H4a6nbtuJ1kR8mozq4FdYgS1rU8AVf+4jpyG2QWCpQbGEp3Dz93kafM46Z
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n1_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n1_peer_certificate.yaml
index b48adccdd..74c23a743 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n1_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n1_peer_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n1-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n1-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDdDCCAlygAwIBAgIUfQT2P/KN/L3Y5Lz4UEV1Alid+2MwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMB4xHDAaBgNVBAMTE2NhbGljby1ldGNkLW4xLXBlZXIw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+cZB+NmGKARTwFdi3DiOf
-  Vo7wMIs+TIYZGFp82v/10lLAi8H8Wa7BDo7dUVUBkYiIW3wSdIlVJIYnwDeiiii8
-  Jd/82YF1JkR/bwbxdKFNUzwWQUixURYSBvLu+OIMskzF1SpJ1TKL8YG+UdZjF90s
-  xJvsLMWTFcqZPPrNerMbFi9w7in2Xfe/HtQ1itwFt/6ewfBC+XYX5Izybw2gLufj
-  H+k+OEDlTnwF01OU4i+Hc9x+tno70asHvz9qX1J3dUlyL8/OERK3h3w20CXh3jx0
-  GYnenqf3EE/ZLuw51HIS5Zb69l2evylX/de3bmEL+XCob97gvG5H6XRcZBnYT4At
-  AgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-  BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTVo1f2+i8jX4ayPQEH
-  tpYs2oXlqjAfBgNVHSMEGDAWgBS6c82LYhADgftrsbV/w4XPf/4g5jAqBgNVHREE
-  IzAhggJuMYIJbG9jYWxob3N0hwSsGAELhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEB
-  CwUAA4IBAQCsvU0EEXaUDUdmdzArpCNnNJU6JsIqvarTv83Tcd1ZWV0fI4ghdrYD
-  hmOdL1+nxMaetPFYUa6YPLTEdT3EXR//Oq8VNh6+jCUa2cBdYMJJregpOSZk/AS8
-  PskZzmuvEL43oLfgncNi0FbNsM5xKvSGQviCY+jlOdffmNLJsN14R3l86UbMgbzQ
-  hzFtygyTFYooJRtbFsiPbfMNyspx+Da3CYPVu3o+OIvzGSpmhWFjQFrxlaLVfsv7
-  OTQ4GUR4yCB2bZ+LvEbgZ3cNnuuDDbjJcSVmy/3JoaAPMfLbdHJcwzdjdZdhUlon
-  BgM/FC674euUkc+hiefujetprQWrgwWl
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n1-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEArNzZmp1gIZrWy6KxwfIfpVwMb5aWDmecbb3PfZANVSUWilPg
+  LLt1EnD+EGkFNrhUkp5DTisBib103LqMcmTgx92SWbhFCjDbfgTEtJ0KDg4+CtMY
+  txfGRd9QVVKe9anDGqwxAJqdAOMDLKQEiW/9MuqMhlYUoSZNFR2Lq8qiVZgdDhXk
+  0O0451bPxDg8pFOvtp1NRn4vILxrL4HAPtu1gD4tTiUGNAkMqsB1dxuBnR87aATJ
+  HjTolQrr+xjaSUTCBp2B7xvZlJaLee0B7byDugAy3xiGWJAgxQPghQsrSNr5vmHT
+  8tj+xWLy4bwIKsrkewaZ18hVxGUYohlkrCNvzwIDAQABAoIBAF7i47eRR2Fq4xjo
+  d3akd2aHfnQKTtgdW6qJlEmyNv9T2mmX3OfxBjRXPb64RxpgWFwa74sK5E89ZdZ7
+  t/hbE1/iaiFBmvQbGYC1EVyrDwfkHX5HnbtzG2zjRe9v6L2kr+oGNufD9wazldx9
+  M9hVVsEKKpTaz3wd0BYVH8Pu+OjOLTILmyP6Hth86C4oj7kOI9MxqR8nKFwuk23s
+  +IfO3bmPOlaBlfpPhBnKTXas17FSCwWyfvEOhNZk3BUdGYwlpcrtlfpyDz19Toc1
+  MVljXNlOiUcPNTbQomBtJLINWBFqos9+y+M523O0fV4PF0xyE0y8b+ZyKWy52Npg
+  BX+UfLECgYEAxCdfwn9vhnWDKe62VFIc7aEsfzs81rUqF/ADFlDIBydxiAp+/Xp/
+  o1cKViP19/6WJ+fx+uDOA21Fk0RmWZE71gjf2nBPyckwVr6TdJLRK7fqoB8viQUv
+  Kdp8fM5pB23P9iXPxs0l4S6I8E5gjOIoyBUWfpGcIr3Yary1TMXhoGMCgYEA4ZpR
+  5nzkIwFSEgH26er8jiApUBD5iBqRWI2dN7yxw8cqaPaJlHIqFEdMPOSZwe+l+t2c
+  5idUxyWRJw6A3o8i6StGaG5NJxip4aOKc3nw69YcNzWGKDjoSvrfBnfA/snuOFc3
+  uNkWgrM3pvxN9xwarR9q8VbAyZ0FTX9sUhWxsKUCgYAt1Qlh98bGQxTnqlg98YXC
+  3GL6Q4wemuv/9duyziM+0K+NWu57KbFDKCZJJFPnozvQjTiUJwzb7h9Qnq3PhcjW
+  ZPJxJsbt3i2GRzdLCLcJIQsYaNEBkg2IGP33Z39Q9g6edA1NZUfRir8Cbz3ODVX8
+  EjlUT4+M6pDzt64hByeGAwKBgQCNDuFgnPxECuJW0hWhgsTw1JkgL8zl1b7FQJ5p
+  qDj58YDJ6kRxpcQ7s6yucjzVLtN3/LLKkRMIBawxYHchMRwh8GXwi+7/oAMwSwIZ
+  W8hQnSo9NuEwKwzLPPrP33azmGyzm40CrfHOPOJyLVVOSatATeGfDqAyL1SOdTq0
+  RE465QKBgCLGr+TZ3e+BjMnSEB5zHSzwMh2Fq2ZfjTGnFzis53R34ji8vstM269B
+  yH4aokMbuhoKJKShYhKSHjCmstO8Xx5ZKvDW8uHtI03JE36/IzMA427Il8xehYwf
+  cnK7ELgrCBLuNcpgLIlj1fw2hKDgA0kptZc+84WqhJM4tRGLDIL0
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n1-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDiTCCAnGgAwIBAgIUVCrW6wMa8gYrWagx7tTJ0QhuWLAwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMB4xHDAaBgNVBAMT
+  E2NhbGljby1ldGNkLW4xLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+  AoIBAQCs3NmanWAhmtbLorHB8h+lXAxvlpYOZ5xtvc99kA1VJRaKU+Asu3UScP4Q
+  aQU2uFSSnkNOKwGJvXTcuoxyZODH3ZJZuEUKMNt+BMS0nQoODj4K0xi3F8ZF31BV
+  Up71qcMarDEAmp0A4wMspASJb/0y6oyGVhShJk0VHYuryqJVmB0OFeTQ7TjnVs/E
+  ODykU6+2nU1Gfi8gvGsvgcA+27WAPi1OJQY0CQyqwHV3G4GdHztoBMkeNOiVCuv7
+  GNpJRMIGnYHvG9mUlot57QHtvIO6ADLfGIZYkCDFA+CFCytI2vm+YdPy2P7FYvLh
+  vAgqyuR7BpnXyFXEZRiiGWSsI2/PAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWg
+  MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
+  A1UdDgQWBBT29qIwMWoeGIA7lHptNo7QiSPxrjAfBgNVHSMEGDAWgBTJQudT327T
+  VDrVdpUMOD0MidEymDAqBgNVHREEIzAhggJuMYIJbG9jYWxob3N0hwSsGAELhwR/
+  AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQAjQCPPCTu0B5fWbiSopn3XBxp1
+  9Uh0A9ipjgN0vs1F1cW0p/TPEyN6z01bk5mVEdi9uBsgk4qeoZZZZrfP2g7l5Mq+
+  50KH7fjizqGkqFpmFeBmJoUeeo5zq/mugtuvsUzHid7uBjsO1pJCyVZRCXYxXzFp
+  udjfN3hSzFkdfS/5c37Ms8zWt2Kglq7zwrz2IMuKzyXlWO9ibn28M5rvroyxqkv4
+  Yi2n4vBt1SEuGYZrVqIZ9Um9pNIAPLjUd8syzWCYLCNIRxF60BqAiDPvSwo0GJ++
+  lKQEBXLN4eKRJcbMkniPweu21DNQg1EOay+gtmD7YcDyxHy9TAd7hSwz26Gw
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n2_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n2_peer_certificate.yaml
index 4b3d57556..e55fb6df2 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n2_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n2_peer_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n2-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n2-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDdDCCAlygAwIBAgIUQOZ/0fyjacNw+8YCBNnOSMLbkYUwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMB4xHDAaBgNVBAMTE2NhbGljby1ldGNkLW4yLXBlZXIw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDawYEkRZbbx3pRzpTXWtNM
-  Lo5Cv/daFY5xIF7Jew32lRrEREckGjQeeWvg/8LZreJgXuGQrE7/Aq3S6zP1usHg
-  2MSNUvNES+5AG33RjM5l41w6NOXdfyWOe3a/sNyF4NAo113mqM3XS1FOBPjFHcEi
-  RnIDMOrLrhrwLLFsxmjUB5PX8kN3RbKNL6wfpND2/GsyaDHhS+eKfTg5d9kGG9/9
-  qfJS6J69gtxEE6wpMf6eDbznj8UwNmWu8y2/SZ62ad5jIZv1JtCG3peHga/G2u7b
-  m9nQLsoMKpqf800jHOSI/M8cfsVqSPLkgXaNhTm98aG2GA9ADp+jyeOXnzMPoQWB
-  AgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-  BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSJqKekpMTn1na3wRkC
-  XWUsMhMKWjAfBgNVHSMEGDAWgBS6c82LYhADgftrsbV/w4XPf/4g5jAqBgNVHREE
-  IzAhggJuMoIJbG9jYWxob3N0hwSsGAEMhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEB
-  CwUAA4IBAQCH9mirg3vLBG/8iXBeny0VpueG4OUC0dHQ1SCqN/IBexb5jzkvLEU2
-  qncrUdQLf9loy+bRQhUmTlXkTAIXovD/s/3v/5dmohSARzJ+UAN2sCjxoaHcZ1xF
-  pVo19fJYt6ttXnm+g9r2qxBsTZo4tGJ66nQ6L0szK46qIXjw+b9ubhlh1OLKGaAl
-  zy9xPQC7PLaMh23sYvU6xuTMXn6s9L9t+ZjZHkhnDfN31YpPCcoUXdFhLDIHaKQS
-  SolhOGF8B0teKkVv32mTip7o2Ln4Yx20qeTyj5ikZ0yNYvd9CTV7EbR4ykYTahfU
-  B0ohP8z1zUO/ptnqDhKFfYxi3Umvb8aW
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n2-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEpAIBAAKCAQEAwBZ8+9PSg93D37dk+Y4HUwpCSuSUAJec7eJNrfiFXfOCD5r1
+  Qk8sKDyYf5NRMlzP2qUK7AxG9Tjb6cUbAZ24SGg60/UizJvYTBKCtIAwsQqioWwl
+  k96kQZke5Q44LkEmvrGAmkVWhHJ+Bka3UegyZ/9YQa5w8JJ79Lo1ouUcG3s6JWur
+  MT//uFC1BVIgu9xaxPRkbX4ARHxIRuRE1NS9L6lRhpZF/rwJq++1A+bZcX38H8MB
+  ao8oGR7QxOL8piWkkjTKr44HPjJGmNf9ISw+0mPNbs8qQ8H2wrDdE7CWUGl3Bavs
+  TZVnjRNxYThzWRZRDSlWL8cuB0r4gcOhRXjEgwIDAQABAoIBAQCV0HRGTJ0Br/LX
+  B0g/wuA/id7OXpx4IceJWVlQeGY8MnGcDjV/NBSyhSBDT/iiGPUcCGEOXTzygRgz
+  qUE473QNNQ28xpIPlvUJz94VPW28hxj0YU6ll53wc6Y+6+oxWSsIy5QLvkyOHGXi
+  K0FLJpg5uFNzVsRLPVRkON8gXySe4RANTjUHhXi8hCNEVEYUFWFzz+dfkpovfa3z
+  pG99sDkxgjqM/kQzkverT3GmUgYfqtDH3fovgdodPqxRIfL+KZa4hP/Cd4QujVc0
+  gXw/fc6i2NOoDK9yHYhdhaHrmJTsIgqy6UeZO9PkjBowkN99rD/9bwzlGybQJDXr
+  tU4XefAxAoGBAPDwZLH3UdXz7VqO10iWi9Ymj6oOefNMRteqkpkyky3uBoDB/zuA
+  KV3hzwNIwn+MBGCIiakVemFGcpOGj5SnLekBYyBbAYQMKa3rUrB4yKL5q+aQQ/B2
+  5BphCItyicawfTP23yYXhj7vH6Up0vAFb1RzveGwJ3kNLcGGNKfzquX3AoGBAMwY
+  W5gQf4vKtt/vRmoJ/cgJN1NpLEoaDmg4TJDyyGRD+Qo/lR8uEmY9yVKcyFq6tWA8
+  1BCN6puTJvUiIIpIcr6wvnjCeiX9ESboUOXM1HzcejSn1Iqcq7loTwWLqbp0oBb/
+  wTZY0gpVkh62LJZLwBSfCLKSb2qON7/AtqlcgILVAoGBAKuWeA/qE4Tsl//jNFyE
+  oofbpHq2npDvpJAY8RhbVUfjeQwfnLZyOoOaugQbwDB3tfJNqsQZALPgKN75eK2k
+  NeT30PGM/lJdGx26NoRpMHIonwyvd0L8WMyUiDJPWuF+dVwZl6gYHsoZIA9O7uNy
+  62tYlkTxX9ss0IY/HqbxuKbXAoGAaX8duVit1UCPjulL6HwJpmC9LGxs7FDTqaOQ
+  UExusQVBsb50Ao36DMdbTUylc+CW6IwIwhXZc1l5BbUCRPh194O8sQc1xHUvbIEh
+  b+eU3oXI1Xb7MjsRuODmF+O9dBfcuIazBLicuaLJyP45xeaZ/w7FnCh9VwL0ZjXj
+  NWAPPZECgYAL6955UZsNttvx/HjvfSMNxF6BB7gOnMnwprl7QBgJbp9HWJJjpDdf
+  Rna03APTXX0BQm+oU3Jrt4rJtz9gRGuQXWguoQ0FBeOLXGUNTpmgyslD3DcKcOks
+  1XMJIb1BYq5zJ60/LiVfbdNC5M3tvWo9Ce/a8i926EfJAptSq4aqLg==
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n2-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDiTCCAnGgAwIBAgIUIjPoo8hHVVCJ06L9ui7LICgvp4wwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMB4xHDAaBgNVBAMT
+  E2NhbGljby1ldGNkLW4yLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+  AoIBAQDAFnz709KD3cPft2T5jgdTCkJK5JQAl5zt4k2t+IVd84IPmvVCTywoPJh/
+  k1EyXM/apQrsDEb1ONvpxRsBnbhIaDrT9SLMm9hMEoK0gDCxCqKhbCWT3qRBmR7l
+  DjguQSa+sYCaRVaEcn4GRrdR6DJn/1hBrnDwknv0ujWi5Rwbezola6sxP/+4ULUF
+  UiC73FrE9GRtfgBEfEhG5ETU1L0vqVGGlkX+vAmr77UD5tlxffwfwwFqjygZHtDE
+  4vymJaSSNMqvjgc+MkaY1/0hLD7SY81uzypDwfbCsN0TsJZQaXcFq+xNlWeNE3Fh
+  OHNZFlENKVYvxy4HSviBw6FFeMSDAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWg
+  MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
+  A1UdDgQWBBRIi+o/gcG12KWt9qO5imxC62f3BTAfBgNVHSMEGDAWgBTJQudT327T
+  VDrVdpUMOD0MidEymDAqBgNVHREEIzAhggJuMoIJbG9jYWxob3N0hwSsGAEMhwR/
+  AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQCK2LFmh9Y6FPxAFNUFMygUvBRm
+  B6T93JXihFx+bFLgMMGePrmpxyjR7gQfkPWo094LujgQwMmPByR+xlQMQ5HK+Q2x
+  DbPMnpn5HpfZp9kJuHxqR1wZzLPdN5j6v8LuLjIKV8y4J6ZqVp6nz31Ef2ipIMaK
+  0fN9uogSf1dtMjFjvZ/SFbrG+HIn+Ihd5O02O8T8qbN896XuQxBZ7TPd2xhp/UXc
+  YEWq5SeLQ7jHdq5V2yv0KhsEHObw8udCeNF6IHfvTyW//5aIlo37+hHY9s4z8BEW
+  FWr6pt4CAMcVgLDLeJ2Lf0tI1pdMMKWYs+FIYvErJqZSJjQdTZHgTt8woGwu
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n3_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n3_peer_certificate.yaml
index 30315b36d..cc6193ffc 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n3_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_etcd_n3_peer_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n3-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n3-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDdDCCAlygAwIBAgIUWdUAuNGaXsDjhOlBKp4itHSp96swDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMB4xHDAaBgNVBAMTE2NhbGljby1ldGNkLW4zLXBlZXIw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjFAEZAT3NPrrRFHECaB00
-  Mvkk8iqSPFunfnEJnjkKTmeaF9XixNCxVsjHj0F42Iqx2LUFli3lCINBx1ZoN5XJ
-  LGC8FfEFC25sVE/hYS3xUs4Nra7BHgIZwQcv5UlNT2yO00/eVZq0BEH++PmmXx8M
-  BEHxMn/1+im1ea0zk2JDg8Ai4+/S1XGD9MFWN87EAqiluQMzq1SRaSTZ+iASz2AG
-  aYriRqcb70yk2CIVTWtM+QGJuga/CPHm3UnnIFsXJce9J8wsNx7pfnczf61RGFrB
-  MmM5L/dnXHF4vgMJNLOxaggdq2Sw3mCbIA9JLpa03B8tApgIbyt6s98lGNuuc1Ev
-  AgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMB
-  BggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSHY6FrY+A/OrrMfezg
-  zH14GSXUgzAfBgNVHSMEGDAWgBS6c82LYhADgftrsbV/w4XPf/4g5jAqBgNVHREE
-  IzAhggJuM4IJbG9jYWxob3N0hwSsGAENhwR/AAABhwQKYOiIMA0GCSqGSIb3DQEB
-  CwUAA4IBAQAUNYgkCjXbWUPEa2Gw0NkioMdNWfcOnW7V9CXqI2/dxSEU6xE3InGr
-  IcsWcvZZT55mPc8h+wtUENI30lDXrWsR4v9xZIMYw6VvWPe8LjbxiADHPPLvYXLY
-  rmAyOR0ndfx17DQs5szklmXtge6DytS4ehhBXLrot/hjDmBgZu7YMy53oviMPzTK
-  IBRMi/lKXeQpSLJQJi6O1Kmye3hjuPuKoVbaFObAAvOhEq6x5aBgcSjc1cpUIZUd
-  ZfZCn11/zuLPWUsv+vN3u6jhItHT1/59XnND4H5etOjqXEUJAIRWT4zWkOE/rI2s
-  laHtj+w83jN5gFPsLLmBXSi1vaX0q5CI
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-etcd-n3-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEpQIBAAKCAQEA599vutTtQkxa25AXr+Ev2CkytuJQcRNZYUCxuODpulgDJyCF
+  nRErFTmUHe9gmfZB91/r1MHeHrpvekoI6yyiNc2GDygcH9gTOcjArTxVYHGyg8HW
+  mR2jHcv/d/FeHNFE6BozcoNvSzoLy92CDm5Q109kiMMTL+nKscQpadSkUwqNUkv3
+  jIP4G87TAUuEGWosWv6FT28DO2E7AKLsZucMme4/s81FASkn9ItxiIUcubWXchjs
+  9IAv0w6laMro8Z1o/PevR0qzXkDJu/WAII8gaPT21WMtkMNzVG2e9DQ4Un7JSMK5
+  qjyzuX1HOsCbzwz8wBvhe5P4WKQeE6nPiuVuVQIDAQABAoIBAQDf8pSWDUrt6pMi
+  VqQaEdNE4l2B90kcPUTpQjOkTU5Q1OqOosGJtug2grsEwos5iHej9bfvcCMY6JX8
+  tX6xrRUqA8uD3ghz1RyUhclaR9hp4sY4rUGX9uDxSXL/JFbyXEhCJ/QimMEoFfMI
+  vnL7fx6DJcICuO5SK2rCkKQy+9aN/99ZjUjS1FxY83DRJwag/sZpFXBgvC+b3WZU
+  Hr70NG5ktprM44ovT5E8zEMjk75CzDZ1ZrRByztM26WsniIIXsqWv9jgX/IVZ9ue
+  soWvU2bR0MAJEjNANtemwUzy5+rtGES/fBI86jaLdlljK7yPVvEl+gpV3iYwFuuF
+  cQPhVADBAoGBAO/ze4vh6c/EIi/Jr56yvO+UHi/LhVGM7kqdcOlDlf6HjX+deXxe
+  KTfLcef7VQtN3dm3LjHo12akkiuXuf1GvEkPQSeB3jqpdCFGTCDFYLatnKOqqN7P
+  rT4RO64nHDYRtJTlBDmHUu8eY+XYLfV9SAYSyPaaKSPkZ2v45ZfeKDvlAoGBAPdh
+  onRDr94KhAMi7zt8kUr3HFjvqHr46CVLZ98fXyrnZuEuRd/pucLWVSX6eQB4COZs
+  NCJh9RFAvSsXQgRr4ER4yGmK0REP+BhWm6HMcfEz+MSQsuvUeKdp+i5r0mSNhBAU
+  a+sk0whMeM4hJEIYHTPwM6YW2rXq7KNM7WR5NaGxAoGBAIqCy7OQwk5L0swxKW57
+  kPLfVpmSazALIVbzEUWl3QTjrLuY5JL1K+foSaV3AL2YwlK2GjV3SjgXEcWWPSfG
+  WFP4OU0b+3Nzc/TtRm64YT6yczRLBFYyHbgxbHj4XKGdkNdOaCTpR+d+bH42Tzlh
+  i1zuJRGtJchxRX4fXDFRbXo9AoGAS2BrgKOTNcPcf5woaubE2qO69npnyriG+74j
+  M0A63jbOCTTxQ43S9UQbg8vzDKqGg7dal1NjudMREM0wZ2p7VkG7RzVuCJXmEXxq
+  RX2nBkjAtxwj+GmwLcrD2VsvK0ZXhBLE40xAJRowARbmFmGEnGvHQQdbsuyXGBb7
+  io7IQbECgYEA02flO8x/HEnLiUJmq5txH1duYSU1COWNbyRwVj7GB6i22I79BibJ
+  XrPC9/bZnn4jdbjQWx9pv1Vlu1snrIfZJJwLbfjEiUFCfcljFpwhHy1gmWmK1Pts
+  kd2hUXfYmRUQNsnW0DDxt21kJLvSDJ8B1TA2qSLqyk5cu2EtuJ/GbRY=
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-etcd-n3-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDiTCCAnGgAwIBAgIUcUXeEvwN2cB0riE+PYt3T9sv/OowDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMB4xHDAaBgNVBAMT
+  E2NhbGljby1ldGNkLW4zLXBlZXIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+  AoIBAQDn32+61O1CTFrbkBev4S/YKTK24lBxE1lhQLG44Om6WAMnIIWdESsVOZQd
+  72CZ9kH3X+vUwd4eum96SgjrLKI1zYYPKBwf2BM5yMCtPFVgcbKDwdaZHaMdy/93
+  8V4c0UToGjNyg29LOgvL3YIOblDXT2SIwxMv6cqxxClp1KRTCo1SS/eMg/gbztMB
+  S4QZaixa/oVPbwM7YTsAouxm5wyZ7j+zzUUBKSf0i3GIhRy5tZdyGOz0gC/TDqVo
+  yujxnWj8969HSrNeQMm79YAgjyBo9PbVYy2Qw3NUbZ70NDhSfslIwrmqPLO5fUc6
+  wJvPDPzAG+F7k/hYpB4Tqc+K5W5VAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgWg
+  MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0G
+  A1UdDgQWBBTQPIX7eSIvLApwv7PgOBC1sXYP9DAfBgNVHSMEGDAWgBTJQudT327T
+  VDrVdpUMOD0MidEymDAqBgNVHREEIzAhggJuM4IJbG9jYWxob3N0hwSsGAENhwR/
+  AAABhwQKYOiIMA0GCSqGSIb3DQEBCwUAA4IBAQCqxmELFIEAlkiyy+6B7JpwAy/A
+  Tp6t8Kd2r5hWYfUz15G8/YwmVCcNrXHNOqG9ikA1Trgdl/oG/cLPivctQilylBRL
+  owz+K8vDXKLHXd3NBB/PzZe33Qq/o0iXt7vN65AR+GqbtsJ7UEo9XwILosFLleJE
+  Bhu7oVmV3g3gPo1L5a5Rru6Qq8g7zY/x3+lSMgrmEMlZdlXf8F67E1ZjwiyW7NxK
+  gVaP3LHpnlGdFoapiW9cFG8Qzv0GuiDiV2VCzynPItUP1eq7nTT/MUHG/8rlkPKy
+  AtcnCjS2LT9uPwzNICmrT/JBqsNAz1Y9/D7BsAxXWiOoYaY7wK1J3DWoRrbT
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
index 9fe152508..3f4bb1fe7 100644
--- a/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-node-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-node-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIUTtgZZThU352V2tzMDUDG5yQiszUwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ5MDBa
-  Fw0yMzAzMjEyMzQ5MDBaMBwxGjAYBgNVBAMTEWNhbGNpY28tbm9kZS1wZWVyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAygM+4M23klZlO9aisBsXjSrX
-  7EtLPtT7ijyN8U2307PavK6ugP5ey/pf6ps0s3zpDHdXxHjszCYOdobVIFJlESVK
-  6wMUZ3sFatWBDV9ZS+17QVdgvplTUsyAaY2pG4XLiXCBlLJ+o5Fw+5K6gkXaB8DB
-  k/cBuInPbHKXtql4niDsHuTLwI2AehI1jwbi4Q9uds3dmn/sB9eY9W3Ga4kpO9zN
-  6gwoaHyhYnNiLO9Vvsj6bn5Ob0RBADzjOhfC0WCTcyyeDwtJOHQKBCuVcspvf+mi
-  pCUe2YmYtY1nJScK7XjgM9Dr9hiz+IY882Suu7Ffy+aFCYe89izCz3I4M2/Q8QID
-  AQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPusZmyU02IRGaA3sSkHTj+m
-  poxDMB8GA1UdIwQYMBaAFLpzzYtiEAOB+2uxtX/Dhc9//iDmMA0GCSqGSIb3DQEB
-  CwUAA4IBAQBBMm6MhG/B1JWBJjPC10RFt3xC37Bk/ZBf1b/6HyUF04IZ+0Mxoj7/
-  DPOSZQFvlvPaJ3bavAI5woUl72UPcAMCfDlb/QYYJpB1DJIF1E/QzyJSczZK9VY6
-  GC0z435tTGz+rpHvYjl8nrtRnX3lGMbOCcDqEpf1/fd4w3Kfl7Ci7Ei4cPCf5fOd
-  EZ9JS2qHtVN4pCRmNs7qMqQOJUbi0VAVaO9qoWu5wkHGsGFd9ZAcxGKAtDNMIGiH
-  QBHlSOrBnqczxPZFaOF1XPGC5qHLmmtjSVCmsgnJg62UAz/WJrFSaqavNP7WQdc6
-  9vUuSS7vHpDMoPHaJsmRU33TPNvG8G5n
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: calico-node-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAygM+4M23klZlO9aisBsXjSrX7EtLPtT7ijyN8U2307PavK6u
-  gP5ey/pf6ps0s3zpDHdXxHjszCYOdobVIFJlESVK6wMUZ3sFatWBDV9ZS+17QVdg
-  vplTUsyAaY2pG4XLiXCBlLJ+o5Fw+5K6gkXaB8DBk/cBuInPbHKXtql4niDsHuTL
-  wI2AehI1jwbi4Q9uds3dmn/sB9eY9W3Ga4kpO9zN6gwoaHyhYnNiLO9Vvsj6bn5O
-  b0RBADzjOhfC0WCTcyyeDwtJOHQKBCuVcspvf+mipCUe2YmYtY1nJScK7XjgM9Dr
-  9hiz+IY882Suu7Ffy+aFCYe89izCz3I4M2/Q8QIDAQABAoIBAFdoght5R7XdBh6X
-  J3u1rUIayKToi11bgJ92xiAj9ad3iezcVItiBRiTdE8p6urC4H/RX7uWazeGO/nT
-  K4K5xBtgHIOFqJ2B4H0ydo2XtSaiUhOawDSYWTJZZDLH5eUPxlrowFjbxun1c4KX
-  IXZezRFPuTLRzP/ROVv+VWDnAVbBuGeBEjHMAibgAdbkEDPro3R23emd6bLb5Vf4
-  hMCTPTWLx7LKHHIvmjszCO3vqZBC9EJ48e3CkHfXQ/2kKaL4zEJjj7bCF5DELvIs
-  ZR1lnBn2l9/dNHCu+iNUYqg2SHnj+22R0Zcm6vEYfK20vmgfXR5CWMaE13MlhZUr
-  CVfdQkECgYEA+VYWCIBkBmMRFlKRzd3vzpSeHSoNja/CmKz6uwoHjHbdV5f+5XtO
-  G1RTO88LsL1eRv5a2y3IQplDaJ7LO+POfpeCMmqH+JKssVR/ZQKrSJ/ixGOoXdYC
-  dyzkNZyO+gfTK9eEbM7zM6Fa+8VmJFOY9Fl4lPD+QNMcdpe/XVulZgkCgYEAz2lh
-  SS21HBEd6gJrNsISK3hAgPqSrQ8h5mIyokm33wISHH+Nq4mT/ejPvQ7rCvTmUDEt
-  VP0IDqqmIuAyhk3LJNFEcSorq7GZKb0aU0A5EOfI0BeeMvQ9d1SxQ7En/4/stHbB
-  xliWP4MYGYl8nLmi2V9QQRpkJXrLriKojLDJDakCgYA/pFGLafoeBztdT0YYHgYP
-  3K9fElTTTYGGJuD4zN6QY+arbQiK2qZdI3D7WyXIvw1JYbMfLthm52flVGLbrpIO
-  je2VoMuEDyw1NzQtPDksGGNxbV6UVQPcF4FIjeWQvF6SWjha7Zf2HcFzcjdYHl50
-  QEIfAkRjl380ZhdaZQIawQKBgEK2yqwXH6Iff1e9326FjgKdc2IJNxSjQWwxOcgp
-  nhMFP34bKR576jZJpEhTfBbSHyK8LrCfku/kw/uD0byRWT5GcZVU0ycuwO1D/iu5
-  BKIDa/xDHIeXOA4iF8KGQS9aw/BoInwCEpHrQN018/cVXuQ8XDwUmRHVJZ6lV0Gp
-  u4HBAoGBAMx4xPWad4PW7Q03CJSBFLP4AXY5gK9116C41+edtRdYZnBiMf5zKpdb
-  +IitxViWsdwBbGvkSS+rhOFXLuatsfo1iQ1Ehe2bpbf6e1jGCbjE794vzlesuYyF
-  pJHGUpeNBhkRGsdnkDHldo7Mj5vuu07rm8jJ2uygCz4lPkEHi6Fv
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: calico-node-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDWTCCAkGgAwIBAgIUTzATgTBqtfJlwRU825aE1VTIwQ8wDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMBwxGjAYBgNVBAMT
+  EWNhbGNpY28tbm9kZS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAyhtHkJnZGt9B3o5dBbZd6lvoMh9Cd4rSaOcVytay2B+K5pd70V14xjlYCynl
+  h19sBt7dF35dTrujyPBmKvp1+M/+JsEaYgcE4qqILaRBRAFx3FcVeNL5hCASakAH
+  sJGVsixZosmpHyxJIByAMAW5a1R0SniktdDgdsihoeU5u5/MdLlzfe3duhX4IZnc
+  hFwZJYiVSroNbQANM7DMj4Qq8k7BqhsDU35FD0KFiFrjyohhPug8gyvPpw2ZBrrF
+  CFMki3whPvn6AycDTkp8QUWa6p6ornHxOuv2iNZIG058MmY17mDiw4hCVuC33QRn
+  H2MaRT1NDbK9UxzSNAK7mPhSOwIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYD
+  VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
+  BBYEFDbs0ixMshwlbet24SQmBIhdVRr+MB8GA1UdIwQYMBaAFMlC51PfbtNUOtV2
+  lQw4PQyJ0TKYMA0GCSqGSIb3DQEBCwUAA4IBAQBfMVG1W2qsPW9Zg9jk7lkD+yX6
+  5nx8dBzwm8ellSuR5KKpvjnqfV5WONqEEULzcP3NlAvg3XrvzHUZShZn7/IE0Gqw
+  WT8gTAHMYK5zQqnTeE2MONj0lmy1uYpyI0v5hQE8PPqzya+WRAXQZeQa+4T6JfLl
+  pZArXRK8DI25iPsbQpQTzW73N7u0SKEiVHo6yXkZS0P6eerNEFV5rKVmYKmS0mIW
+  6ELK8+E6PH1LcHMT5qX5KG3qJgBJlkYHEtF4ZOYv7kTaTMg/6PhjelD+0ixHFKX7
+  Mi6LsmAfLYAeJWEjUDvq/FYAiE7/HO00A9Tqfsx1f4oNE90WME2V7O2h+Veu
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_admin_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_admin_certificate.yaml
index 2c4988c33..7847eaeac 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_admin_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_admin_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: admin
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: admin
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDSzCCAjOgAwIBAgIUdQAMd/f9qXhevUCqA+htuxKrNoEwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMCkxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ4wDAYDVQQDEwVh
-  ZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALc5P3s6YE3dHKUe
-  hl7HT03nY3zIxlwty/v6+XwmjYM+QYZnYUh3NJiSlwzUAO7SZlDcgVk/H6LG7n7M
-  fwfiqFMitHt+3eDHmWn1g7Hc3wdG+LoBwTcznNIoiZ0GxHNkwc8y8GtuGX+GSG5j
-  UtsTqOZOSjjYRt1dpUMMiwzDIcjO8MSfqLYANI5BKtaoPGHGOv54qXF8pbT+nyz4
-  wW2kckm4GS/I6a5nFH0mfWmi6M76tATo4aMclgjCD6rSPR0OtpbwUJnWHWFN5kcQ
-  1JkpPQ1t8tAWOWvZLqlgh3dy4+B2UvQLh0CQfLJnmNzGLPezoMopJ8My2gLpxrXe
-  iNAVgfMCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRtsGMTvZAxbLYz
-  NUC31a8CZj7g1jAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9JE1ikjANBgkq
-  hkiG9w0BAQsFAAOCAQEAEZWhWiAAbSaQOU1IkJ0ia2j4ByEe4CaWAWKswHLwjz8E
-  WLqg1MVz29CrHqZtlpxSKmaWFLhqAEyinuIJht5q28KD44VRyfp1RKPYT0lieJHZ
-  6+kcff4Om5dtuP0sEos9pdXyEbxncYgvsWgbRM7EaOQIJTeQ89EuV0sod05e6OKD
-  HrpEQYiuwc0/BpGnPKQ2VegNG1+6Nrfma+IqUn0ZorE/Uwrr+Rks1fJVnqx4QbQW
-  IsLa0k5/P9EZqLxyFIVYRzbRWey/GHNG365jtKDf+wjDwcCLUzLbvA3Npgygj3In
-  D2hkl1ZH34evk+QzvpYanTbdyD8nmZJ4lNt/jnqcrQ==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: admin
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAtzk/ezpgTd0cpR6GXsdPTedjfMjGXC3L+/r5fCaNgz5Bhmdh
-  SHc0mJKXDNQA7tJmUNyBWT8fosbufsx/B+KoUyK0e37d4MeZafWDsdzfB0b4ugHB
-  NzOc0iiJnQbEc2TBzzLwa24Zf4ZIbmNS2xOo5k5KONhG3V2lQwyLDMMhyM7wxJ+o
-  tgA0jkEq1qg8YcY6/nipcXyltP6fLPjBbaRySbgZL8jprmcUfSZ9aaLozvq0BOjh
-  oxyWCMIPqtI9HQ62lvBQmdYdYU3mRxDUmSk9DW3y0BY5a9kuqWCHd3Lj4HZS9AuH
-  QJB8smeY3MYs97OgyiknwzLaAunGtd6I0BWB8wIDAQABAoIBAGqsffU0y5UJwv+v
-  gfP0fouQyC+ChVptn3GZcV+C4qkiueuSjOUv4gNidWcWl2R0QvWZLAXV5olS4NAa
-  J2tj3zRn5ERyXKPeEcfLFV2cho0qGO3Sz7df6VHCIDy4D/BPHTeRJMCnXVkNyWXb
-  lgXOsGtF8Zie8sM3HlynFN3dTfIm7HMt/5oSWT0yTOO7reUT7ASTufMYXfSk17Ix
-  IaW3WKXxZe3XhZ/Nx5TyaevzGX6sXrtVf2a1TPWCeh8Xdp3uhlXuvHEVmmsHBoM5
-  TM11caw02QbhkP1Hm8oVasEcEPVMHmWpO1BAOhmG8YsiGcOVH+llqT9qm1n2ue7x
-  sqp5/sECgYEA7TbHGZkWrOXjWxmZy8vWSBpjYzKV7QTF4FY94ZdIf3Y+G6mshlzQ
-  5lPgldvml2FpHf3AC8e/pPNXBkOmrHuRaND6GOMgfgsFmppgnZvE0vZB1IErE879
-  5XjJFE5NxLVKE33/7tDjjkR9i+IXEuQOO9Q2/WfblX9bhmcK4WKHmOkCgYEAxbvh
-  03eAYuutXqjl2dzo1F+ri7VReQYU+B2ntrQilOMivlPO6Z3VyeERT6qGa1dBJUKT
-  VXdjyZZZCAz1sPXUw7Fe1wU/isaIX1ukKiuCo5CRIBTTUP1HU0TtFOsa9qKlEizB
-  YlKPa+iGwmJ+HjLI4GUYVkg0+lvgWMyPvr+QensCgYBkzPc0KHqbRCEl0C4rjNXk
-  09nSCGfvTSzs1Jj9KPU0vMFNrf9TJVPb3F6+L7DAOTOa+/5Ewz/rzz/2uH62Itg6
-  izsLolBnXzWlad6Oeufboat9qtnsU/ROM9J2n4OqiEMPH2bHS9q21OHotE2LyH9H
-  6zjm2+BSmckBxv23os/uKQKBgD0trWhVQAbbLm/sR/mJTQxwcU4vkn6kcBZ4bmyr
-  /Usdn6FNouZLLFti5I1GkIJjo8dYeudloh08BF3mTJos5WCK33IdsJRKauU+IGPf
-  xHLBBvXrG5qiUtAjskrXlycaGYKvEEJQkwlrD07TVHwZcGdlQAtqGeIgTSCMYik9
-  cgFDAoGBAIDicx9MXqDFWFj5VNA1MunGTNh1K4j/8dLhmEko4utNjQDu+3JMOEOq
-  AB3uS4pKJ6sB3KD2y6Uocb27aKhxtRmRbQNGYh8arVh4M1MYzwOTceWG3NfWoGbj
-  1WhS9P71bI24V96o+DwRXMnm0LAqpdWQo55THBbNr7YqSJEYsNdO
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: admin
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDYDCCAkigAwIBAgIURIw8e8BY3jo50vkTFqYOw/tfFaYwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMCkxFzAVBgNVBAoTDnN5c3Rl
+  bTptYXN0ZXJzMQ4wDAYDVQQDEwVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+  ADCCAQoCggEBAL5fbTtQjNzVAs7gWASqToH4wx4XtK3JgqjWHDksbphA8BM55wlh
+  kQAReAFUPHH/NUhKs+v85OPJq46sSagLi2tDdhXhr0CVvbEbsJW/CkbLsZnKQ/Nz
+  J7FsNTlpY2H1JwU93pjiQ8sbudibOvPUG975lZcMmQ6N0L81TfFgJ1LqbQgoYlSF
+  NhcYY6nD4HGm1KWBJjjwkQW+wnExMOaV6LPnjaByB/SXnC0YEOs15b6WDlb65tCj
+  gEb99EGte+LzwXPDXn4Xw5bdatuwYGdTkICgfYgtQxOvA6bLoZWT/GRRMFhUXUWE
+  mxIU5mBXEntSO3wdCnrrbNNWGr7RF3uSsu8CAwEAAaN/MH0wDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBRjVXlsZKwqCYILpK6xxIF1nsofOjAfBgNVHSMEGDAWgBRSFqAR
+  qb+97tTv3JneKFPRJ9sDNjANBgkqhkiG9w0BAQsFAAOCAQEAbKH17DIOn+7/iN2b
+  WnTTQJ1uDYGk6kvyOfVbihwOz60j+zrf+W2ejVQYNw1VkmyYjlja7O1v4gX95FKo
+  85N6oFmWOlrFMsQI42EvbXHTPHFBWBWguf6s2+1+ybuD5LHkn8H2uw9Ou0Eu2M2U
+  QsihvoEQ6rE6ABDp4wbBkGhoTUDXi9qCfIhPfEB9Tp5dhNo78OV1Liv91zSas3dG
+  uM6/8zZhNq6XiLx4BGTKk0BbI9MuqJRSNeP0mQs71llh/gP15YcGi/E6aPpAPVeF
+  DgOJZr0BmUI6UcixGV6l82mILfABX6ISq2eFSI9uP9Xs3+ddsbzwri/elGUGbRZ0
+  el2pWg==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_apiserver_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_apiserver_certificate.yaml
index f2f29134a..99e2774f0 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_apiserver_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_apiserver_certificate.yaml
@@ -1,72 +1,73 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: apiserver
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: apiserver
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIID3TCCAsWgAwIBAgIUZlfHbRhnLsyDiOTCa/z0ipxOZlswDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMBQxEjAQBgNVBAMTCWFwaXNlcnZlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAMptSBnJDAH7/p27CBpmpKiqK8F+N26/vdLdfA8pZjuk
-  gHJTccQYhK4pbmiLm5ypBhIgOd3ljIaREH7CkZOsAveCD4SUVusF7l6+z5rITH9c
-  8ntQwzWb/n1Zy5KwQ5SsDtSHTjSuNhsl+h/v1Snf3G7L+2/6oSuHXo6wN74M6B+Q
-  s/DAg315PKsEoOj1IteAcufoYzipYo2YtSoQiJcbtpi1REqhETOenPiRrpQWnQuD
-  WDQkmRQFJyZ5Y6uBNdml43inZ0En0WCocZ1M7hiqFzeGC3P5ZYQLPddGdGgmuVsc
-  rABf6pMiqiNj+vWd0VtwjtDeLQp3XlsbfZy3MKrei+ECAwEAAaOCASQwggEgMA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUO0qMr8q475M2tEeUT3I6sH+fg7IwHwYDVR0j
-  BBgwFoAUwJXseHjFmBl4p2x5Nm6EPSRNYpIwgaAGA1UdEQSBmDCBlYIJbG9jYWxo
-  b3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMu
-  ZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIka3Vi
-  ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FshwR/AAABhwQKYAABMA0G
-  CSqGSIb3DQEBCwUAA4IBAQCbuMhaiINWiYmh7uxa7UqzR9vzJLA+TfsXe8R+euP0
-  aQaDmC4QTWOnqKdujnE/wCoeA1x7YlB+tHip6/BrDHKjTDSmas1VxVxwMTgFhjmV
-  bfhwXdCF5yJs1DmNmeaJK42j7VAovtgWNq8vWc3QTs1USjzrsUDEAwiovGycGhHx
-  SkX+ZGHolNFw6Fpk1EMNnUGuWwlE+Vrft5Mf4APwcHsN9XWSt2PPt7WxJtBJjQ3Z
-  YSGX9koi0CpFszyI/YquajRMAbodvoluT/dR4Rayzrn2SGPrL1S94DHdRd6WGnkZ
-  FWJEUc4hs2DfhYzbtOAYQjL7gEFIGgfgQCeDAKMgWlY7
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: apiserver
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: apiserver
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIID8jCCAtqgAwIBAgIULZIS3sA3U2ixPIVkmufhhu9UFR0wDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMBQxEjAQBgNVBAMTCWFwaXNl
+  cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMk7aqrG0GLmq648
+  +ObPUc405RI+nkQ06FBlse+meODlZpKr83msaonjk3Z4wK7Q7Xx2XAX5cym+wR0s
+  gkfGz+c9HEvjTZB6rHb/fS2iU01K6rZ3Ersuesf+t9tDu3nd7uRl3OvpEkJOq7qo
+  VRu0liV/99Q8nNz/jmJtd2igz5N85DVILgrfHCDoNmuF7TFORciSuD9hML+Cz/sQ
+  IwoXx2Hsc3cEsOcnVT93bnQqm4YM+VRk3RHE+fu1BxYEqdW1GiEftdSBiDFQE1c5
+  NN8+LPFfhseTN1juZIhP4AOwhLtvk9b/+VvmMD9p4lXZKruQ9j8ebwu3hkFibO8z
+  oYT7a0cCAwEAAaOCASQwggEgMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUXBEqpWiv
+  X7yOTmcswviCFZdSxuwwHwYDVR0jBBgwFoAUUhagEam/ve7U79yZ3ihT0SfbAzYw
+  gaAGA1UdEQSBmDCBlYIJbG9jYWxob3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVz
+  LmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVm
+  YXVsdC5zdmMuY2x1c3RlcoIka3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVy
+  LmxvY2FshwR/AAABhwQKYAABMA0GCSqGSIb3DQEBCwUAA4IBAQAKJPAy4hkmbTUc
+  qDq1aciisVj1ikURP0V4zM6yVHdINkEN+uMfkZH82IGv0r5P52PKERv2GQe7BVRR
+  40fa2GaNuQYhmAmnRP02RY2DThMNTGDm/rMgiTEYsNOXJeBBW9GMLIFt4YL99A+r
+  w6HYFMeqSaRsQRsmj4jn19+LtJImLi0HJ57OkaPXo/uSwZg8Y+praG5GTkPUFkun
+  qmLUdmO4+IM9Rz65rwtSL9QK+jElvyJj557yfcUgQHPeBUmmpSiEUDhqEL/fvxd6
+  nTzE3mZFR9FkTzlyG3+fTg2d0nJVW/i9MpSLNSEP11UQtnNE0jmWScsKcNAUWsmD
+  c1PduzwB
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_armada_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_armada_certificate.yaml
index fb07ba3d4..5c12f16f6 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_armada_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_armada_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: armada
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: armada
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDTDCCAjSgAwIBAgIUM0OQWvJs8Hklb0AHXaYmXZUPamMwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMCoxFzAVBgNVBAoTDnN5c3RlbTptYXN0ZXJzMQ8wDQYDVQQDEwZh
-  cm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5/uQQJh6r8l0m
-  PPnlhWWP/l9yi4yU5N7iIvihErUtBW9RWhjXnuwTUmYWzhrBUNAwZJ5XSg/vHuqf
-  L6vJykJwvyHFrQXd3cVuKXCKrvgfWXMbBNAb2ERdn1j39WOJ9USS2pWoVM03Bst4
-  M3/Ket2VeFOtmLnCrGzxUQhbmhGheOetZDST3N7JyXqcaAYOa+qjIxXwYRpwiLxr
-  u0pcJHDrP3NmhOmDF/0KewJYtKZK/NyGX6bVhjVfROWOsjvYXYVuLkv0Ahe8TKrs
-  Uhh6HBLrMKwgeCkBhHzKsLRIFTKtLUcWUu1NacxgceMv1+4U1AcnngY7XZfSljXQ
-  arx0CeNjAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEF
-  BQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUojO/ieDW7T2H
-  XpJrxLPYTha7YqQwHwYDVR0jBBgwFoAUwJXseHjFmBl4p2x5Nm6EPSRNYpIwDQYJ
-  KoZIhvcNAQELBQADggEBAA4126lb88Z8IzpWQPQqyHOH7M46ONu1KNBlbpFI7rsj
-  9O8bJuC+KhPn9d5kndoCut/i7b0/D0IvzVzkUr/zbYzx8j5Rztj/KL2jKVBQS224
-  el02DTtjvhjZjtLqoKbSIGYgAZFO5FlQ5FkQdIAZ0w3KhdJSQUF073OThejD7er7
-  cFyVnPKAUDrIoRp/tMPELeBgauFE9LbcEp80CBIjI9jGHhp/BMr64O7QINmCDJ6g
-  o+R+JXgCP8eUFgpn+E3fqTISxBKRdbbNJZI3N4iB3mL/x8ColKduv4cTnu8dkei5
-  zitgJ+66Dz/deiP97YkrBVGydK8zFmbkTZ4gUOloLoI=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: armada
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: armada
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDYTCCAkmgAwIBAgIUb4CI69iuAg2N9zx72dg5mfuKzGowDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMCoxFzAVBgNVBAoTDnN5c3Rl
+  bTptYXN0ZXJzMQ8wDQYDVQQDEwZhcm1hZGEwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+  DwAwggEKAoIBAQDcXQnop8mUHaj1VHNvGybqYJXgHRez1KSscoSvn0YjrRuLOhEV
+  D9LwzDazB4ckI0+eGRiFDjxV5QBPcddwuz4j9UL2maitKYF8qjcdbo/tuXABM8Am
+  w1Ube4nDOsqQblSBh2SS+rzlshyfh/5XvOT3H8FupH42GSgAiDdONjOyNuNB9p64
+  ffe/P1FIrB2JbFacs5XeZKdAIuLuA3a6MzIryou9H0W/7UysGl5m5o1TGm4G6y6b
+  6+B3TJQX0HtlpNQGAphC/RMBFsT3BIa5EnvJNaqfwkujUojRQJz0CJ4rYehv05pX
+  MX0FDXYBJfGDe2ENZMUhQJTYxyD4bvrjlC7HAgMBAAGjfzB9MA4GA1UdDwEB/wQE
+  AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw
+  ADAdBgNVHQ4EFgQUHQ5z3p4H9z6b+1gpSWLi5lyO5dwwHwYDVR0jBBgwFoAUUhag
+  Eam/ve7U79yZ3ihT0SfbAzYwDQYJKoZIhvcNAQELBQADggEBAGFK2hG92RY7CBDz
+  RBavK45EkgHht5hOrJZ1TmX2lGcRCPB4Z4jdM0kT/S0Rq4mFUAWmCFUKZhxUEUhD
+  lOYARiVK13nhQbqd8VjSoxd9w68HfrTsaWcSh/AVhV28rjol7798TWf7eOjuSyxD
+  2HIO0O7x3fRmrjyZ7cUk8eDGec7JhAJLi8p+qYmzL1ESQPTOZbG2qLoPtgpWCDVV
+  qDWOUknNTHtBa9MOOOeyKBG1BBgCOll7AONvOjY/t35jD7p4Gsr4Xv2DgtzIadww
+  dUz/j1y7Z2eYVAGGRwauYqGRoir76VU8P3YUZN447wjfbPntWoYe2m83WkovXwwl
+  6rfRM9U=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_ca.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_ca.yaml
index 09006deef..c2a286dc1 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_ca.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  JCkpm0fijMLfiogxFBs4IqA6R822YC1131vXsQ==
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_controller_manager_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_controller_manager_certificate.yaml
index c491a0ee7..8cfa68712 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_controller_manager_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_controller_manager_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: controller-manager
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: controller-manager
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDSzCCAjOgAwIBAgIUWJtZBxPWA3jTG+G4Hqxa77OidGswDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMCkxJzAlBgNVBAMTHnN5c3RlbTprdWJlLWNvbnRyb2xsZXItbWFu
-  YWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDsQAoNnIEiA5Pi
-  3mkSPPx8Of24ATyX26US4i2PG1O+KQIxLoXpVezlIcjB0b5UoCEj4E8yuSPw4pl1
-  DoMFOMogl+SgGHcsOyAdj0bpDIPe2jyezuvm2K6OSMyoxzZA7ycajkkELZk8s3Kc
-  CLgj81tll0HEOEph+ywhHs7lpSHWUBcXqT8lsO5/uhT1M3eE9KqB+f+7SOZG12hi
-  V5Zf+19Wj0CUNGwtIpoS85vhT8qhLGOrv6za32olAucnB+sGY9pHvKEPQcF8L17k
-  HLBGf0zbOs8XUurQazmKuGk1FsGzXhx2RMvoi68aNYe2u68urcazlsELvD2xw04B
-  L+alczkCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRo7NNCnD/3UMBF
-  uKTDvVXsjB3gMTAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9JE1ikjANBgkq
-  hkiG9w0BAQsFAAOCAQEApeHR08BLPZDtl/SNTmElrCyL52yeKDOQkxU77oEUfdAy
-  gbDbWF5baMNbSxdjeXG5r6QE0kGN6PvseoI8l8DfwWXGUFzuiYFWOzYe+S6uzLhG
-  j4D5TLyLYUzAxK5Kf7/YWmguHBQ7hpc3Yh544S+JURFEVzOwVW8Qvp4VjxeyV4My
-  3+4Or9hAqvEmoCXsYeW4kXSu3B1XqC4PgPYdOR8DSuz/NSsD9ukczJvEfNFvXLBP
-  T4wpLDSofu3b14D0pE6iH5gdy2tNAUk4jYnFn+rLtHZfjQpS04YTkiWiJDfRgDve
-  lAB/2vPyhSG1p366c2PZADuKoLMvR4RH9sWlSy2ECQ==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: controller-manager
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: controller-manager
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDYDCCAkigAwIBAgIUb6xS8qzfPMMd2lAn7m43USZKxF0wDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMCkxJzAlBgNVBAMTHnN5c3Rl
+  bTprdWJlLWNvbnRyb2xsZXItbWFuYWdlcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+  ADCCAQoCggEBAMVLm89nD3N+mtlYUDN0Mie+DAvXo5W+cCJSSiuCBQ755/ZrQiED
+  xH356vh808IGJQiiXGnkZZw0QfpUOadH73K5M+vPpEZeKugAG/UIH46jrOoiwPMU
+  p/BnVmSNI3bnYozQfB3esR28Qrm/7FpcXf0CP877k66PCSdo4x8IaX4vECeQt5FM
+  SUFM12MUDO5FRDxMvEE/YD4u4hLvEV/Br1fqq4vdG6zRPcRFvfQTLqF2sNI8vFIP
+  UfmeMXF+CsLhoiNBIWxj+hsJppSAGDWkCsPxDntdMmCAjVwSkvgvinNsODzzyhl6
+  4WMb+Bd/OvoYNePJVi0NHAp1aQ0E/ccVpzUCAwEAAaN/MH0wDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBTma6+o5gu6hFhl50GPKQ2CiTBLaTAfBgNVHSMEGDAWgBRSFqAR
+  qb+97tTv3JneKFPRJ9sDNjANBgkqhkiG9w0BAQsFAAOCAQEAJWCD4PbUlcMI0aBJ
+  QFyYepUMGK1Yt4CAca6pMzWNCFIbg5s9irnzsAhN20RgqbXXZ1IJLfrPdPu58GLD
+  Z9FGAx0t5yd9eTJWV3AVpfapxwr6kEDj0UoKuuvSDNzsG8lyc3comAw5a+SjDdly
+  Mm7ZmWswP+XUEYcOJ+RJWA8NtUEYMqNQHbY2V4zMmaFP1qY5SPhndYTYgzHCEK87
+  Cx9bYGgrYMTvJnSX7veJiYi9u/+H3AbgsJP080WL6ugvSrGqPnpHjJn9GzV9KJtY
+  Pa6EW88gKtAdyy/O4JnADrww7rWnvikSJLPByN1BStqDymdfYLNz4PqLhNuojoth
+  CZE+rg==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
index 80ea1ed42..2b76be853 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: apiserver-etcd
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: apiserver-etcd
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDOzCCAiOgAwIBAgIUbN9MUxN9pDNTVSO/iGwhnjNEGcMwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowFDESMBAGA1UEAxMJYXBpc2VydmVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAs62/h3/xSxX+JqCVLB2gQax8pqlGdXPk+aA5
-  cq7MdjJeGUOnvjf/x0ry65cl3/IClCBExAPzhVQ+rJCDrdAeq35flwsDtj8exPOP
-  fMa7nqr3fPPzTlhb+ofS1EsGbK8ZN67Soo8KJAc1zTn6QF0CMGMUzzs1m0HGlpZn
-  TA3snyCVVgXpogI3sf49Yl5IzVWSH2AtHAM83qTep075x0P1XT4xdZd9RKV6Dq8d
-  0cfyxc8QvYxJF6+AGSjDQDbIpKnfo4OvDw5vPQLFko8qk/AnDsS82p6qNzdAIHYS
-  YjJ+K0ZQalo8h5AZYU6OHkeLFhynC5dIpNnAtp3Rf9QcIIl9NwIDAQABo38wfTAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFDXvy9OajHoXxJj2R+VrWc9j9PjwMB8GA1Ud
-  IwQYMBaAFH57Vchc5wL3347tj5xiP2cL3kELMA0GCSqGSIb3DQEBCwUAA4IBAQAl
-  BCa2P7DiYXnm+555ju32tfx+ZSnAzDkz/rHnWNkSq+DHdEBobh7P+KIMqnq9GMSi
-  K+Cz2JDBH9giI3ipOEt9Da0tcCLkoskbqnCL7vhmTEOCZbdNpCVitUj2V0Ql8k5w
-  evIjsnD7Dtn1CoXCfV7A8JlaYAyaJ+LoaQnWYGZkudGBCrwEXHbnmwI7JrC9v+33
-  xc2ZRaoT/roA0VoVaxrJfb8JYaJ2b/Xpk1MOl+dUzvvCtiz2dAFf4xl9aZH4qByD
-  EP6yNYijHTKPFupLuWJmcBkFhFv1u9rfNOO4A6dLJrOKBVp1cQNdylwe71kIjBFb
-  4Zz5cMvuogSDRB+7RRkA
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: apiserver-etcd
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: apiserver-etcd
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDUDCCAjigAwIBAgIUWfrIAVj8wFbn93FpZwv2UL+SfEUwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowFDESMBAGA1UEAxMJ
+  YXBpc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUsora/N
+  cY/vMlE0o4zoexg45UhIm2qJMbSJ/hzK1KCRd2/V1fa6ylBLpcgNm6HXm8XW3X1w
+  WDgcD8zYiaDhpTpE0qYY45RG/3xR8NkfKzBHI2fryRHXeG/+YCAC94tDrDz92EgF
+  Z7VAMTiHIjUA/7T4tfp237XHDbTTc6s41nRtOIHiPMvjixHuRznrMukzTInbv7wW
+  yJW8SqQtFrG0qlhtdqOY6/Z65yFzZCewJImNgfhNNCgE+O7LqX4km3/MtTl2tTto
+  NO9W7vtd3INYw4we1FFJf4hZSDR8fGdtmqzoW5Lpom5tnDXSVFvOQt1kGghAuI0G
+  yRgTXGuW0EMICwIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
+  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFIfM8Hld
+  VxaPlWIjHYafzx9C0+T4MB8GA1UdIwQYMBaAFKuYMwuGjpMPjL8dADSu5z9hD7Ur
+  MA0GCSqGSIb3DQEBCwUAA4IBAQCxLgyVvXVlg75DixgltUHvXwIug4ct5d+dxhHf
+  NPn0HQZX1iZd9eDF7zPN63BcJsP3SWjJ0DMZJUppYwHgmACVu4bjaOSkAfXRFxnt
+  zhXsPu0RZDLIaSnywZaHKhUFJRwg5NWWrewjsVwjXPNIW8tKfCYZeeHSBScGF/pe
+  Q4AFo1Zzh4jU8nUdI98Z6+yrLpxUh7R2o+2WboCDJ+hzPRE4RFc3KGLdAMK7RTzK
+  0apqEZpQNv9WzfgDsuwDeN5MgZsODX+PwrTOwc6mrsoA2czy25regXX7i5xU7SXd
+  2k54Ud9l/3OgBWnhb0vxmdfya4jBVA/Dk4dUuMfJiWyqOy0t
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_ca.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_ca.yaml
index 4d8ddd49b..d2c419f0b 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_ca.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDUjCCAjqgAwIBAgIUHQZdy5bo5mho4S6Zta+pTKD6wyIwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI4MDMwODIxMDUwMFowLzETMBEGA1UEChMK
+  S3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMIIBIjANBgkqhkiG
+  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwUKHJ8KRaTM+376IRxtriXbnDP40tzvMq5m5
+  NoEkfWyZ7xHdBy6+FrsvGtX0BcHjJyCMXZxvu7CfEBiJNee+wySiuhXkEdrpCXVT
+  oEDJdDT5Yy7kXh7q48bjkmRYDojI5sEhyOy0Y/E7AxzT6P7D9wPKmln4qDFUKKtT
+  HRT66nW2W6W7fDOOehidilbduMH9h9/vkqsa4ZA4foj+rdIctYAeov+8vCzG6nMQ
+  hDtgm6w9YaZWT/9w8TGYIw+w2RSmgC8pth1RIy1HfhyWMptni2jLuRTs5dPifYjw
+  nD2xgpM+kKPU89HPBUMf3lmUQcgYQU/7zWgA3fBDFZp0e2+PgwIDAQABo2YwZDAO
+  BgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB/wIBAjAdBgNVHQ4EFgQUq5gz
+  C4aOkw+Mvx0ANK7nP2EPtSswHwYDVR0jBBgwFoAUq5gzC4aOkw+Mvx0ANK7nP2EP
+  tSswDQYJKoZIhvcNAQELBQADggEBAAMrcr5ZQgx8cjoNHrEf11hKTbQNPN1H06Vw
+  rnwyvqRQo0zEcVh/YAhCjU02vgR2sbbYVknnjMMFuiV4tf2Xg+YwC2TPhiVvMIAR
+  656QX/7IYuirem49oD/tGgsIBawNRNA30OjPHB4AHgs5EZqNmaE2OOzOwIpWo7Or
+  w0V36Z7SYid+yrAAGuQE+/ofEAZDqeq3ji/4Cxj9jHWF/RSkfckaVW/VEwSX+SK4
+  F4zYazsBvJem5oeB3aTXK3vsCS8t6j2Qm2YfTN6vMKBJETWjMFNMdJ9v7i4Q4JPS
+  jLBunHhEEcI26kY3ZfRRAjh2Ozl7PeH7Jd6JiI84vOJQwdLY1rI=
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
index e77eccc74..45d24c275 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-anchor
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-anchor
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIUGcuBhbYUItoT4sGUL07tGYd2kLIwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowETEPMA0GA1UEAxMGYW5jaG9yMIIBIjANBgkqhkiG9w0B
-  AQEFAAOCAQ8AMIIBCgKCAQEAwkATTh6OEySatyoB3BpC0/+oS9oSwHdtlRctJVIp
-  y5RDRLs1ZeqLXAglUEqwlgpFDb0FTvBsfe4eJjP2UCaXAo0uWexvEGqm/Y7ZGPfP
-  /NxS8SaOZNlvnnZsij4j1ZoMsJA9EqG0U99cqAHt7nAQ9wPPBtJN2teYB0UrDuW+
-  YgTHSutkSEMpGmQ1pGzETSC+Pwic0hAKNMyrFzSYT5dG7gKfSGOvBDGhVhg93Ajv
-  cYlTqvw6PNL4ishFu2+q6MHE/9AhvN6GtcBC27vX1VnioF+nVY5RaoCVNfMIw6C8
-  QqurGnNM1ur7qTAgIgaueK0TqjQqPrPBXRp3KD29e4ajZQIDAQABo38wfTAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFGPe6Yt7lUHHsXzD0J2aBxXjcAglMB8GA1UdIwQY
-  MBaAFH57Vchc5wL3347tj5xiP2cL3kELMA0GCSqGSIb3DQEBCwUAA4IBAQB3WGLB
-  7vBmCltZsmfcfAGcMjIEbpPLZ/pfC1o0Kg5Mk1jU6Jf1lYLr1q7DoWugF9e7Alz9
-  3LKfWDaC2/jnHk9q4SCW/cjwbVQjUBvX75UDCEHS8WviMmBDJcMRsOs+z8oTfKnp
-  3bv9LPwgEfwsyuhySrFHxl6+4YZYl4P6DZK7KkgI90OtjVz0FFhR+UwzhXNOmfeu
-  QHQ0bhXgIygzZd7mNF3EBokdIPVNJEmUMtkH4tiPH7Sl+5UttUZctcnIoE9izDDx
-  OxYDS50pA0blyRfwecUT3HN8QVQ2tz7Am4lXAQRmHCRHy+kJy9j/pM2EIOBugCyL
-  21v8mmf4f7s91TcJ
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-anchor
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-anchor
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDTTCCAjWgAwIBAgIUKZ3sRLhomWmtF9EYUA5otmo3qTEwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowETEPMA0GA1UEAxMG
+  YW5jaG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvLq3ICrs21Hw
+  Nahk3yssSQjevDvdFh59aQYQVN7Cfig6XFg5naacU0N//pGafE0dSSIVMrxmNy21
+  MSv58SI42w0c23S4ACWWw+V4fo9hpeGOZPqbKT/X7o0cW/4ri2nfaYsKric2VvgN
+  wNEdJ95IzaTpwzsVI7FH3XUZeM3YWYKPVFDD3NNwosPEyITPIzHi/TnD32wzjzya
+  L6WjVB1XaheA5/UxNtgWesiO60P+9yH/H1nDldmknTL8UWRxCcTt0hfIBtRipXc1
+  nP7uGNqswBF4c+rtXIR8SvvmH69TGcHle7BwB9rxVROoqWpVMyaFpjqJD+8Ugdx5
+  2L4KuWLiMwIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+  BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFEuz7nlWT1ai
+  G0yOfFBycvdJDYQ0MB8GA1UdIwQYMBaAFKuYMwuGjpMPjL8dADSu5z9hD7UrMA0G
+  CSqGSIb3DQEBCwUAA4IBAQBAP79ZjvYdxz0mK5QFtByVGaxMJj5C38JJhJ8EF3/J
+  dm22Eemt6ARC4FHqJZ8AS3q3tRiQrL48GHgaDm1f6psO4rFaL051ZaGy0kAeaDGg
+  LlFM2Y6acYnZE8QT1mZCy6+9oCbirp5Dg2fqhZuHJBL28ZL5BPwaeEoCOfg2RL5Z
+  ylXZuLBnAlDYPOXq5nnFo9h2NHDH+zc1i7p1ZYVtqoFx94DaAwslJbmHTxSafxdd
+  HVIrNlxnIERUXvyZbo3RGGx2QvjdS1t6y4wKilpYwG6jDXuSiqZEEdK0w2Twu26z
+  7c+ds4+sLkG6QasK9zS6eTQz2hsst1OCGyeNG5cOu4iq
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
index 0bbc208b7..21b369fab 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-genesis
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDpjCCAo6gAwIBAgIUXWIeFXsfPe7T6kyB0uGOQkcXsq4wDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowIjEgMB4GA1UEAxMXa3ViZXJuZXRlcy1ldGNkLWdlbmVz
-  aXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDXYdLhGSNKKImlk+ng
-  +nwQbpaDt2IzLpNchP4eBBpu3JbO3c12zbchyhSrXcJMBWVSVvHTjuerJUfbZ61W
-  vcl663TjGmD4PKQVXT0frUVWRwynwqWfWGoxQanAzZ953C+cg6ew398fR0LW/HD4
-  JVHPwJBUz6Nz/FzBcPtx8SoQpBL6356au7Zk47zXXBrhy1IckaBdIv1veqs3P6Lv
-  rw3YAZ8Mbn4TB/sZWkabH3OyVEw6M1YkIZfr53vyOn0P4E9Liew46XwTzSBbADxF
-  u+oTqFzJwFrsIrxh8yZufo99upWqqVOkOKmkqZy3JPo/IblzwQS3053jGQpi0lj9
-  aKCnAgMBAAGjgdswgdgwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUF
-  BwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRGyEQ6qV6EcL0z
-  Byb41mQaQ3iiUTAfBgNVHSMEGDAWgBR+e1XIXOcC99+O7Y+cYj9nC95BCzBZBgNV
-  HREEUjBQggJuMIIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
-  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBKwYAQqHBH8AAAGHBApgAAIwDQYJKoZIhvcN
-  AQELBQADggEBAE1qvBalzFipqOqrf/qiKBMnkFtlR8YWZsrVWhBXj5XXxQUyqm8+
-  jzcbc8c/gjmTnS7vEkFdp2KUJNuBaVDNxtu8Lr78+k0REYZcB6cWUEQVZnokHUSt
-  Kd0ZDxtk7op0c4jHoK4jqcf/5r1M8OnaGcvLEeQoTFQwoI969vYZ5k/XJZamJlkk
-  agEzPvxGQ1soTQK4f/H9x2cBCH1iehiPKmDEbsWWq4voVsRhxlWOPYrs0gzU/e2X
-  zOBlHj2g+w1nyz082mxqEauvkvEFck3Hl1ga67tatEeNSkar0F/WfkOhxv6JIMBg
-  PnoCe0NqMgYu7mmkU+QdpCClIwpD+NtC/X4=
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-genesis
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDuzCCAqOgAwIBAgIUelTg63PxxL7HyP3nBW7rIXDVudUwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowIjEgMB4GA1UEAxMX
+  a3ViZXJuZXRlcy1ldGNkLWdlbmVzaXMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+  ggEKAoIBAQDoj+BBl0zvUXxbpzxIf3imtRGI2iDcgcmz82DY7lhmvSbO0+vBzm8o
+  O6guciDa7cuJ7t8KJZ8QsQLDAPzsXVeQ13N2wOuEPE/FMXkgHgGkpSDqFb4ud8X3
+  TICxzMdCK/eu9y9J7Y9w1A0GCL39xBJsPmeeVUCB1ZyuFoMZ6MWfxpA76EzYlqgi
+  iWec6HE6Psixa9KMOonwf0QbiD31n0sELO/n0u07eKWGSrqRGhD/7K1TV7k4bW+9
+  fA05SVOXLauSHgeWOIoVXKP5NOkNn/MomCYPZq5LOkzQlYex5EAcYTQmOgxIB5ih
+  ouMfWh006TuYpKjF/rUEbaU19rbAIsBlAgMBAAGjgdswgdgwDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBTS+6gtc5y1fzsjDbE4k9i34I2jqTAfBgNVHSMEGDAWgBSrmDML
+  ho6TD4y/HQA0ruc/YQ+1KzBZBgNVHREEUjBQggJuMIIJbG9jYWxob3N0gi1rdWJl
+  cm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBKwYAQqH
+  BH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBALNCkSPy1q6y6LkvRMqtoRce
+  nuWgiiWOSY9PnHsaCZh/6QEiU5K0mXnjNEtp4C/jVXb720tEHSCLBeva2878n9tw
+  PT4yh/Y2jRWu5MKc/kGWw0/Yn6QRwjKPjTUZ1oc5bJwDdesd2VcOboFVMc1pgwpD
+  7o4jFn1wjGvs6kCKphe7MI35ib3VNNFTUjnhuEu7b+zcYxP9gW6y01E74OA2TaWa
+  FEOisljLCSbtpoEEsBHXn1AymarOYg1UeMzhBm37m/wK3QISxQyxZur2i2i14OQt
+  KIDkH241tq+ExSdACob2UB971rq15O9twGzMEIDKkfChromSn6VH6tMNDOSG0CE=
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n0_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n0_certificate.yaml
index a153d22b5..91670b82e 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n0_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n0_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n0
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n0
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDoTCCAomgAwIBAgIULznxob/fGOQyBC5w/1zbcI5Dhl8wDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowHTEbMBkGA1UEAxMSa3ViZXJuZXRlcy1ldGNkLW4wMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3DFM3O0fdHq2eaLgMMJBqf30
-  2BRISrONGM87H2VqDn9c307SaQy2A0Gh/RA1Io93JsZ5Zj2HkucZqP2ahQR6kPnz
-  Duxy6LyL6KlOMuB5ZZlRcXR1svqOPSVezvys9aCTcYhoCT4//61W+TUBI9i5V76R
-  od2ZFO2sxCGxqPiVhhPPWBcn5JJMUmKRLkwj2v4RUcWuA2CJY1rms13ZW07ZwGeV
-  //xn4H0O7RO0ldqy83LhCiwQ6peh7KL35byBWHTKUIK2E7GgO004S9gsvd9zRlQR
-  nLmnaOBgoOWwv8mE8KTKk9zo9eZWDpihs0nGLiuMC+luqkfKuiQUscyDvMO/EQID
-  AQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-  KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUonLw1InntwUiTtR6op4V
-  TAyzczowHwYDVR0jBBgwFoAUfntVyFznAvffju2PnGI/ZwveQQswWQYDVR0RBFIw
-  UIICbjCCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2
-  Yy5jbHVzdGVyLmxvY2FshwSsGAEKhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUA
-  A4IBAQCGQQUgfihiEzGYwpiPZGHrkCyenUXysOvCgBFBqkYtfTjMn8HmCPQWihrg
-  blPX8wn1isko/KAnTkxK9xiytdV4qBgW4abJ3aE+pf3+vdZQNqOWvrf8SEjhPoo1
-  7TzpdyXCLQvENnQPV9wm0bZKvNHMjW4nnkMxnOUNfAaOkhiB2ke00YsgdGrZPwmw
-  mvAnlEk9JzaJAYM4iCvBDZ5xTgxuGlQsdmNOLf5wzVKXR9VtjMk3BT0OvsE+xkiO
-  0KIu99mE6Vll+j+UMBhvP/X5P7eRV5xF1N1hOnShfv1n81Ymoc5R7uzpF4qvy33K
-  o2hkI5wDEJ4/EwEtBQUFt0wqkeUr
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n0
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n0
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDtjCCAp6gAwIBAgIUaaKMOHt7k6V4K6T4hD5xeFL58gQwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowHTEbMBkGA1UEAxMS
+  a3ViZXJuZXRlcy1ldGNkLW4wMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAuCGO7cx4XXj0NcF5SK5Q45iWJsVUOY5+udwLfCVt/lokJkmDbYhB3XDmYgZi
+  82fdr1d5WCwYLw6Y0ey26+FhVoynw4gc+uNa2g97x0BJa/HRf8MnTUx77NTnb63n
+  fAbf0s0i46UT7SIZrC8mTlRTLU2vortMlylNxwFCcxvHhxRmLK7oS4L5IzuOP7a6
+  zabnGt5OYiZDuu0qRJB0y5Dcxy8gsgBhoHJNehZ5P783Va/eUd5SqAnJjcWn0erP
+  asfms5ctfqw1P223xwrDfNN169fEQes88zS2WOeiIwMHpNIzl8Y7G323PsdushQE
+  hytiZNcI4BsaOkKo+3YM/PW0VwIDAQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUEK0Yq0MyXaHZwnc6BiAEYGcr4dIwHwYDVR0jBBgwFoAUq5gzC4aOkw+M
+  vx0ANK7nP2EPtSswWQYDVR0RBFIwUIICbjCCCWxvY2FsaG9zdIIta3ViZXJuZXRl
+  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwSsGAEKhwR/AAAB
+  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQBGm0/Wt/dRh6EHn/rayVL6BdApRFx5
+  ECo0G2kTMFOltGGYw7py4/HGhvdhjWxJjHBCGfLiXoz1pHEcDWWiVJeLcSd5BX7/
+  Y1h5F1/k5UTVEPyQLOizW4WqvlQfOXizxH+rFJi7PRz3oXev0wWCFax3bgcRWOrS
+  ptS96IUauxmVpeanoLA3xpmROGY7RLdeKeQ6pVWk+Imp/t9ZiKfssOyarXpagp9u
+  VWo9VW/kl2g/KH8TBcFRh45bxnmWLVqaWsw58oJiTlRYM0k1S0Vpw8SDYR8RC3HI
+  TQMY3O0iXvaOI6RnMgFW6C+GSXL3s8+pErilhC/ijE3q95+fxZyYuu9V
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n1_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n1_certificate.yaml
index 86b8292d3..07b45da04 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n1_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n1_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n1
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n1
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDoTCCAomgAwIBAgIUCmEbNWF0otF8NM9Cvcvo5x24pnkwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowHTEbMBkGA1UEAxMSa3ViZXJuZXRlcy1ldGNkLW4xMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy8fEiJ8xXPTfAm1SIgR6lEBs
-  aiiL31FpKM94fru9/Yg0rcCHgk6l7dfKNZn/Tb4v3E+xhU/+uLUu0y+D8tMvK7jy
-  cNyc/eNU/s0DkwM7zlFHbC6DJ66xUZ1rJ234MtSOoVl3gfhOs8T3KnXmxbfFo+S6
-  z2fF5V9hHP6+PDpaYGoxaykh9AiU9B6leLZ9mEDJPj/Jo4LIOT5Fu5PKuH1YBa3d
-  IP+/UHI7rCyImmIYn6NVAvAWCUU3oytMBJK+fgtkQGeuLidU6oHlizwD+am331Hw
-  RnkcVJ3sP1DO6O8lYvtOjFEkECINhrmcg5hrHviQlY/SbliG/PCIl5tpt3vAGwID
-  AQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-  KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUtQe51VyiPrMMuAMERqwQ
-  wQL4B4owHwYDVR0jBBgwFoAUfntVyFznAvffju2PnGI/ZwveQQswWQYDVR0RBFIw
-  UIICbjGCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2
-  Yy5jbHVzdGVyLmxvY2FshwSsGAELhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUA
-  A4IBAQCn7OWsEwyvfamMuobBD8Db8976h58NW8jXXW4r4c25RU18SKSqwsGV55Ys
-  iHoJPf4v6iCH+BiR3LPaQsssG6+0lABRFUMJeW80TDyM/IEkYpcboHcy7gzGhWTU
-  BGIcESmSTNDM6mJ+Zof3dVNBZzH2a1HHHTgwx85u86bRqhVrhS+MpjvQvinjFg1z
-  r/mxdIdl0t5nMO5MEUhydQawZjULyi8Gw0Bqyje83v/9HkTN5FC3Zpc7ilSGO4L6
-  esnFCAy24KmNDiKDAWZ3JwOI9rdgxPdBKGYbbgPfZrDtUwM12QNNRZG4iAcL3mef
-  HfgcKU2XZaB9UM7kDbf8jKtPRSoT
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n1
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n1
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDtjCCAp6gAwIBAgIUDeiHHm4OJ+N49le4gsv74027MRgwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowHTEbMBkGA1UEAxMS
+  a3ViZXJuZXRlcy1ldGNkLW4xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAzFHCzUowpoRvsrWYVLs7f6qibPIMboxjq5DFZBVWKlssCSVb63I1HRFW2Tl3
+  wZxPvfq4m8dD4DMqGmYHjZVM/R1DaAjvTXtzwSO8smjfHxsxWBG+Epo1j7IQNguO
+  DVh47gQaY331j+bokYrImaVrgNkZf7oEWs32A155nyC7WRTK5H6puIgQCGFAs52B
+  QKfCwZGDFMN6FeUPDx+VbTGwNFxsM0GsurbSeGeKHbyXUAts3x7RcYPFBguTzrM3
+  6pX3n2P+3/Lxu1+L9Fj/q0URXvbMY0woqmTDBpIH346rW4pI4Eb0ZUQ0GBS1oRqp
+  4mt7Egi6+rlT4I+soF9h7uA+vQIDAQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQU14tKPVQ0ceKB2fY5GO9ceFpvcskwHwYDVR0jBBgwFoAUq5gzC4aOkw+M
+  vx0ANK7nP2EPtSswWQYDVR0RBFIwUIICbjGCCWxvY2FsaG9zdIIta3ViZXJuZXRl
+  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwSsGAELhwR/AAAB
+  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQCaLK2LyqH0t4SNmjsVl3Nj9Pe7EH+e
+  ODuCeotLcMqUfiQv+L2RXqk5WySAfd0PzjFzEV2JcrsH1mv3aJUz5VSncOjUuf07
+  xYkw49QpGWQ1/3bN5oePZaCFLwN4DcYqbOr7DottSxUJvC+81V6vhqaCX/Z2mI0i
+  dE2gdzGW8mW4pfgM8HrgLHkkUhiQLRmULT0aHSj01EVS2C3TlF7+IZ9jwtjE2rUG
+  ZXJhgFYuO64Dx9lp8kl/gQU8daJF9uZPkBLdsqzLJolS4nuygMCjqrbNQefi+tM8
+  Kc7Gk96fRo/Cx2QGQSZMbwvuPDdJ7f0ZJOVr8vmeLCZC9TBXER8keYR/
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n2_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n2_certificate.yaml
index 627da71b1..2fe7701a8 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n2_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n2_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n2
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n2
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDoTCCAomgAwIBAgIUFLef6O3sB2zY6CJMAlQilTnCV1wwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDkwMFoX
-  DTIzMDMyMTIzNDkwMFowHTEbMBkGA1UEAxMSa3ViZXJuZXRlcy1ldGNkLW4yMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5NA16uEPJoBr2z34RpW//IHB
-  4YwpJPMQ9GyKDwhi7O3dlIzSBnl/h9gQ2rce6wXZ/9Jza3imugSP5gmZ6+dCHWB6
-  piZcdm6rleVL6PviP+9hDhuGFW7hn9AkPt5YMx2ezwTKvwQjzZ/kkIBaPlzJbn4R
-  DOK99jdyihp2FOKThFmz3KxqF938nxj6+tm/Z1/vLSZt68T6m8b7kbrNrX5FXNKC
-  uxJd2aOGS2rqy1DLpijrtJXPr/Ow+og0azyrUXmUWtSjbBqU8mkJsGFsFIaJQ/Ro
-  JIcs2b55empBBHiLwUt5EYWwtdsJXys3FegESY1G8//K6YP1r3N/u/UhjL1KaQID
-  AQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-  KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUqGCJFv4biLLcI/uv5bU+
-  xhNY6jswHwYDVR0jBBgwFoAUfntVyFznAvffju2PnGI/ZwveQQswWQYDVR0RBFIw
-  UIICbjKCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2
-  Yy5jbHVzdGVyLmxvY2FshwSsGAEMhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUA
-  A4IBAQA1AkLjJoFRdt8awNzMIk+7S8DBr2IeSQjXOWIRWHQcVxgcolxAgSSzzK+M
-  pOn3sW93tuXjM/lERzhNFgYS6PXI1rP7eXYkb2FPIJcrDD8IeQ5M9q9DmW+9ouZo
-  M97DDsgAGmlN2aU9L/c2EYN8pmQTau9RrqmX7DUHwlZz2ks/GRG3+EEdJoRYBnW3
-  MljY00ML781QvuePDhsBbbGdP0u8j5UvHu60D/9GAI0bCyvHSsFvbDKqGS5gXdpv
-  xGYFrw0TM6UlZ7NQRZFzhlsknuDKe/5mAKy8q1WsJZ0cx/6tF86FIekrlsVBZI5v
-  6Hd+s3gBb+9DMkHZ744ZGTUqV/qA
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n2
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n2
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDtjCCAp6gAwIBAgIUDu43uKOwl/GSv1Bn1tOvKJcexBkwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowHTEbMBkGA1UEAxMS
+  a3ViZXJuZXRlcy1ldGNkLW4yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEA3kAauAq1U4mOzlcbPJgfooZOTdkxAIZ516IbMruIIL/R6fOyZD0FeqnssjXE
+  vT0Z6Tq01nwQUc/f2/yShHM3xYKjuc1BVRPte/N2EOsQ2GQSKDXj+gQ10AgDYCBU
+  rveO5m5GT4mrPQAbSDuBWiCKBKDfR5kXKyhdTeFklkqruw4i1x5HBkLz2uJ3ofgO
+  69uuVpFwNCeKLUe4wbuVnnAZSaq6FOUFz/svuF3ZZMnYpNGHlkuErZ9v2/gp3kPA
+  T8JySVj7kyuAPlc8IFChjOLWK71af5TmtfU5n5EmwrTlhjCBA8FTT3bTBMRDb/Yb
+  12Hm15MnKxWvX431B5440+LJ2wIDAQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUg1pyHr7w3QUNxXCLDGmWNPzcnvAwHwYDVR0jBBgwFoAUq5gzC4aOkw+M
+  vx0ANK7nP2EPtSswWQYDVR0RBFIwUIICbjKCCWxvY2FsaG9zdIIta3ViZXJuZXRl
+  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwSsGAEMhwR/AAAB
+  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQCDy6QWu1aatPHoj2CIak3/bn7oZfc9
+  TWERTagiaABnPcEEnr5LXrKKaFwMViOiaffwdX45Mzqdi2xCtTgcIFIx/rF0t3+f
+  HW8xfCphb9DDI2QwaLM8JIEMXLjGb31X6iW6Hegu8EyQWUvWxWrAwplpaVQ8UHe+
+  DteYPntMwaZO2CukIeUUDJbnN75I9i5dDosm47AL04Sg2kQoQf7JL1s0Dbzj78DT
+  FH9QzxYPirEfTGLVoky2axBq0RTVXpjpwpR18u+r35KDDGzeE1Rz0eZZ/3ZrSb4Z
+  mWQAop+v/356rC/USyNPCzRZlqihI5xv4rhsTnhqEzDocmIFmm6odrUm
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n3_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n3_certificate.yaml
index aa94b6b0e..fa6b9a93d 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n3_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_kubernetes_etcd_n3_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n3
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n3
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDoTCCAomgAwIBAgIUL27ouGwTHdobZaKTIMsoTgmpt6UwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDkwMFoX
-  DTIzMDMyMTIzNDkwMFowHTEbMBkGA1UEAxMSa3ViZXJuZXRlcy1ldGNkLW4zMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAra0b0qTGW1PAi8LdwPIabqd/
-  BCF86AJhFJTut+ix9KzJOeiRaOAVlOPaZdz8zDlVIcNImgQnKwZNaubjTWi04O/1
-  HAFkOC3dfqZfwqOM6PIcXWwrflTvzpkNbIHvS0ljqaDYEPSiyN1T19YxpvSOUr8x
-  B6enAliHoQAlYMpsGQbL3DrLGZLMzrQa+1WSMVPUSDBvPs2CUpavnEHEWTI2jOKn
-  nOEWidSW/1kEtM0RZgtQW+/bxFCSH2M570CrsOG9EqMl0dU57aVRnRZSm+uLdDd/
-  HW7S5byaNXuQhemNv/ZD69OTkrj1xCOQetvEpeyl8FmbT+LyFffx29+lUK8ynQID
-  AQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYI
-  KwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUY2LlrJQdM+VIEPy1MAqu
-  Mt+xLZwwHwYDVR0jBBgwFoAUfntVyFznAvffju2PnGI/ZwveQQswWQYDVR0RBFIw
-  UIICbjOCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2
-  Yy5jbHVzdGVyLmxvY2FshwSsGAENhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUA
-  A4IBAQAMIgsXJx/xvFo8+L+JICR329jI6dbAwr0q+otOaxILnV8Oc0Fub1UOq0tF
-  A1230Ks/VwwfF9NR61bBlfcx9ozHI1xd3DIPSZ9bZ5o/M7vcPgDR7KrUtVWqmQO2
-  8kTQfQ9d5HnOA3+2WIknGYk1ZeQg6R5FNM5HILuMuF6BM/MVK0gW7BBHV8ZmAHW4
-  Xy8NU7IZFZVrRy7vDlEFvMViTC6VglZkp6S/N6ucQ4IAsTi2khFz2DYACPyrcHpF
-  geeXPPRBrUfn2GWjDGd5Arcahoim0GZRoyUktrJiq3GzflbwwofpHtwmbxNGycMC
-  71vDrv75g9gvmGT4DXDxG86SBdIr
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n3
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n3
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDtjCCAp6gAwIBAgIUAQTmJS1c60tJHLPB9HhO8WJtz/swDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIxMDUwMFoXDTI0MDMwOTIxMDUwMFowHTEbMBkGA1UEAxMS
+  a3ViZXJuZXRlcy1ldGNkLW4zMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEAu1mhW9OEyyNyQAm3CACQVykIeh6pM4HGIN89zk4BULAzBMQJaXa+U3K+0ojO
+  9NwyLLsrEuIfM2bJQw4AAy3jWNhbWQxDOQy5rJVXUBU6xJqwRX/frQ9oXlbDp9kq
+  0b1nn09ivl4QkREaKVb0Wai0mCwVLTxYubmbFp60+ln9oH+TXv2ixgE/86gEVAH7
+  jg9RnhdroW+mXwdNONVrVVjqtPf7S0d1nkoAOB9x7V2SSL4ny47VFPK2mfFrlUjP
+  RcIZwDVTfW0P4eIJFFj8agdDWH5iqY4+apQEn5SjH58CbyWDylLw4tmEifvNzA4D
+  VOca+9oa1ReuFFnDpF8hr/kabwIDAQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAd
+  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
+  HQ4EFgQUQucmIydbHmOaT/y+6Ca5z4RfPe0wHwYDVR0jBBgwFoAUq5gzC4aOkw+M
+  vx0ANK7nP2EPtSswWQYDVR0RBFIwUIICbjOCCWxvY2FsaG9zdIIta3ViZXJuZXRl
+  cy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwSsGAENhwR/AAAB
+  hwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQCKsdOLzeGibiLeDvMrlIC/vUwSWP8+
+  2q44Iv6t8iAqqsxYvKJPnLq4X2ukDEeSE71Ql3oVM5T++p5admyUHVffxu4VHlN2
+  mR3KsCquk68jP3fMKpC+DGiFV4uGEtp0SfyW/V8S2SIla+qC8fS1lnDcFmLADovn
+  NVWohpaCrClfV/sYlcIDSTkiXNRIUSGHm1wELBzCUrhTPzNp9qKZ84V5trer6PUp
+  phmxX/64h3Vjcv5s+7iXuQBYFBb9Em0mwimTEAcRndDbM4kRvOQxZQriRXtIGhaM
+  fHgkfI+/dPK3DPpd6QGOy2CKiGyzHf6LazlXM7cyDXX2oGjdsQHseinq
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_ca.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_ca.yaml
index 30077d865..eadc9c537 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_ca.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_ca.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-peer
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIUCae3Xy29UHc26M8DI3Yw8o6yOG8wDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjcwMzIwMjM0OTAwWjAfMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2Qt
-  cGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKD2vHDUeMh6Mb/k
-  oH+XGPBe0WD9FXYi12mxq5oSGDibdj+zjvqTqCD1S4nqz4+2Q7BQD4Por+bOS8MX
-  jGEeL+478Ltd9f9lFTo9lAI2Ftg+rmPw6ivZjMNQ/wIZ0PgESIONVM21+q1sEK5Y
-  5E5brvZB+gK5AJjCKLV6y7Mxj8Z84OB4xjWwSMZdMSBEEWI9YZ0qGpwyK8NqcgaZ
-  AP//6L+9t7uMlW55hvw449e0qfErTE4kOxc0mypgzbkWHVw6zO9V1FzIz6Vf2d1R
-  b6nPVoW3ebxLw6vOw9Cnz9D1Ng+1FS0/Q7OawwLZ+i1wG1UdD6eYjywozk8bAdRB
-  yjrBjoECAwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8C
-  AQIwHQYDVR0OBBYEFG5WjORCk07T5Ddkj/mFJJ2Qwl+SMB8GA1UdIwQYMBaAFG5W
-  jORCk07T5Ddkj/mFJJ2Qwl+SMA0GCSqGSIb3DQEBCwUAA4IBAQBEII0307U+olaZ
-  DmsyNjgM3yxZEbLCDphNOLEC4wUB/sSJ737pHT/ZP5bsVsWOX3+gN9C48ylQhaez
-  3/hg/gOMujqZRPR1m9WlzPgV0TbEkEJk21xOepT4cz5YJyq5mdDWIaPFF6FsTX0v
-  Up9fFZWEeJOfCBaXknbMfIj1YyQyUHfePGA8qfymQfN5TEWkZ94ewjMUwUFPJO2+
-  AQRRPtx+9djB4fWWd1UblwbnVyDlIPcWeTnWWdtlsa0e/i7HXZeb7oJ17/E2E3/I
-  p6mOYhaACMSscBbUCj6MSZIf9fW+BUB2hCQMqK7e4J+qDmJZ7qYbtEg8UiGV4dC3
-  E1liRJXo
+  MIIDXDCCAkSgAwIBAgIUG1MAkonrIR6eTPnjVqwc6EkueK8wDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjgwMzA4MjEwNTAwWjA0MRMwEQYD
+  VQQKEwpLdWJlcm5ldGVzMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2QtcGVlcjCC
+  ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ4Qziw96/HI1vGX4mLR9hxL
+  p3cyIC0vLJKHG4Ij06pQzkfQaGMk0erPmMdIvdpC02FVne8KOwLtCaXw/cLxnyGs
+  Yvd+aTiwpAA3gcHajHDcau5ZtAUvdf8hKWwuNMqAsVJQYWdVjHi97GCSnxzkPiB3
+  B21RNQA3NO6HWUJpHS8ZnQvfPA9Il7dNo7KDN+u5uSFLdlwRk257lSVFO4TNCsHL
+  MKlDQG4+iDpID4BoPemDhEUg8X4J9pekcI6kp1IMtae6FPmyZwfhofrSey3p8h5T
+  sNg/YSuGUe7bT/RX2n1qVDSuyMSTIUWdmVT1yL6SsPnWQBmTXuWlQbbXgG2+dP8C
+  AwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYD
+  VR0OBBYEFImbhPyeAq0gY6O/fA6YL2kKBcV9MB8GA1UdIwQYMBaAFImbhPyeAq0g
+  Y6O/fA6YL2kKBcV9MA0GCSqGSIb3DQEBCwUAA4IBAQA15bka0yfvn+PhZOTgCVFv
+  ++59qHfdzNFBqB8KD57XVzEyI4CmCLAu6XNtCAhmTFpAz9hxk0goclKsEH6nI9Gq
+  gpZRNTiH/wiOQeabLAZJQURIm3v6MPpgSjod8J9zTRLwNJtsiGGMJBsEWikKHYXE
+  o5WnWOImHS/IhwhpzEGH1pTTo2wzPMxAVn7+jNFmsMaqUoQZrdKWYPaBo19AP+yI
+  K2OdQZuv2vHlRyRopyO+PB46fzodUS1Gy/L63uRfvPa03R8fza6I69m77VyEI5GL
+  /EJlaNvDPqNRdr31g3erRxrFXenW9YLAf/Bm8LtzOG4rprGl4TxSTUtxp7cQCHlm
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
index 4d194808b..2dd314e78 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-genesis-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDsDCCApigAwIBAgIUWgkBsDBS9zJ2X5kZLvcBMqLFS6EwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjMwMzIxMjM0OTAwWjAnMSUwIwYDVQQDExxrdWJlcm5ldGVzLWV0Y2Qt
-  Z2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ibL
-  GhTHeQDKlntGbrnv9Z8Iw+pHXNPMoKKojtgI2zNp93YtWUnzojX17Fpq7am6v7x8
-  RZZj7qb1Tw45NJuBGG1VzAtcdl7WIuxA0mhW2XnIo0/ZO1IDkjmoaZ0gYmQ9O7L7
-  CjRRR6v9rNF5RGrNnziz//XCIHzWirK2jGCEULAbZYlAUET+3xpli04sQ80uCnKO
-  bWkQj7zPYoRvYnfWu9VRYYgmhoHk96tLfGqSlI8P9RVp/qfwilm6WgzNdWAejwW7
-  I349noPlPHWebB66m1ToGnfAD1HC/OEMVNsYbDwyW5eprPTHm2g2GQ9bqhdAusz3
-  pfOk9D9EKywoGWpDwwIDAQABo4HbMIHYMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
-  eNPN1F/fzB+77Kq7YZf4z9IZbR0wHwYDVR0jBBgwFoAUblaM5EKTTtPkN2SP+YUk
-  nZDCX5IwWQYDVR0RBFIwUIICbjCCCWxvY2FsaG9zdIIta3ViZXJuZXRlcy1ldGNk
-  Lmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FshwSsGAEKhwR/AAABhwQKYAAC
-  MA0GCSqGSIb3DQEBCwUAA4IBAQCbrg27vjW/tYnfHvH4CffxijfdhWH56qHGZ7+W
-  /S7py7f8aLzamamIsQLQERo2QcmnvdJ2ol1RanGO74Ck35kBy796ugdjBYmIsK2z
-  JrbEP6YxoeDc9yo+YrJeG9P4rSXCgVS46lWZ2zkm5DuqBctVpYxA6OB+XF9p1fwX
-  eqNbFc0Bj7VJGRFyfEWWLUVJPCf2RL9x6o6zzdOp+sbtyMuWiaCj+vtkP1QuqBFi
-  8463/9OaGRTOaJ+hqIfeG4B+a+SvKpzaDlD13/IH6jh6Fj8trGGoFebrhvWM28AU
-  qUEQmoMXSz1ZaERr+tl2T4fVaTlpsJq+Zni70yZmrPxmPymb
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-genesis-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDxTCCAq2gAwIBAgIUcguEAEu0i4XJFwzQD+vlEEEtoTEwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAnMSUwIwYD
+  VQQDExxrdWJlcm5ldGVzLWV0Y2QtZ2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0B
+  AQEFAAOCAQ8AMIIBCgKCAQEA6zFC3TwDeaCKUVMCmhwwDkENAQ2x2DlVzgg6H7ED
+  tM4uzjZaj1tSzpYwu6l3qj1CV5ak0hjrBrDqU/rM7TM2bgaaKKatTWLZt/hn4QiY
+  WeXib0Wypb13NXVpVKKaR7aQ1aUMZSEj6xsssKT5d7aq/YFWC6WoY8Rfw5+5JMXu
+  3Mfb848jtKGGKeEMAAe33gT5KazPAEDBRiPeYXH44Dg1wiDHdv1tdB9GoQRzwEF4
+  8H1UCUjyp7Vz34CpP9caaNLjtDgMxmjGnpYTl8Kp+zquH+U1tTluGcql3u6k7HYZ
+  Na9543Xb081OPJ7AVroUAfuGYGJ7ifwjTNl8eZJVveAxIwIDAQABo4HbMIHYMA4G
+  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
+  VR0TAQH/BAIwADAdBgNVHQ4EFgQUM9VDMjG7NQvI2Bw055hUCOGSiQ4wHwYDVR0j
+  BBgwFoAUiZuE/J4CrSBjo798DpgvaQoFxX0wWQYDVR0RBFIwUIICbjCCCWxvY2Fs
+  aG9zdIIta3ViZXJuZXRlcy1ldGNkLmt1YmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxv
+  Y2FshwSsGAEKhwR/AAABhwQKYAACMA0GCSqGSIb3DQEBCwUAA4IBAQB/6OPSb7nA
+  jG0oD+HY9fCwQsIaJzOo0GEZnPI96uVzJzh08y7jlkUp1+8poU/q/bqhcDzkb71B
+  H1I2L0/VophrzMHwQfacFLU2s+mZiakzYBxzISGx3tnfMFuxc9KhutKIghihgA4/
+  paD6hLhi+yRNifvlQ2gZIxQhj0piTwRw7ieAby3ueVrwjrP8t5XZzsENa31+YADQ
+  ZRhRq+PxcmytaK033GZOX2i0ss6392B32sO1AGi02/iS2YuI8uIyZj8kaK7Y6VD5
+  ZklncZO7mJcYIu3JNoI7ACR5OFTN7r+7XPka76MRvM3ZAhw1Co6qv/NpnZgNvXLC
+  1UV+o2P7ZCLF
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n0_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n0_peer_certificate.yaml
index a9c729c6c..ff9656291 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n0_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n0_peer_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n0-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n0-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDqzCCApOgAwIBAgIUVE3CAPRE82YxSI/RBzc2N+yTbSMwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjMwMzIxMjM0OTAwWjAiMSAwHgYDVQQDExdrdWJlcm5ldGVzLWV0Y2Qt
-  bjAtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL+J+Fg3anab
-  t2HPXa0I1QYoGlTENJpZ3Z+L7X5ryUxKApQQWEy9fwmbsyyPiNjlQ2Nv6h72okOB
-  mpk3VjAzFUxpUGc9ZcC40IxQibJ0S0eYslUxAGCCjfjFMY7xlS4xaQIakDOTI4Yj
-  nD1BjpPOMQjCcaxTcWZccti+GV8dkgmmDWrqEfQs0zIIUiNBUV5rLlKwD3FV4PrV
-  WqV9YL1IMCLoJ9r4PsRAQ7SxRKePhEWin9XSsH2kqIk4OqhVWNWewiDSp0sBBXj+
-  BCMDlRstv5ASShXHyqMl29VsL8yY1QgXVTBEzzyB04B9HbUX8XOXkmyqArxQPh7h
-  1O7kgpEbbbsCAwEAAaOB2zCB2DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBuM2xVL
-  bBHCAqo5ujr/I6OoE6cKMB8GA1UdIwQYMBaAFG5WjORCk07T5Ddkj/mFJJ2Qwl+S
-  MFkGA1UdEQRSMFCCAm4wgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJl
-  LXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcErBgBCocEfwAAAYcECmAAAjANBgkq
-  hkiG9w0BAQsFAAOCAQEAIKNF4+v/OgjC6TGJ7sH+FL31zcSgLL0cKa3in265HKR/
-  ha/eoij1JoZ6HUhW1E9OSpJPkt0URPKzod+F1LOS1cmZjJVrXzXhbv7pUy0jTiIV
-  q9LbnBIlZWsMvnRMVBkoo8ekACI1R4lq5D02hR+4SU7SvZ34Hc4D0Z52SUIkxdJG
-  aD0bnm1Ml2uTH30z4KKNwSVjVnmf4rGYo1czqPiyFxYvkpQ1oZcSJWTUldl/xU8h
-  3QpCwm6wWeQkFrSwOWRE2NS+sUJarolEwyM7u2sZ4YGXhBuold/bEl8RYGy1JMQn
-  M4KU541bVYjuNHG5Ye+NjRYvJw4H+DMqENRSeo+JoQ==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n0-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n0-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDwDCCAqigAwIBAgIUEbWGL2PWKmkweNwkOj6Mgir7yGowDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAiMSAwHgYD
+  VQQDExdrdWJlcm5ldGVzLWV0Y2QtbjAtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQAD
+  ggEPADCCAQoCggEBALzBq0xz4O6DvvmyeYMxdAP4LUT9cMnUjpIHTL1i+Vxt4RoE
+  kiZoZI6uYPFQjqe05X0I80IAoyS2gZsW88omFiefkSBao+dcrZg4uxGzRrMGQCZD
+  efhlpK5qhanh15KAgazS3MVpI/J/bVSldhxwyD26aH/tzhGyCC9cAfRpY2h5/LLE
+  8g4K2Ow+71LFpRiEww8rn3BMnWeDOUtrrgY/Uu0I2fdphGKeDK3EgvwvCyDddbTT
+  quZU2y0DJbU7b+RwRfpYmu7tDtwGl/nQKPCF0n/Nu5av83HIkf/uodbxQc8zX5/T
+  wEmAdZSWg+zsT5lZ9cttCQgrP/bMHFhxZkqrj2UCAwEAAaOB2zCB2DAOBgNVHQ8B
+  Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
+  /wQCMAAwHQYDVR0OBBYEFIZNk6MQlkTpZzyQZzsJ6zlUIbfnMB8GA1UdIwQYMBaA
+  FImbhPyeAq0gY6O/fA6YL2kKBcV9MFkGA1UdEQRSMFCCAm4wgglsb2NhbGhvc3SC
+  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
+  rBgBCocEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAP1CxVes5CKmljhTg
+  QxMfCHsIUnr0l7BsMMFu1U13McYAqwoxNqtq2qEBXojyDg1PD5lIuowChQ7qA0vq
+  D7mjAOeTWmc4HKhfPXjAI+6e7FjaUQ1/QKseifGuBu+wN0m3A+PU57RhInoRXX0J
+  pA2Ox+9R9vG8DKYcFi9fqLYuPPHt+FXmhrXKMB/oIFabbywnxluXYarX6DbdPRTk
+  fWHyrZdwmlhIhze2LQiZ/52X5Jfv2qqfItKh1a0IWOhQCqnQflCZ0ZPMZmYbYL8+
+  TgowH/vBatrmxKFNfVlt3MuSRRgu+IMHlWxzoxonGucG0XkP3CKKmYs6xoMNGmaj
+  GQvcdw==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n1_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n1_peer_certificate.yaml
index f7634ad19..d11d83390 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n1_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n1_peer_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n1-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n1-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDqzCCApOgAwIBAgIUK9qeq58OSiPjz/TZeIWL/NYlNCswDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjMwMzIxMjM0OTAwWjAiMSAwHgYDVQQDExdrdWJlcm5ldGVzLWV0Y2Qt
-  bjEtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALmZQgak5MXV
-  I9b+OC4ON8Plby/jAZuMB35wJUHzgQJ9fAEUBrlK10BBHImoMxNlIUO+TridAAJo
-  0xviI+pVEP3lCm+bAJyI0eHJX0BXI5QKIOh/660JGhsFLFlE49rqB73uC8fa1l1k
-  MwVjsXRXcXUDhJUxB9QOvjYwlSmKmACri3phWBH3OG+eTnNUF4c6v94JiAzVpznH
-  zAIWVjNCsjmHQFM+33AB6IYizHZwJ3KRRaEgjNfZhhjDpCSLSIK1bwA+EeERJFx8
-  v0aljyWmJPmAs56w96GlzMkK62tx4uw7kVKKZ+VJPkAYNo2DkAU58Wz022tPDUxX
-  kxmDuAIxKT8CAwEAAaOB2zCB2DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFI6wm0/q
-  VOQNZiX4ph3cxzAopIwBMB8GA1UdIwQYMBaAFG5WjORCk07T5Ddkj/mFJJ2Qwl+S
-  MFkGA1UdEQRSMFCCAm4xgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJl
-  LXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcErBgBC4cEfwAAAYcECmAAAjANBgkq
-  hkiG9w0BAQsFAAOCAQEAjtke9q/1CrK0uUId8iNx36tbYWpBtcPcv6R60g4jSfE/
-  5u0Jq/UW4w2f3kx8EQTicSC84MKp38WVlkvWE0zRroFr/DNmrqszZ+8J2WjmAvuV
-  kFVAfjhpSXkNaUHV20xDtvrTPoQHQQ2yDKXkjc4ZwLgSTlW0/sexG6dIgpyD25hl
-  kR45ic+fxeTrCeycBKsVG+LgVd3Qg7pH+3pKuhBpGHdOfYEB5STaLy7hZArQmBne
-  s00PRFGgxXTPIYQSvLzHCax4yujOBNllZh0PUQfLGSODRv6HVWPdgn0ZRrfFkC7Z
-  7bZDYuQg+W3w+Ld3dYrdQ+BiJJoXDT5sixXwA/zR0Q==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n1-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n1-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDwDCCAqigAwIBAgIUEY5qoPK7243EC1e23T56lXQm3pcwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAiMSAwHgYD
+  VQQDExdrdWJlcm5ldGVzLWV0Y2QtbjEtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQAD
+  ggEPADCCAQoCggEBAJgVl+DdklJ9iFRCaFmJty8CNE56SOHMhomOAf2AdEU7ovqa
+  ERaQ66WTch5ixnbbLd6R38O0j3Hv6iulZYC0KoZIcGxZ3IEDJE4gp4rup++BnMtM
+  ndZ5SNNWYf9ae4r/EjAbwtoWoPjVNAuzM6zKT6ahFhnM9ji8Q/Mw3xSR9OJJ74Dy
+  tpuLgV5hpCpyql/CRIvDT6pI4jseLFkB52FlMu1czDQ7l4I/XMz02SCADDPHlBjT
+  5zww+ZfXj0pbHpvL6HM8vc786vRKfKG5iGNJXVuX3A8KqyzZQ5++nRARlrrNSUEC
+  MQJwVePFAph0BO61YJIanuMXxMbW8/gkx5g6YjMCAwEAAaOB2zCB2DAOBgNVHQ8B
+  Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
+  /wQCMAAwHQYDVR0OBBYEFDJezERxu8BQG8BWKzhROnHPpybuMB8GA1UdIwQYMBaA
+  FImbhPyeAq0gY6O/fA6YL2kKBcV9MFkGA1UdEQRSMFCCAm4xgglsb2NhbGhvc3SC
+  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
+  rBgBC4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAR8o+mkZUXaVnoQBR
+  JRsetj1tzCpb+9mFg8JMU77exPkCTLcBT1J4HRfH5Lbbd++cjkasBZBRtRms2FFT
+  cOJx/voWfXXB+dyo1e/az+z2gctHQb6peJAq/fTU/Z7/1jobPzC6dHzv+M/uP/G/
+  t9hlmeQP5ud4Aed/rgw7jyqy6I4EeL68PLsnrkjIwKbbMHxrFtKnq44d5tdaKfBV
+  y+eOnZE06xQWMgvv+5G3wGgNCzb0uFfRU1BX+32hCizX9djcsgI3UHYkWWYTW8M6
+  8O7THjJAQZCgylFTC4ohMwyhlzwNEzu/GrMLB02jasMBlbILXgBF6BxXNFIW4FwT
+  y2g0fg==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n2_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n2_peer_certificate.yaml
index 645f36d5d..518b11cdc 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n2_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n2_peer_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n2-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n2-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDqzCCApOgAwIBAgIUGuKZiW/joySb6Me7XaajqJxu6DMwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjMwMzIxMjM0OTAwWjAiMSAwHgYDVQQDExdrdWJlcm5ldGVzLWV0Y2Qt
-  bjItcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2EqQvpp/c4
-  tg8bCQAII8B6b2cNmOflwd/4rbEOu6VX4TeKW31yeI2I/kjum8qhAY+cuwLpcIB0
-  9+dsCEIcHk3y/eL0b47nkOlGF0TP31unWsRQVvs0Vb3QFZ2HMdqD8I2xyQt07qxv
-  H2ZeGtUV/mU3d3CmQRD9yo58xGQxEY2oWbZ39tHNgmK07uXlqClntkZvBGfBd64A
-  Kva3OrkUFxjnKCnw26DyxvQxraLLDb59xIyPusZjeeKPcPIOO2KcSr6FyZ1egMs+
-  edvht+kuwB5uRpXpXgBFnK7PJcDzVS6zuvT9ftPp1/5cMiJ4XG1yglRX1ckxaW3q
-  kPpuQYZsWXkCAwEAAaOB2zCB2DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFHAW6O/V
-  WsWRNhdLRdeHaRYdJA5WMB8GA1UdIwQYMBaAFG5WjORCk07T5Ddkj/mFJJ2Qwl+S
-  MFkGA1UdEQRSMFCCAm4ygglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJl
-  LXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcErBgBDIcEfwAAAYcECmAAAjANBgkq
-  hkiG9w0BAQsFAAOCAQEAoF8zHLgNX4F+Ymsj1ofDeajM8fSHZWlYAew+/kmAmcLO
-  +Hs0i1eFUhWrz/wfSIEsPOjn7jYFGDGngZqlKpHb8qt20IzQRZinBV/ToPBv8iOF
-  1H/YymPGxa1bkhu6FMTtOaY50ivOD9VOMaPCGLDAy3akXsnnvvRNq5pvyNk6q4mT
-  w+UEtteX3FAAQkYYDjQQye3f1LVdwt25xApn29KoQJrRZw5bloTRALLsYhmJmSYd
-  TKPXxeGPZjmPeym5mQN/Wz7frrjyMCgFJ9QzDfjWq/Gh14LmW8pYhU76hbYnN7Xo
-  HkQFXAdGofohNyMfB0PBahRz99yQj/uvK5K7eU5ooQ==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n2-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n2-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDwDCCAqigAwIBAgIUMw+XSwwZ2mrfp9yuoKaj6WDsMo0wDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAiMSAwHgYD
+  VQQDExdrdWJlcm5ldGVzLWV0Y2QtbjItcGVlcjCCASIwDQYJKoZIhvcNAQEBBQAD
+  ggEPADCCAQoCggEBANz8CUAzBFzOe6HN791mvNmyqRF0rx6jAsLS03mASmAyvBcB
+  e2rVUA/VNZp2VUMBCc0jrRdnKc6ipn40hZn3mIDJvFazI/UkZGWrv47oJk7Uywo4
+  gNWnt2uimAgPpuyouQMf3c6XPZBPIwkT1dmFUuupcs+D3CBW7oHeNlroae2uv+sl
+  gaMcbcFE+9pHq5qlCleHdmQ+LtZ23cEjE50+AUc0Y+ocvysyQLlHR4pig4DQKfgj
+  Hq/+hxL8lF1BFZ2o4YbI6yf9r3jgK/WODv4Kwc4WN4er20XB0/rNFJ4ArrZCvrtI
+  LM2Tx3226WD05tBzt4kBia4qs0eX1+XtUr2nc3kCAwEAAaOB2zCB2DAOBgNVHQ8B
+  Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
+  /wQCMAAwHQYDVR0OBBYEFOmGSXmTi+GLvwGkZyzYvo2Wg/2zMB8GA1UdIwQYMBaA
+  FImbhPyeAq0gY6O/fA6YL2kKBcV9MFkGA1UdEQRSMFCCAm4ygglsb2NhbGhvc3SC
+  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
+  rBgBDIcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAcaYREiVAgkxW3PdF
+  a0ueVaY0mDCW/Hp2T8uRG7uGR5TYnwwaLN0wTm7Os3ZIIPMz1248ghv5nptGEH+Q
+  ff/QuXhQe/0M8IXI8gWyKG9KIVZam9v37oJq1OxRR+Wv9CQqUZI4QeTTTtSwdOOS
+  tYsTMcIp+14TSIclwIppqCKc1OB8doQZlSOmqAs6670rWWud994S8VFwzzo6qEuz
+  5MUp0Y5mJF03CdsjkoL/tv5q44aU1d+RpgorSxBzT1PySj4CGNOkXo1uQf24cqtN
+  rnNOfyW7cehpp05fXUkjMLgklGFmWagIc5Y7Uz3FypT5Qp4/wHijA+J8vDxcxrFd
+  SRHLOg==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n3_peer_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n3_peer_certificate.yaml
index 864afaffc..d0508fc3c 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n3_peer_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_n3_peer_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n3-peer
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n3-peer
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDqzCCApOgAwIBAgIUJ2bFztCA4LtudSdOHe5FOsfZy9gwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  OTAwWhcNMjMwMzIxMjM0OTAwWjAiMSAwHgYDVQQDExdrdWJlcm5ldGVzLWV0Y2Qt
-  bjMtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuArsCl1Qij
-  OC2xShmmvg1CHybcZVeP+YqVEGsssQh61bHI8VOyXoFifrTm/bH+XtmWCMoQO9Vn
-  c+NGnju996MmGjbYnrHY6SI96SGtVrUguOpvjorPhLTL7VFQe9OVcZa+23XcwHx+
-  uEAqJYyatsok2AM7wc1c36xao3IjWNHT05rwBKWWFValbufLnoB0qK5VyHuXaUlz
-  96CrmMHuTHcleYoxWAJ8X9fz0vAmooF+wtEpe1zlEX5Q/sirUTnFMx/NubPDBeF7
-  a5AEkDAOIT9AP4nu3qwkYjKVpGu9xwLBchyRf2lS8YM3u+x7z8n5CH5XIhyGIBxD
-  Rb/52Pa1iGsCAwEAAaOB2zCB2DAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
-  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCRunzao
-  TXNdGf5+kA0tk98bsCo8MB8GA1UdIwQYMBaAFG5WjORCk07T5Ddkj/mFJJ2Qwl+S
-  MFkGA1UdEQRSMFCCAm4zgglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJl
-  LXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcErBgBDYcEfwAAAYcECmAAAjANBgkq
-  hkiG9w0BAQsFAAOCAQEAkBBDjAVdktmTJ7k4IDVxFD+vx8daDJ+zaYrYmwXNQCsB
-  AJ/m0eCmw1jymfBL23jxUew4A+mvz6x1mY+D6uVyFF4wxX6qcKwXRJUgMjY3I5wJ
-  T1lIV72HIPXTJ+0ao73rnISencCzs4efDK57PWJkQs6glvyP79YTRerwXJ7ZFBma
-  Qk6aPInnD0Ir74li/dZ4FpnpV0npucpn/1AN1DrjoP06FOCZ2zIJr+9EgchNEGQX
-  oX2jIRYJya9apKl8yvN2UAmR3LlVUKA+ElnuzE3w+Nbkfoo9PAu0CoiNwB5JLEY9
-  R8DiVpkDVwP6EUWSSoXPL34D86v3MB5+WsaO1FHYzQ==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubernetes-etcd-n3-peer
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubernetes-etcd-n3-peer
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDwDCCAqigAwIBAgIUaCPTtbc5udbwzSP6D++G99+6rqswDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjEwNTAwWhcNMjQwMzA5MjEwNTAwWjAiMSAwHgYD
+  VQQDExdrdWJlcm5ldGVzLWV0Y2QtbjMtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQAD
+  ggEPADCCAQoCggEBANcG/j9d0VS1AIa8nJqRoi1ptvp+Diaih/lhQBb90yyJ2Vj0
+  wYSjs0n5kHueQqfOEFCkHhxLdIVsCUGh4v1ixEZw59/iVAyI5PWP+CZny9udCcae
+  AEiDEkeFRdp5q9rOVvA0zr/XEr2vXWl93Nabb5KbVJT5tElu+I2kOhG9qlDv5Zdd
+  dqrSrqEk+nR9EoEnU7+IB6cc7PUOhT2twuBC5VTC5y/zmohyXDh5pAaWN0XK8Mni
+  bACDWKHXgvP218DP3R49iIiS03Qc5TSt8gi+c21XR/DNQYzuLUDvp/+gSLbeNREh
+  wGDVmjdh8t486UJlB69uM8gP2uO8SwTfSuDsZ2UCAwEAAaOB2zCB2DAOBgNVHQ8B
+  Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
+  /wQCMAAwHQYDVR0OBBYEFGauKrcCxV8pk+iiLF+I1oJcgDYtMB8GA1UdIwQYMBaA
+  FImbhPyeAq0gY6O/fA6YL2kKBcV9MFkGA1UdEQRSMFCCAm4zgglsb2NhbGhvc3SC
+  LWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcE
+  rBgBDYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAWS1Qjx8klpbIbORn
+  rduzU01S7bsDE4J4cxpNTchgJqUEO9Uf+MwYHxGLrLrOAX8YLUa930fJGu6MDBlM
+  +wOTp1jEO3nAyV6OH9deSkD6VWN9ZtRR0GL8svAbjYoezfg9x8SmS1U9BZKHf+J8
+  O7BKWEXW1vHlkSfWZ0GX1bIzeEBVKwz47TEdotOqcnZEfAlq9ZE5HCs2DMmERpME
+  dRrj5/fVrklTEwdTjUhzGEW9cxLzWp0L3fS5OrsVrGGd8XZp2WoUfGCVevNr6BiE
+  2mjbRmndDJoX5VOsUdfCwfPQtBCbkJkG1JfB3dgbZa6c7zPjJjjyI8Jcg3aKxR5l
+  Eu/B/A==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
index 2d0507bb9..ba8c9599e 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-genesis
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-genesis
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDaTCCAlGgAwIBAgIUGD2I0u1qJ+Nh+4retIwZuuSmZJEwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMDAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEXMBUGA1UEAxMOc3lz
-  dGVtOm5vZGU6bjAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCdfDMC
-  s0fWjIdNKGAg3aU8E2vHrMpTgN9v5sKZuLTz3baEBVr3z5dHvLYMRFBBOJprwEWE
-  0cCW1dkSRJqWlCVn8z7frq8qGA1+v3XrGIG5PlfFeCeuol05oeKmt2Bk9eAhNyve
-  oYnRpdiMYuPFp0C/vgCFWHV4NIDCLksMdNc5hMNcNpjJVqyajVug015h+oO1oY/H
-  yDgwCBFp0l7/JhtO3uLCNbhke8RLYeuvdPV3D9eKTmxAX2SvckrVNVZrQvOgJL7N
-  GTMyIRy0M6Yb47+GZ0V6IJXOeGs45CJIhWCN5/6tHS1j77YUBZ2DBxAMoaKdwPM3
-  sICv1b7TmwL+ua1vAgMBAAGjgZUwgZIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
-  MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSG
-  nFTgX3kUgIiAhhL9eb9j3RluVDAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9
-  JE1ikjATBgNVHREEDDAKggJuMIcErBgBCjANBgkqhkiG9w0BAQsFAAOCAQEAAFSX
-  ip3+TkzjaPSQDAivpTbCZpKv2v63lmb7oeOpxf9l5cB6KEEw4hLOqSer4QBsgcMf
-  v/INAteNxOUCr9milRWTaLNEQ9yI/ooEinFCedoInKpCgzvk77ZHqBB88pGeUFr4
-  VW+per9P0S2/qGvq9yHrOgS1xFSLO6LA5sYFB1BqXIKypqJIn8oz0T/SYk08cf/8
-  VGHfMTZLsamhrnhQccAm2KxKsl9368m49qFaTQJJhRNbqtoa1+qmhf9dNJp6YgNM
-  1Ten+QFmUtQ8KJmXFT+iIUOU5culqSfJtxIwaffCY4B2CSCH3WFK1FTZRPakKEBk
-  aqO3OFwu8rxmuLd56A==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-genesis
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpAIBAAKCAQEAnXwzArNH1oyHTShgIN2lPBNrx6zKU4Dfb+bCmbi08922hAVa
-  98+XR7y2DERQQTiaa8BFhNHAltXZEkSalpQlZ/M+366vKhgNfr916xiBuT5XxXgn
-  rqJdOaHiprdgZPXgITcr3qGJ0aXYjGLjxadAv74AhVh1eDSAwi5LDHTXOYTDXDaY
-  yVasmo1boNNeYfqDtaGPx8g4MAgRadJe/yYbTt7iwjW4ZHvES2Hrr3T1dw/Xik5s
-  QF9kr3JK1TVWa0LzoCS+zRkzMiEctDOmG+O/hmdFeiCVznhrOOQiSIVgjef+rR0t
-  Y++2FAWdgwcQDKGincDzN7CAr9W+05sC/rmtbwIDAQABAoIBAAog7crzquAio6UT
-  vrL+bl0hxqHN/ClItZYl2kg2t/SjQtTU31fm0wz7Fx5M2niHYm8hq5byQpew40go
-  f2TF3G4GF/oc6wkjCOMo/zWCmv1GBDEgHDVAHgzR25jrXFjB84tPWBP2gb2pE/db
-  eNjCfAiY+MGawdtcTRewEIWZkioRxQVhlaK6n4BsaJu0+IRaVy1GWwt2WGTdwfqH
-  Kuk5/TNcRbMlCU2wuk45Nz7pnpWmCoj/b0061yBwruk6cqTmvU1On1ZBbUKlAYk8
-  HUazHpkedhQYI3/DoFeD197mdoa0lCxhraI9wfgFb1koFONtufWzsenUN5FOMWOs
-  SOqQdxECgYEAxIwHVfFQXYwiGvtES43jF+9Sxy1s69xBPI5AllcR5oKdMN3V/O0d
-  pZNaeDToPpo/cIu1NhlreTFVMPvW8dT2EZxxnQiRnzOurbUj92gf9SfE/zVt8VKv
-  SsoPlcAgK/H67FZpTv9zm8svhCuz3DNc1nVhy+dfhE+418DoQAVuVdcCgYEAzR9Y
-  zZr4Q9FDh5QnQ1YigN+KlrCAWwMr55uLn3Q3h0Fi+WnD25yoRzt9XvE8Jh0YTU0S
-  DpKwXELoe5PtIQcvK76WXWrWcTAsVXkKEFC98Rq6X91vMKq5/0NFjeJyHcMnoMQJ
-  FGQoRmRTMQ2BW9em+7AD1K6CVvYFx+yD9aLnwikCgYEAmqsrFqmouYUOTbdPvjkw
-  7WPq+0y2+0C/oZy8HNL2BjTg6FSaEciy3NqBhjj0Tldp9vIqLyF/3sZAqSR1uKcC
-  4UcAbTgSCHtOSepTHF23UF/0eXUdSJvtz+gEra6cYpixAozZoE4MNxyFDvipOG6+
-  7xE+XYx9MQzfhAGNgtwDQM8CgYEArMNAKjvh6kywkdqIj0BW4zBkK7MRCJbNPc9W
-  c8CQnEzILcWU/r0dRpGmcHbB8GAE/eZx1PBbtflskdjvmifQ5Qkq4BeB8edfD8ZY
-  YZF/yTh3zRJV+ilxarugM3aMIuEh2VgDRbdt7IvHPcNgNpiVvdpr/4/Tm6avC8n7
-  AsJobLECgYA/ooslBdWLvmOExsaftMPTdItjjl9+bOAkYu1PEGLFNGIGUoZnq/op
-  7/cx8yrF1UbTkOFykAMqNYtIV3qynRnIMmoCI2+lfWN1TWAlmOHrTLzMAi5cZunU
-  SleX7z8IFOMW9y5iueYKWWVRdsukP4ctqfdUS7apLwLsbWoqoDLrNQ==
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-genesis
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfjCCAmagAwIBAgIUM0TdHX9ud+igjidAu8nFFxLlOA0wDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMDAxFTATBgNVBAoTDHN5c3Rl
+  bTpub2RlczEXMBUGA1UEAxMOc3lzdGVtOm5vZGU6bjAwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQCvdk1pq8FhinUSWpfirozPZ+p0SonTIpCSVju5tZBr
+  9W29dQLCilMJptT1ff7O4eVVH0xoq+/MGjMBNbIkj40fX0W6V5JfTqi1qMCeh6eh
+  Naj7QhqqMPVn1PCnz35ld0akEzSYtGSFCe/QUAK1JhaDiul8gwWXqIXara8Ny0jn
+  FHdEn7gzBZwve61h9WxBmI7hFip09JbIVWx+ZOt/oSkPO1qVC2n4HG3W82tFFXHe
+  wK4ueB6kw9X/YuoZK7y1zUVbRRfElSYMtqMbcIvDsd1GJQIn1GVxadh/63y+hOf/
+  1pApyVlNYdryj9wzEcyyp64yQ1H0uEqCrQa/05oxZoSHAgMBAAGjgZUwgZIwDgYD
+  VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
+  HRMBAf8EAjAAMB0GA1UdDgQWBBQDTNuEXTULXMUTiFSqdqKg2hgJeTAfBgNVHSME
+  GDAWgBRSFqARqb+97tTv3JneKFPRJ9sDNjATBgNVHREEDDAKggJuMIcErBgBCjAN
+  BgkqhkiG9w0BAQsFAAOCAQEAKUImwDmDk3cz+id1DJ2HpJMXuJp9W0W72e8vAtbI
+  DB6nUEPUEgOPjW3SeURdY6q3hYXSRBorVjugOH5zRPrDrFf0drhJArUkNoEnct8B
+  kUIn92XYpvDIYsxYDABYR6eKkMWi5EsKtUIkDUii+I8KZklSveu5S1xygI7aIBpw
+  4PVG0J+KzZBLNZcWNsljpz2sYT23shSCCFxRc+zyi0VTLaVLVbtq3ke9qDmqNx86
+  iDavyFr+7bnREdt818lOcGL6HuO1y2IEX7TqJp8T+5KHY9NIJ3j/X/AZ48n4bpOC
+  MjzAxQAoVIOwsD0ORHACaTVTczspuDWi2VsMheF3gDAfBA==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n0_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n0_certificate.yaml
index 8ae265cb4..44a15ea17 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n0_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n0_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n0
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n0
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDaTCCAlGgAwIBAgIUR3zKX8+AVuTbeElrADk7iyCJyZAwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMDAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEXMBUGA1UEAxMOc3lz
-  dGVtOm5vZGU6bjAwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPO5aT
-  jC7OOoRZ5EerGNOgIsoc2mGCxSBSTfGmilgRK7+jhO0m84k7Iccc5Vqr/QLrEwpn
-  xafTbtUMGhiEzHhyxEkxdTDsgMdJNG2yp0nwjI83xbDW0s1L6XLRL4Z9+T4wazWa
-  0LWNjvxmw9jqD7my3nPFNj1vYJVfKKpMSq2lcLL4EP9bYgXkHKxNbAUOOh1YCrRD
-  DdL0Tys1KDxpKgaa93qJRvnx/yb+TNzkQh/8G4b5bIhL+UApPaeSwe9LaV7lPpTV
-  CwNNASWkknOvZNMjxT053q0CBsnzR9CVjHXMdBZ86U9gmd1TmQyb7hWsW/HtGlCD
-  652grr9Ko59tLx5pAgMBAAGjgZUwgZIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
-  MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ/
-  bo3jHjktpHKFZaetlk/PKs3PITAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9
-  JE1ikjATBgNVHREEDDAKggJuMIcErBgBCjANBgkqhkiG9w0BAQsFAAOCAQEAe8e7
-  SyqJh5DCChg28/TaaCNq0ziAwCBK7WuKSi5bdlefV4SnQJiDJf1hS2EKWPk1ZFJP
-  W/3b3k/p/YqGnPC1bWZub4peOhfH6oMXte/C2vBq6iiXDBaWkTUzWA1iWFMIeLrh
-  7rzEsBy2M5SWnKLVhuuNhJBhY4jFCK+DDTqZVJ5+rIMtgZxIS7RKKrVlVQUBEkg4
-  LvzVYRu7GcB5C7B/x+fvdlKbQSv8M078AsozZGyQ4JJG4l6FKIH2pP7jEQ/rsa5q
-  895owHAph8/MnQRH4zXbicnXfIv3RuNzP2/m1/EmhurCr3Olgt6kzfJnOOeaCnY+
-  32oeaO+3uxm81Fd4gg==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n0
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n0
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfjCCAmagAwIBAgIUDiD1PkX3u52txjGTrn6y6+p9/0MwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMDAxFTATBgNVBAoTDHN5c3Rl
+  bTpub2RlczEXMBUGA1UEAxMOc3lzdGVtOm5vZGU6bjAwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQCru+zU1/unsZe/QSFKo0NXu/WPtpz6SDPKqGYr7awW
+  cNZHIr6xjsJtS/t5xPbEiI/BhqRs00Rljq3OKDTaynkWI/MbAXuE4PlRP9Q6GlJ/
+  ftfgCnFhTnWUjqM8taknUf6S/YPywvtCBVq8cyIXms1urmO1IOZu05Gnb1ulftVV
+  0MaNFCJkG91kAJ0WH4fN+JIBNQn4g1DnymCncZ9jsmVEDaVNDbp1c+IB61UznLLO
+  tQ12Nk62qIY6C48+DVlxTEgQ986gDc4s6jCK2oJYkaVBxozwIuCrMZJEWLhuQmMt
+  hBe1htob9JLZ24cJ7Dx8d7luxvaMUunc/yVRqQS/azT7AgMBAAGjgZUwgZIwDgYD
+  VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
+  HRMBAf8EAjAAMB0GA1UdDgQWBBSqOg3xrEjgexZJqLN+p6GffJ+TqzAfBgNVHSME
+  GDAWgBRSFqARqb+97tTv3JneKFPRJ9sDNjATBgNVHREEDDAKggJuMIcErBgBCjAN
+  BgkqhkiG9w0BAQsFAAOCAQEASzfH4WOOaKLIxXwEtWgxjtSUwQ6O75nluCOt9Aty
+  jzgJM1OdReM7lPe0q5IF/oB0c2hT0ApkGa1UKR6KfeiCQ6cQzIPdMnLv1aYwGRZo
+  yqN4NbKzmTC6Lch7vnHprlAWxyr687odDUws6IT6uNSu3bGlJbBWD993lvEh4Ap/
+  FTEGPqDF7peZ4WCZGt+Jlu3qP6QmguPh1fA2WDOZfbqcUSw+GR0lVXkdeXB/k0cp
+  KA0+6SZSoXspAqOvcr13ZxXu2dakLRijZi1++wSD7sp2P/GJV0qdzntWD1p1IguC
+  KD3KHTuUNlwsCuHFFJJ6hGKQkd+bUp+/F+jz1SLtpu+Rbg==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n1_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n1_certificate.yaml
index 878f27e1e..60b1c37ab 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n1_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n1_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n1
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n1
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDaTCCAlGgAwIBAgIURxb+IusyhoB2WR3xZFqdM9Kch9YwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMDAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEXMBUGA1UEAxMOc3lz
-  dGVtOm5vZGU6bjEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZPA4z
-  4yQznzIFe5Ifv6u0zU8mov0OF4O5yWudOQg06zUEhSwr1+meXec2xtOvW9CsTfJo
-  fk1wSig2hWo2wK82jumleyHl+5pvo06vemNtXsf5JgpSea/vjp6ken30xxKAsHcv
-  eXs/kOooW2Gl8wYI4efpNKsXWPmau+EDI7g8cdhiPEXtr7eS1sfewP7fjwRzQ77G
-  T5MnoeUx9UxH31PGcSsmubb7xgVlTaJ99Bq5mFjZM2ELHTf81J/FvQ8qrrUlPGyz
-  djR4RZM8s+HJAob2Qg1X/R54VQgS4svtblo8U6HciuFP1ixfxmQqA33/LyY52wW+
-  /YiyHXWDcGhDn+dtAgMBAAGjgZUwgZIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
-  MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTs
-  FwUEs1t5uO+ij52/Y9dTSzKpUDAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9
-  JE1ikjATBgNVHREEDDAKggJuMYcErBgBCzANBgkqhkiG9w0BAQsFAAOCAQEApCsE
-  KOgwxHL04ExI5KnxfI6sfTW8a89gf9PmTaNVvyZ5xa/Iv1+gK8d2zqFb1EjVMjxZ
-  NFgxUfmN0nrnmIQJTwT5O0uFJEslE0xKoP0P5h2SUD5XOAkSMxH2fvKOuAApq7sj
-  SmFHWVDBBvw04OK4l75dtA2YBbbvUSZ1FIVCe5/id0DFLuwxh1N8EzyQxEUYIJQV
-  Jwxd/XeFUy6zhwKyBMHZ4fq2qQhrQ/wXh3Fb86l9WYDKKBa3UJGWu4M18OwUbVjD
-  6xJt/Zg4BLtn/71iCRS25VLRzzpwSf8LaOXHFymXq7EdICqhVkmcpe/FHmqP09sA
-  cbfI0VGtodZsGt/ZNw==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n1
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n1
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfjCCAmagAwIBAgIUDAO0x1iqMlx7ZIjqT22g85Mf5dkwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMDAxFTATBgNVBAoTDHN5c3Rl
+  bTpub2RlczEXMBUGA1UEAxMOc3lzdGVtOm5vZGU6bjEwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQDIwRltbmMXDYI4Biwn7iJv1LzTydnyoTTLyZxBSUlL
+  f6mCAutBEpkj7jVoJYVnLOnvkACu3n33JGUXh6qqWga8DytfiYiw1Pcg+SVUpmbp
+  JhLWQTv0IlrR22sfQTXFQq5qXVeV4fH4sg5TvEOGZo3oC4wkiCPkIlSBtKXcm2Qe
+  GZJEsbWKDLjRzqUXubm1kjW4yf6RI3nxwJP/jN4m/Ab3QvjkUL2BRJKSoU6DHYiZ
+  k5myFKuBOgyCec1GkBZuyf7A9DMvPOUkvyOCKv2OTNtxgv0l86+5SwMxbe0CNRFV
+  B5ghs8kz5WyG0vCq5nhcfBVeGSlOVVDPpoXFiV47paYbAgMBAAGjgZUwgZIwDgYD
+  VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
+  HRMBAf8EAjAAMB0GA1UdDgQWBBSfK3pRKOPhtjXJ1YI3mbD2zx2kWDAfBgNVHSME
+  GDAWgBRSFqARqb+97tTv3JneKFPRJ9sDNjATBgNVHREEDDAKggJuMYcErBgBCzAN
+  BgkqhkiG9w0BAQsFAAOCAQEAtmZB1R9pHLPT0omkcnmt+cPc2SjubYGB3eAzg80x
+  DJhc693peODVNMBK9ZtJ3uS4yH+vt2g4JESUOcYLlxGb90kmS+NiA/lSEayI1qb1
+  vcmmVn0GglfXlVtD863SCSPVXge5MT/AY3RzrZtOMiVVAem7oxsSGfTgK8td5fwY
+  1qWiKvzf221cco8f9I+ZpgeUX6RzS8NV9A4/VDOPhpECyDu3s6S7/5J/1BYMwSaq
+  EaOcnJmVklw/BP3uRwcHPTmmPCfjtUf5FHI2bevJ0LLx9DaG/0P9BVQuVJQrfcWW
+  KULtXHL1zP4WfLIXyncvfqpBD07u/2eWMKQyNeGjLNmgnA==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n2_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n2_certificate.yaml
index 85f71f613..e028108d4 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n2_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n2_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n2
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n2
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDaTCCAlGgAwIBAgIUFByCM8AyYrQGCLw3slwlo8S4MwowDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMDAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEXMBUGA1UEAxMOc3lz
-  dGVtOm5vZGU6bjIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDR1Gdp
-  ffByi0yCb51Q6tpGe/oZullsdrsWk+0J2QGgIGHAJ7ciUEfN+1i3f5a5kICSRatf
-  x3JC4DMbgmJ8Ea37mVpzvZ0qdAwvsBhnOrPEfkaw0iyYLM9vmlJPrjoEYa8YjnUc
-  CE6otFhDJ11p8ByNaAIMGJm9CbL7Hx2cXK9H4qLn7NRppOhALmVbOMc0fImNvvRA
-  K8gW6aZ5iIzW0x91r3pdyX9rfSmngO5GajmOzoenxStLVM4iZ1s2xv3jTMZhd9w6
-  NXhFcZB3sRYAZBRVqYnR86/ZZk5DreJIqaUYH0YkeAccClFpJYIZNvR7G1+imI/s
-  2L//OSn1QkMVZY4HAgMBAAGjgZUwgZIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
-  MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBSC
-  5mQUvUqIovYNSrJP/2LcXSqGXzAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9
-  JE1ikjATBgNVHREEDDAKggJuMocErBgBDDANBgkqhkiG9w0BAQsFAAOCAQEAg9aD
-  bQDnmkkNHlHKUp0ZddqhUsxCu3WuynMXNqCoA2xGJWN2U1xqtuuERXLjRcIqrMJU
-  MSnlPQZteQGPnxSBs+uITJ5wZ5MkIrr+90t6ZuWMHD0l+Ok8zDpqTqIDD3qVT58F
-  Hkr2F8X4sGjpufWpdawQQyXhJ5KC3NeBmnFqglQDnTtQ4YoIK3qaO1QdSsALBxuL
-  G5+i6g1gq6jZjp+0l6E+BDCrdW3tSUele0e1VDgz6ZhkfPQ1Sni8EfaWLePlbsj7
-  lV9kCsqwr0CKr5ZSqXHDJjqggglMq5KIhJRNV517Tyn0cK559HCX1Iid1iXsGpBx
-  koohnsXUOY+fxsH9ew==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n2
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n2
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfjCCAmagAwIBAgIUJeqJwREGJyqUYprB5rjY2Ytgf1AwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMDAxFTATBgNVBAoTDHN5c3Rl
+  bTpub2RlczEXMBUGA1UEAxMOc3lzdGVtOm5vZGU6bjIwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQDBO0A1+MaAzUumNFHczKEATVlNmEmyKrmzXlzXNvXx
+  EuZJmw48aDsUS3g1xOaTHjYrIBa2tUafPAXETzu8V0ItlO4Bw0vUfwqzD2KqsvoM
+  GdAaBcIAvSw+pzkAOXVd6zzRr4kDBazoZGCnnb6n0MqMhRUIznOFKjPpDZyfzzue
+  AgIIGpK8sFzwn5ql4UGuV/KtDoLYKbhq+fo3FoTRjneaasSFZVw2WQmjBOE1Zv3T
+  rePTAjBwP4qcM1NhOrZt8FEikQY+YnzLs+rDakt+ELswctGv72UlD83ATVJbORta
+  gEU+LN8I1ztrjVEPLZa2JKUfVVAqylZO4uVDXAMUSKBnAgMBAAGjgZUwgZIwDgYD
+  VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
+  HRMBAf8EAjAAMB0GA1UdDgQWBBTgLptu+ox6QSzacQCnoO2mKzCfzDAfBgNVHSME
+  GDAWgBRSFqARqb+97tTv3JneKFPRJ9sDNjATBgNVHREEDDAKggJuMocErBgBDDAN
+  BgkqhkiG9w0BAQsFAAOCAQEAS2EBpRJG32DYUcSpPJCsTlunVB54m+UcNR/vUJcE
+  px9NUUh7tKvdBi4edb+2NE38zsz6j1JR+dHvf6BdpjPU5IIMxX8dSCMOwK1KkGAn
+  KsdXurrxZWUJFDnrrKQYGCzpuqqKUr9ObRgPEvosXZ6FMM+b8FDvh9uxYciNsO7J
+  YbACgQ4jV2BDGT9rFTPsqVn31w0syo+J316MMRcIl/tiuRAYYilBAASHyXTS/9BQ
+  vQ465660v1nqLKazJezMKUYRxVC2jYrJLKFylWd1LnPuJojvxJqIGli+5GBkFPE1
+  Qlmag+PeAHjZXLPwH61Ha3MJwt4EX6482TPCUkTK4zrpTQ==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n3_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n3_certificate.yaml
index d087f597e..8da900844 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n3_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_kubelet_n3_certificate.yaml
@@ -1,70 +1,70 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n3
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n3
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDaTCCAlGgAwIBAgIUGpUYYcWJ97KWiNcFoJ+dEDnNjlQwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMDAxFTATBgNVBAoTDHN5c3RlbTpub2RlczEXMBUGA1UEAxMOc3lz
-  dGVtOm5vZGU6bjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeAVnR
-  voqk/T4IxytlpsQ9RbnOnIU2uj3SoVesYhVal5MUeRYxr5GkV+58MXkbJ6igA4Ps
-  NVkDlQJszDbbmITdfGbNiLAwMdNK8mQjsKuK6AlBnlxKlMVKwf3PP1ALrBg/Hpjz
-  i1BSBR9R+ONFhM3x+HBfUlPiThVQz3oaJ3s2FZpBF9OJkOndQc0ZXqT6uOKvS64P
-  /V4yM7IJdIgt+GjmmJcoxYuE3IxOWooj389Hjpq8lgbiWqFaorm6QedW84F/tq23
-  Vsgv2nu4B/Ly5fBTN0Ct3j6Axd0DK/y+DXpXf0mktGT03O023iO/G+H+SMKRkZt9
-  XQ3XQSOco12oxNWXAgMBAAGjgZUwgZIwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
-  MBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTw
-  VBc/uHWyRaG6zyKxtNR4RDyw+zAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9
-  JE1ikjATBgNVHREEDDAKggJuM4cErBgBDTANBgkqhkiG9w0BAQsFAAOCAQEAAkft
-  wOd6S+wzbbRsUBnBEJNu0MCrvHr42rEc9vmk6lKMnxixtlD+xnWGE2roR81WkzLR
-  XkkInRs+qQnXRF3KXCuB4Rkqk+lfAnprFSvS0jiM8Rm8pd4yMh8vn3IiNnyLYrf7
-  Biou14auiGrLISvyIzj/xxdt6n8ekMKnqm5Qgr4YTsg5x8gmlxkCAuupks9AaQCc
-  AwE8JrGF89bq1Czxilmr8D6CBfIcB+JkPCvwwflfLmwXsajCZYafVRjVu7nLor1F
-  l6h8gXpuwbmOv8MotfzKHBTPLtgU3+8uu/vY+ko6ljrT6Xmuu7dTpY3Dmh/iicZ7
-  ZFCr+YdephlGvut1Dw==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: kubelet-n3
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: kubelet-n3
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDfjCCAmagAwIBAgIUZEVpv9Y9M8dkCS0OE6/hybxSeLQwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMDAxFTATBgNVBAoTDHN5c3Rl
+  bTpub2RlczEXMBUGA1UEAxMOc3lzdGVtOm5vZGU6bjMwggEiMA0GCSqGSIb3DQEB
+  AQUAA4IBDwAwggEKAoIBAQDIu482aNwETDLam6thScNxk8Gs+EMdYb5esC7cIHUF
+  7O4PyQ+80lcZjOUr2xydU2LR0Ow6zgrpXna+5lstX227D9pQW+xT4xZNcqkXMG9+
+  z9PvP4ZN1T7YdZ3o5oU6nl6kIW/GDJ5PlQVGkSQg3mGkgMk3Eh9rQoSv3bIhIQ1b
+  2wcvEppccDcXkgC7K26sqQP2L6wBAwpy5E3B8fQXe0stAUqRIUi2pTgkN/WdumvS
+  T+3h+r5MvTFlfkOfCetjA1Ysrx/eCPTaESKIutM1DQhDih/yskXOoF1MFQXjFzTr
+  uR0i40HQQtPOqhtvlRdGe6v3ZK6+cb6a8YtMGJtMwUE/AgMBAAGjgZUwgZIwDgYD
+  VR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNV
+  HRMBAf8EAjAAMB0GA1UdDgQWBBRYKQSl49ol6LOF3eo5hDc78nw9NjAfBgNVHSME
+  GDAWgBRSFqARqb+97tTv3JneKFPRJ9sDNjATBgNVHREEDDAKggJuM4cErBgBDTAN
+  BgkqhkiG9w0BAQsFAAOCAQEAh2yLsqoDxwcA6opkuKpjCZC1rCmimUknwrhwGENV
+  t1OCJlPqjzAfh42F9DBBR1welAVC47BH/dNOxFv68prPxJyoZ6KWnAcTC6fRnXwH
+  Ck7sle4SwipoUBT6dBqw+IO7rqOZN5Yw90as/wAaP+SQz2N/GkJD2L5RbravOynv
+  ttAY56NXPpRC/sy8JC9PRByCjwBLo4Jm/4cBZ+Yvg8HQdGK800o9BhSAvE0TtNVE
+  A9qtPxE6vyJtoQs/xCVbttOOpmy3y8T6oeMi4MbcozXiDJoplxbJfH8b7v0q8vs7
+  OsTVX/C3roHs/p2c58wVV3a+62nkHhXizOlmUAd9JSZO5g==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/certificates/kubernetes_scheduler_certificate.yaml b/site/seaworthy-virt/secrets/certificates/kubernetes_scheduler_certificate.yaml
index 0a313adb8..37769b73c 100644
--- a/site/seaworthy-virt/secrets/certificates/kubernetes_scheduler_certificate.yaml
+++ b/site/seaworthy-virt/secrets/certificates/kubernetes_scheduler_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: scheduler
   schema: metadata/Document/v1
   storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: scheduler
-data: |
-  -----BEGIN CERTIFICATE-----
-  MIIDQjCCAiqgAwIBAgIUbcjeMfUizQZIoQArHLJuhBHcTh0wDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ5MDBaFw0yMzAz
-  MjEyMzQ5MDBaMCAxHjAcBgNVBAMTFXN5c3RlbTprdWJlLXNjaGVkdWxlcjCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANsjzilWvgh7A7BQgNZWUEp16X/T
-  ZzzfcDGSdPnOy2vxVYTMLzvSdDLDSehta1ZDfMGInFEDYJyUHsjOXbvW3ceddWv3
-  ivO2rFI2zrQpOXXYZbb5QjzO13+Yum/TrDm6sL8dLX66zHG1vzdzSno4fypn4LrD
-  FLm6i61H9RH9y0l7I3dhJ6HUuQyy0oaGHQmJYeLWgWsdU5jAVE3x1gnEOt7/HswL
-  FQ/iMDdk/jNYJ2ea/rI6wo0DJtJESmEtr6wt2T+3g5DXupoC7cYQ8YWSXAR2nD6l
-  xjWCqSrxJnLN6y792G9/RihFrxAfmk05fDCvlq3vr9g/qNDtfpmfLcBGdekCAwEA
-  AaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-  BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBRxSg4i0AUkGTpnwm4laLewXvx0
-  UzAfBgNVHSMEGDAWgBTAlex4eMWYGXinbHk2boQ9JE1ikjANBgkqhkiG9w0BAQsF
-  AAOCAQEAoGNy03hsD2/N9rzzWbuqcZZ2eKb9bnQSed37OMHA5/9hr2DRsVcVQLlo
-  ttT3apm0x/pV3V4mOI9AyYuXf1ealnk0HQD+TlKnbkb4UhEv5AtTet4d6Z6avPSr
-  UPBYy084wDNx1RA0ufqsv5hzop6RRNfN6QkWMWuxAH9H1y596tzK7AtJzi8Gt5lE
-  4wr3wBCGWXyFwhNb7pOTF+phwgsUium7nmZwgFtao4OjX/xSjcE8/wEAX92L5DEZ
-  Ec410wz2/rRJWkECWu0CfZNH59M8FOT56GKIyGAkEMFwq1UOromzcRw1TZ1XkQsn
-  6w3FxfDiNUfP5OluNLNRXE8ZLj0nHg==
-  -----END CERTIFICATE-----
-schema: deckhand/Certificate/v1
-...
----
-metadata:
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
-  layeringDefinition:
-    layer: site
-    abstract: false
-  name: scheduler
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEA2yPOKVa+CHsDsFCA1lZQSnXpf9NnPN9wMZJ0+c7La/FVhMwv
-  O9J0MsNJ6G1rVkN8wYicUQNgnJQeyM5du9bdx511a/eK87asUjbOtCk5ddhltvlC
-  PM7Xf5i6b9OsObqwvx0tfrrMcbW/N3NKejh/KmfgusMUubqLrUf1Ef3LSXsjd2En
-  odS5DLLShoYdCYlh4taBax1TmMBUTfHWCcQ63v8ezAsVD+IwN2T+M1gnZ5r+sjrC
-  jQMm0kRKYS2vrC3ZP7eDkNe6mgLtxhDxhZJcBHacPqXGNYKpKvEmcs3rLv3Yb39G
-  KEWvEB+aTTl8MK+Wre+v2D+o0O1+mZ8twEZ16QIDAQABAoIBAQC6H6QnykvnSgwt
-  AYMcCP1y8Mkcz4Jc2m4hPIJr9i8ihDydaQspJSuaPfIVHnJPN0zL1+rkiBjThJ7M
-  8TH9q5Z8x4kG5Z44N0wPHAveSzFJnT1u9jBDE29HKYIYHtGlyqH6AJ82hxPD9Jjv
-  UNXODxQ7ATWHis+cnAusZnSJDmVOB10Q/b4QIgUWW1iPHACzFXvEUDCEXWJgxMd3
-  vef8VgyThFNSYEEUpYQREXIfNwE3TUmbscSbbTuJ0XfbnbcGkqbnUtojhk+NEjRU
-  UiLlIpanj7EdYXNm+FsW25Er0bg150UhB0sNRM+T2ofqClt1ZVpI4Da6yq/8+vdu
-  azZtALABAoGBAO8ASdTi0NN20a/+kNZuALxc2lrz24FWkmZozie8SPC9YQ8LOr8k
-  TfIvFoH0jsnjUA5y1SJRLo0DT0PERqtSKuGPR8dUVwJHbbeYMPsma76FctVDrQ58
-  hClGN0sndvKPcdYag3Qx1sADtyhZdvx4R+w/v+QTS1vPaZn9OPBecjPpAoGBAOq5
-  4oHBEhWD/wGnkwowTzRV8o/Y4f2uvGiRuBYHnvvPgDf7oQ4CUtEXO6DM7jh12pQA
-  44jDeis0TZCQC5c6MR4LvTD5RDRi5HT8nJf80wg0MxNx2xdawBlBFjmUKsTgNnTW
-  0IFjaOaEx6XN8dXP5xODqrV5DagccqFz+ZF3cvIBAoGBAJjGoWuBNaYHTRDodGNt
-  2/CMllQPj+BEm770/dsuo52oITQBpKLsrRrD+OpHj0MEmHcz9oRCSrR/Shryi44W
-  Ly0Sbvq/MgNV74+trJnOvI8ENRyYbzZUaBMOPGhBKOrywPzw49jRxwnlFh6n2cSX
-  iro9IgfEQabFliaGVPBqHyyJAoGAKVtFEG2PHSFbndQDsUjfu63lBflFoCfYZGhA
-  UglXtrBRvAtmzgwUwWhhhix1UJdbQraBYIhojxIxFGZ81FFZdBzHYciZfs1pyT70
-  7EaMfCaOVT+7RXsk244/Nzfm7TdAAQgURqfYRL1iW9FUacKuyR5qxnykrlkMzWuc
-  rkeohgECgYEAhqc4XF0uRD8xxcnQb1EaGHIhc1O5bumuaJZYFyt19/m6HFXuGpX7
-  +r/Of7LeNmo5M4g/L+LWKshwiGI42kNK3ax+Lg4RpuLKYptV+cIQ1VqV2UGjurbp
-  cC5n8tNRM8dSpTknhIRcEPEs1QIkb3YAYbgoEhO7MRo4kGNsDg9GxBY=
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
+---
+metadata:
+  layeringDefinition:
+    abstract: false
+    layer: site
+  name: scheduler
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
+data: |
+  -----BEGIN CERTIFICATE-----
+  MIIDVzCCAj+gAwIBAgIUVmPt3NUyPIgGsHsLnWD7Oqn8mrowDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMTA1MDBaFw0yNDAzMDkyMTA1MDBaMCAxHjAcBgNVBAMTFXN5c3Rl
+  bTprdWJlLXNjaGVkdWxlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+  AK0Z599mqeeeuvir36mlQuKnwG/W7yv0BgeRPDCLWMAPuEKvy2VwuOGB99IxaB+K
+  Yjo2y8XW/h2G8SH1WA/i6khfEyLZtBM0WupnuuLRGwN+Iqmb3iFJeAakNAtA9SsW
+  F9f9+BlU8j/VSygXXaxxX7ybveALyriJqkXjIGjCoUaAR9r7SyUHlFL1fAMKu0Kk
+  i68bDHvS03kcG21El/5QaoWeqm08heGYrdzfhhCD6JaksRRSxCRw06gjKGGIpSMy
+  xZmc3y4n6OK68TLAScxFUVoFs67HwnmcgnYGwxqSl4M5tYvvsYCZssYievHHBelL
+  sgyvkAmnib48DH/u/VDEpAsCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+  JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
+  BBSxkDajF+fxRFuZVA6l/p7rHyVSNTAfBgNVHSMEGDAWgBRSFqARqb+97tTv3Jne
+  KFPRJ9sDNjANBgkqhkiG9w0BAQsFAAOCAQEAov0y8tBP0XB7EO82qHusNPZpZRvs
+  x9pIqxwzV8ulRBGAsIY43B8o27Bu8cDZkIgoJXJpgbIbtB0skUTj2oDdvCOAs8gY
+  1rwy8ZC4rnHyRMpamBYRsyT0bCuquKnvciSNlUrZRsnUO01m282NGBEvb2Pb3cAJ
+  bT/a8IO986f+h7tSWCmhqy5h0qLPcUKSHKX47BFRNj+98TL3mG0Wh7YEEJuKfIuw
+  cPIX605CXKoAey+4+cjjgFxP3EY3gKY0ayiU79cypeXqdQyB3r/fRRgeGXt5BfMN
+  AeQ/MoP2XisbQGp7fF9Rw19wPn92/t7bxroBJ6RvjAunFdQRIT4UANLtlA==
+  -----END CERTIFICATE-----
+schema: deckhand/Certificate/v1
+...
diff --git a/site/seaworthy-virt/secrets/keypairs/service_account.yaml b/site/seaworthy-virt/secrets/keypairs/service_account.yaml
index a2c436636..ad814dda3 100644
--- a/site/seaworthy-virt/secrets/keypairs/service_account.yaml
+++ b/site/seaworthy-virt/secrets/keypairs/service_account.yaml
@@ -1,58 +1,58 @@
 ---
 schema: deckhand/PrivateKey/v1
 metadata:
-  name: service-account
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
   layeringDefinition:
     abstract: false
     layer: site
+  name: service-account
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 ...
 ---
 schema: deckhand/PublicKey/v1
 metadata:
-  name: service-account
-  schema: metadata/Document/v1
-  storagePolicy: encrypted
   layeringDefinition:
     abstract: false
     layer: site
+  name: service-account
+  schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN PUBLIC KEY-----
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzS7nfIqeAM2/EOHMYmYd
-  1mX+OFqohNQgI95aJQCrfdOkR3dsudz5HLbY2ekko932AZGIl2TbmRZodBq7pBtc
-  i9/uUXsbfrM16nZgATJvyNzbMFJlAitTO9GzYB5xlihxU+30JjuDlfwBz2Grmtlz
-  P5QBGfdWFGxTfbebdi3pg5njdtuKya+ZpO/4+V6K7PL0izRW0ZyTZtUt5eDqKhyK
-  tLZ3dWDWS4Gyt4oNqTyxL5RsTCtNmTznyA6viulTy2ZARJsjgkgMFYifiHGBKQ2O
-  JaPtpwptawgIJjdd+IBMo3mMQAm41YIdHHXKk7gyiYhhyeMTIKWv33hHBEC+3c4T
-  pQIDAQAB
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAruU6R8j0SGTX9tbvjPWx
+  VZq/lSY3XNftxkabm5dis7nc2lXeh0PNJP0nwKfqLjtPJabuPSoaMhSuw7hQvEB8
+  MGlH5BWvZZJ+ZxF7qdvTXWMgiharTWkc+AZxH6X0MC58GC5Ih8LCdcfIhCCylnXy
+  vQ/KRHhVPPS8R4jxhoCF956i8NQF4afRxOxJdprJjrEbq4MxUzRvIwLDdAvR1tjc
+  EcCEl+D0H0NE0v6Qvm1XwYAFq/YdfLGQ8CXxVi5MWkpiS4fcEv+M049bAs+D78NF
+  Rt1+fxqLfvQFJIVD9xcZQ/6wC+L8M4VPBEeBHS161VrTQZVMjYNSxI6LsOKDzUZR
+  0QIDAQAB
   -----END PUBLIC KEY-----
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_ca.yaml b/site/seaworthy/secrets/certificates/calico_etcd_ca.yaml
index 18fb4e1f3..dbbfdbd39 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_ca.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
index 7e0607930..e23cb8b3c 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_anchor_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-anchor
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-anchor
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-anchor
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-anchor
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDNDCCAhygAwIBAgIUVemLjivjXgIHRjNSJUyGWMfJIJkwDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjARMQ8wDQYDVQQDEwZhbmNob3IwggEiMA0GCSqGSIb3DQEBAQUA
-  A4IBDwAwggEKAoIBAQDpwRgtCM9zkCQq51BSFaA3r4bJuSjVH313Cv1Imbh33xAl
-  ylL7q5ICq3qQUUsyfSMDSVT90J01m8P7NGVaD5t+9MkNFtqGUuZSQytuY0VyhdQd
-  BcuaHphKvYep1EHMQXvmRqxBfcCcQ28G6BqK0ZneuoZ1EjWHx5h5o+S/SxAcJPO9
-  pvMF9n3xeLyFB4UqP9eXBhgNnj+5dxZ05IaqG7HelxZkqal9JmjJjjryf+vB3QBX
-  /ysIUgFcNOMk8M8GUglXUI+ANUQYjaCeYGejrh5WjQHWAEE3kT1jgDejNEnaA7cC
-  i5n8gtfryAAbRXGG6iv8vXf4fQBY1o4lbAo0lYOnAgMBAAGjfzB9MA4GA1UdDwEB
-  /wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/
-  BAIwADAdBgNVHQ4EFgQUyEFQMeCEOaBkg25LLWTarr/tJ28wHwYDVR0jBBgwFoAU
-  NmtTKK8XaCsSLzL12WCHNPcT6P8wDQYJKoZIhvcNAQELBQADggEBAAPaJxDe2eng
-  Vi8qOfqmPR957jEFZ20gEUddr+fXlQEZSBCEq+0lTqM1FnFZTCgkHhQyhdEpH+G7
-  ATRmbBZL1zhsa5UmrCznWsX96hlBUUk/kFhzaaeASBPPXVUspRXihankdKqC2fBt
-  GxImU7vUpZQdc+PUMJtyv5YkzGEU9uS2TD1N7FwHv2nCuMu+j/REIslAkyfK+XT9
-  xgQ5OMN22VHEQRic5GOGo/AxNO64asV37q4A5YLUNCqlUmLyOKRvVkg5kxmgrjEl
-  8sOQ9u+NIbZSXz3OxGK63BEDxaExCedBId+TL4gUsRCBpjm4Lr+uN7LT2sfJv/33
-  I5pgFRTa8qc=
+  MIIDSTCCAjGgAwIBAgIURq5MY9ePbqC6vrO8pJqRiFyp3AIwDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjARMQ8wDQYDVQQDEwZhbmNo
+  b3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCZG3MzmmqBiPy4VYB4
+  xxayJaXPz/ehZ4dyl/pgkdJ8FWyxwLOGR05jyYaGUIytgvCyRcY79o/IxxMRBf2e
+  N6yTNcPodD2uNZWMQDnk/T63c6VQfC+83K3iY48YjGAATkmpX9axKFWZWMCs8tzj
+  2t+mSfQUqsWzIaCnbmcmD4G3ptsC6+Q+oWLjXw5N1HdYaeHMaWgGGA/fdTLUycgk
+  Hp/eqktBWnk/a8iuHhdzVBWoeq4hf/y4m/g+UzfFB6xmWBhcRLQTedgQyHfkldHv
+  znp81gtc1wv472ZuTSBdEzPaHOa0DsycRDkdHtGMGIvBTZQV+PIvxMxPiRclzKQ+
+  sQtlAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcD
+  AQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUXdg+bgFuVr5ki294
+  sEMVTS+ZY/swHwYDVR0jBBgwFoAUokWyaNT/SzymovVxAmNd9AJgtSswDQYJKoZI
+  hvcNAQELBQADggEBAIVRDbdpiHcldFU9He5MIHTB3bQls/zyhaPx0pcHfI9WPn6B
+  X4OoEgDKXFGpSpUeKqfbmpn34y8/eBSkWhjAt4T46Gus60cSFhtBXhT1Me53ICKq
+  S9tK8COlqr0SiGGwp5PEBLn7nxgh2Hr+D+TKjQBzweI6dRzMmBI0ehJIqJZL4AFD
+  faSM1QcWOQd37XArmiAcfgjsiBVSwDBoDuAPP5GHCEteJ1X4FhGyKQzIyE73secZ
+  XMyMhbCEqAlSNPS8CjeqSKXr32FoZkxWWuaT4YdHTMw54TGX5/pPdznJQH9SP8MZ
+  vZUhwtZRCrDdb2Bqj72MBRKvgKzvA+SobvdtEuk=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_11_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_11_certificate.yaml
index 37214618b..b99b48635 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_11_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_11_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  /R0JlD7Xu46no/YipmE6
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_12_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_12_certificate.yaml
index 74b0ccce6..8cfc310a1 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_12_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_12_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  ZEQ8IqyvPHGkAyoZtE4q
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_13_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_13_certificate.yaml
index f2de9be92..4c24ab428 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_13_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_13_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  5AqvWEsYcNxi/+InOjcE
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_14_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_14_certificate.yaml
index 8131f65a3..c2a8138ae 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_14_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_etcd_cab23_r720_14_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  D+Y2fzHH8voSTqi03Z4n
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_calico_node_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_calico_node_certificate.yaml
index f4da08805..bcfc00ec8 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_calico_node_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_calico_node_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-node
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-node
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-node
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-node
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDOjCCAiKgAwIBAgIUG3IwJcNWCWAugYx5rMftQTby0aowDQYJKoZIhvcNAQEL
-  BQAwFjEUMBIGA1UEAxMLY2FsaWNvLWV0Y2QwHhcNMjIwMzIxMjM0ODAwWhcNMjMw
-  MzIxMjM0ODAwWjAXMRUwEwYDVQQDEwxjYWxjaWNvLW5vZGUwggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQDQa1hf6heGelmyps5iCnPjqGrZKlvcMw5DHugI
-  j2S56vOCucITbNMWRRRheYT+Sk2WHLI87TpFpVhqgBMffp3wJwUUUG06cEOI18e6
-  YOg+wsrkQLPa5eTwZo9hssAfFZvAVoju+r3HQTTaUry62THzmrCBQfaabPVuNgNt
-  BHEJs3pvgdG7r79XVKITU1Rr51IOCEmRAavf3WMqtvRBGt8gQUZuiPNKKKgCB9VS
-  uZRGIhWk89cQuLgqDaiZBx71mhuJMyHQ8ZCpMy4ybRoRm7TLfMKgEDHukb1iEEIj
-  eqxQONdVeHPewiN5C1sjiTi+W8vHyTxll2a/CdQ78VV+XBelAgMBAAGjfzB9MA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUVIS1QkudeMDojgvRWYRxuNpSazowHwYDVR0j
-  BBgwFoAUNmtTKK8XaCsSLzL12WCHNPcT6P8wDQYJKoZIhvcNAQELBQADggEBAFCs
-  FPG/fuiSzZwYlPddxfFaW0swG+nqKmq/qhGMHlev5J3wrt3IgtCD07zV1o/mOqAK
-  DnkqpyoLUehsgl+qHjxzM+zYdM7ofwSXCxeubLLm91eyKMpvpMV65GMURls2ZQ+7
-  5znn6uSZspz7bmmPV+EKj8t9iK7sjkYxT187kTn3RDx4KORCW+QhiybvAWJDmTGa
-  NMXAgzYKY3GvBDJplSAPTE6lxIkcuhQK1MOYzLGL7leDfdnnt6pl/7BJz00bf3sM
-  lnmAHlsZ1VmQm56aN0DJZDBnMILZ3orETkxmMHKgIqZqz4TfqXxUBVt8/cYrqmH/
-  Xz5433yfTynYKd2iy1Q=
+  MIIDTzCCAjegAwIBAgIUBHONhd4ywh6APEnGD8jkuvnM+ZowDQYJKoZIhvcNAQEL
+  BQAwKzETMBEGA1UEChMKS3ViZXJuZXRlczEUMBIGA1UEAxMLY2FsaWNvLWV0Y2Qw
+  HhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAXMRUwEwYDVQQDEwxjYWxj
+  aWNvLW5vZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVtYDbZvOW
+  /rMC6+kqb8IPpKXEkHOBbmYQC/ekMhJESJ+O1M2Ck/p+XlOm/fd0f21lvY4QnVSW
+  cyNJxZS6zUOmQdhA6KwxyT2xpFvND2Xce9QtOMHFtI72kLQq/fiA42H7cENBCCvI
+  b7SJ6cbMsI8Vvz5W/3PzDfzqkfxsMNqlKJnlteVDAS1yTXxP1Bff8E7FR17kydia
+  X3rnosXdA8u14aGu70xneowDe0WPDht2CimpWEb9fGXLCWdLyyKryYohYFy6IM/Y
+  NiXreozgZc/PeDuT8cUYpi+QIHmoY5uJJfwLC3ojTnE70ZWjrKINN+s8EhiC/HKl
+  4AsHQ+FjHmObAgMBAAGjfzB9MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUlm6e+19y
+  w8beZH2nF+RZ7FDWLyIwHwYDVR0jBBgwFoAUokWyaNT/SzymovVxAmNd9AJgtSsw
+  DQYJKoZIhvcNAQELBQADggEBAJx4xiiJqpdvMD2INK/vDMAL2RGUK5qjV7AEh9I+
+  KftUe7Akd+WOWe0eQemM++LkwtAaODS3HaPeWLFa45o5eJSM6q+VJFicFvKacU3D
+  WYU4HdfqjYfi3g4z1O0u+CSyrpK71cqPeVtZ9XUKmc+N0l45ncqK1UaczmPXmd5t
+  lD7DBWh7MAtt9Gp1QxH3Lbke/YbxzNr32MbFMiSgclBKufYAmva4g/ssY4YDISmK
+  kr0ZLTdYcFIg2BalE8nXBSpv9ShGSwXz6R72Q3SCFulNuyq7qmt2rW9IU+n9PGpo
+  L0i4ksY0SC4XEju/6peymlm7xkgamd1RToS0eG7IdsGJzbE=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_ca.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_ca.yaml
index 456fc1703..136b87923 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_ca.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDVDCCAjygAwIBAgIULGaz01rzf/a5PAgiX1oNvSKmjQ8wDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yODAzMDgyMDUwMDBaMDAxEzARBgNVBAoT
+  Ckt1YmVybmV0ZXMxGTAXBgNVBAMTEGNhbGljby1ldGNkLXBlZXIwggEiMA0GCSqG
+  SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDahNiGBIC/iiFDb9Q5FWeRufcNBvJonvxN
+  /EchK9kEAL+kIoIP3FIA4jiK+Lvy9dD7j7gtPSZ/Qr/A0Esek64noI+jAVbWeRmV
+  1OoETVZ/uSTbJvMYx3P1jfbIeuHMj2Jn2cS1uYyeE0PK40ozewEuAYIDCfjxzawj
+  63dh9oAlUumXPJ1Rd9GGNvDl2REpfeQEH20XsjBO/RfbDv91eJHLNPxGAF3LvwGy
+  xAXSgXPvZXerFF50jD0SMKyMtSCq5nCHK1pQ61+zus5IRzDeWVmmT/7J1V8ZOPIz
+  ceruymv8SdVvNtLmR+y51WUXINw+yBg8SvRZRuRZwmrQUsZWkYj1AgMBAAGjZjBk
+  MA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgECMB0GA1UdDgQWBBQi
+  lkPvcaC/3AghMrzlk8NWhom17DAfBgNVHSMEGDAWgBQilkPvcaC/3AghMrzlk8NW
+  hom17DANBgkqhkiG9w0BAQsFAAOCAQEAXOw0Cay0L7KXk3PH1x77dq2ZEj1ZHTAI
+  jIvu0ngHec/BWyWl4/ihj7GWSLG7vs0bzTuUY+Auhfz2HperT/wt79ZhuuHaaSch
+  REZtd1I6vMFVh/lRWO+KXD3V/PFuJ6/2Msz1JskVrBf9+J3H1dZZyah4sjjag7Mk
+  fZdHB2ngsrMPIfzBzbPeSzI/Rf/nSbEFl2n2fo5Rjcg7muj7Qf9CI6fYEGhbiOsM
+  qYkhS0bfsodumt4fPowJt1/FW85HCG0iU8utpvSzKbJ9UCbSwtBbGlqRePdcmwTn
+  jTOGy8mwf+6sZ/3+s9yBPVv9efC486uWBVyvtg8lUa2FpYrh6f9iDg==
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_11_peer_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_11_peer_certificate.yaml
index d4d82eea9..66dcbba2a 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_11_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_11_peer_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-11-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-11-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-11-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-11-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDkDCCAnigAwIBAgIUX5pXfKEgGNAt/ypm6h/2OtXYNZswDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ4MDBa
-  Fw0yMzAzMjEyMzQ4MDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
-  MjAtMTEtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOyxCUHE
-  KZ94ZBbCfvp1bB6oOTghQyUuUNd2CsvMts6Pnb+2oYo9NgEkM/S3dj1Inxmf4z6S
-  XDcRs5FSZvM53vv14/ceSuKxbx7f7u0MLd5czwUhYNep+hdZxxnz1Cb0fGOEruO7
-  Wc81GiVIO3cWgBM8TVvXdXaabGY7wjQyBATE68N/EuhXktuIzXfSwdDSaYMqsuDC
-  +GSg8eY55VYhkQs6je4Lfg9JZgyBj1EMdrIvx0ReEtJr6lre4+msy8d3TM0AAP/l
-  j4C/+AfM4wfuBFSENQkuRJUU9Razgecl25wCk/Jh7V2IMkGcKkZkdNqImfzqcqoJ
-  flmKsM5XSxlaLkcCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
-  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPaM
-  AYjSoDil+GDlA1kzaLO35GorMB8GA1UdIwQYMBaAFABy2eZjNGs6qffLD3q7qYWU
-  Hk1GMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTGCCWxvY2FsaG9zdIcEChcVC4cE
-  ChcWC4cEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAjcPzZMKgpA7yBSEq
-  rz+T81mS4TnlRmUXT9bFpQtSXSJKlKNMfbVengSp1RXW5OBWgbwnW0SV5kBTK6+G
-  jTNjcobDkJctY8owB3mzVj6hvxIoYiAUhFGOxU+YYMklVflhQYcpM+5Y929BbxIP
-  1XKqzwTeZIuCMcj+nii5e+A6PbFsLDG1ktxVG46tMXkUUjmUoL3trm3BciO5kIwL
-  YE2NZdIC2kPKc1HAYjf4IkGv9z5gV1rs1rgywjX4rdbkxgDWUrvJuBirfS4mpwR4
-  CJXfUlqdDdtkoivnioF+GJ7juACuF+GpfBSFWbb5870E5cteUZKf78iD/CDucRCG
-  ICOPhw==
+  MIIDpTCCAo2gAwIBAgIUduhn2XlCVh1SYt7EE3oZJLnSmMowDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
+  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTEtcGVlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAJgYmwrwU1Yhmw45zi/B37olX6xGppdxCeJU586B55D5
+  b0XJ1/QVdVXb3fVrWCnxiKy1ehBPW3oC+eODBosU7btnKd87qYIBgEE9ZqFFPbxK
+  5ODJs1vQMW1gxD8z0l8aj8as5EnGrtGuwbGCFstzk2qZEiVi2N34ekCeqAbTH8Ra
+  +kFYi/RrfKTjJtmOGY9vfpsNA6TotPb+7bmjJOQZ+QymrQXKBOdPPV+cRNlgumre
+  EYA2AF4bLmV0XfGHvoLeAGyZVQFlCVPhjMCZyZHz6A6zuEbDInwLC9klAAXFPtva
+  Uje0eXCqRfvnclWaVYsyyDN/CXOjC4T44AKSUlL3ZVsCAwEAAaOBvTCBujAOBgNV
+  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
+  EwEB/wQCMAAwHQYDVR0OBBYEFDP6OUHY7/I5BaVwo34a3yhPxNNTMB8GA1UdIwQY
+  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
+  MTGCCWxvY2FsaG9zdIcEChcVC4cEChcWC4cEfwAAAYcECmDoiDANBgkqhkiG9w0B
+  AQsFAAOCAQEAxMpsKxwSpMTRZjSpG41QGN+c1K9KqMarp4GEln+lsyDedg/hlJKx
+  NZXceNzaiGa+qsT41dUGZUPxvlfrVM8DnhNtXNm9sEYdvxsthWGMS2025oIEy7fd
+  QBDtjHFYas32zYAveR1VqLpT72nLV19/FE0Vx4vVNXB5ZMQMqr/uJJjr3RwLTzLH
+  B4nzcqhrT2xCHVAzTJ1f5z6ly+RgWLqvcurqr2g71odmVweGCZWNp+4UXojGSL8y
+  RfzD00Hh3b8QV4bdiQxW8RfR7qZ1psmB2/AdsItnE6jEEomPVrgfrIBBvgkZCgIH
+  XX5zER3jJkr7cbrCp9E2NJoqc/2Q5kNjlA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_12_peer_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_12_peer_certificate.yaml
index f8b75c154..84f0e2ee1 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_12_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_12_peer_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-12-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-12-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-12-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-12-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDkDCCAnigAwIBAgIUXP4EdsCNyt/bd+c0OlLOISLGBqkwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ4MDBa
-  Fw0yMzAzMjEyMzQ4MDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
-  MjAtMTItcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ2ZBgh4
-  GcQjXLIVbq4bHW2Mn9BPZ+b4vpUll9LUroRbCje8ZJKLGdgWbLpEkOBAr2XaQG3W
-  d9hPwN9mNkiIeSEDpVQZWxVHFBAIHo0dOfjaUctArvuYN8djEXFNKDtNF2Mhc2A6
-  nuBt23d+86yWYiFb/yjsc2eRLY45Dhp8+IukYntwweq35DIXoADVpxUB40x1y1H1
-  K+MziBp9kiXRg2KngNeyYJxkBHirGbe8TLfTB9ROZCEHgBAZgypdQFDZYIoibM5c
-  dPsLjGEWPRejTlHjBTGB1lMh+UZVgl2H3OB0rgNbD4vA9jNUlkIpyS774IfejrGj
-  wz01I2Bg5hV5dc0CAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
-  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJux
-  56fa0BbYLlo/EzzICwm+r6Q9MB8GA1UdIwQYMBaAFABy2eZjNGs6qffLD3q7qYWU
-  Hk1GMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTKCCWxvY2FsaG9zdIcEChcVDIcE
-  ChcWDIcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEA5rqt9RVluCpVO/sk
-  tbF6Z4eVm5CFwOaGFCV9a3z/l7wFHfl9ju1PVMxxfIejgzyA+suFm4kemfkse2ja
-  epj+vaBFrttCDOgNNhL7bU2rQMQkhtJdKJ3fqB+SArbgpFX1QzMln7ztlmOgx2yS
-  pjM+be1iMNuZl9Lbtvm/tHlXhXDWyb0hvFeOilMAWQaQfDtEkxQFWO0NEdja9wDj
-  2x1x9Zs3Tnd8PM8SC+8wi9lwN2XX77OdprmBMC5w7i+5YTPyr4QoOkZMAOWPBdHd
-  pMcRbduXoEyoKmg+c8Pwpe8pS2ElQeJyyIq6XemjK+jEZGpmM8wloCM15LmtO1bM
-  SWzEIQ==
+  MIIDpTCCAo2gAwIBAgIUf8MSrlUdhF4HzdYbFkM4iWArZQ4wDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
+  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTItcGVlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAKaU3sSF0uDtSjA/WaU96vZpGAHpW+kjLe+3FItNVWBp
+  y+Lxr9j2qm+EtKeiLx2azlIvk8nhOuLK8w6p9DVjxOgEv02z1wF7nLHcNv3239ab
+  0wVlNC9wMuNUFCWXiAhqTHIdRvu9GsdKkxY0Z9dely8/mBtRM56l8ixykZLf/0xu
+  Y9zcydBop1czjg9peFa9phzVewff98QPf3WCaqqbAS7P5s0rl8rBh56KUV3SZayo
+  gXzszoZGuSFjM+6WBSwPc+Aan9a1SAb3vVqf15m8g+1Hz+E+ov5pi7MQPTq3nEjp
+  pThWorps1G9ZhKrFvH2P31aUIvzADLrZReEXFSke4IMCAwEAAaOBvTCBujAOBgNV
+  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
+  EwEB/wQCMAAwHQYDVR0OBBYEFFLFC7bzekzCPIfyInGquLGlOT3IMB8GA1UdIwQY
+  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
+  MTKCCWxvY2FsaG9zdIcEChcVDIcEChcWDIcEfwAAAYcECmDoiDANBgkqhkiG9w0B
+  AQsFAAOCAQEApDruRQP1dYW3o/x1Z5iBF+r4l8Ju0djbD2L6bB5AIZpi8wHMG+0c
+  hEdPk1m4jajJIo6gySZ/EjMt+cxvRgRszyCij+K4DXcecLpvgqEcNyXby+lU75uq
+  w4XvJTnZDZFW87FZtYQSl/VJsRiTacIQhj+2tyNqxYA40LFOv13ccxVJJOuvLq5l
+  CsE1FTeW6E3FHE8/WILC0hF2x0qYndKct15CCnE5/NSzNZA9kEpYqYZDZgLQkuEm
+  bklkShMs5/uxKwbEHcWVnSwCN2ThrIyXg1zvvSt1b8SuCfbl/yhgXJVf1Q+hVGOp
+  EkadCOdHQ9keEztpUWdGf1L9/OO0AzdKtw==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_13_peer_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_13_peer_certificate.yaml
index e42d10cfa..aefd8ee67 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_13_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_13_peer_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-13-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-13-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEpQIBAAKCAQEA4COEeHkh4ySD3M4H2caDbvIJXdLG4dxOSQPUeUmcpitFhucr
-  xhB5UcpTkIk7UuTrInOpzQwnjbTuWq3P2mKJyYXInkwymXLrS+eGSKzYBJpGhkLz
-  TC2Nv4oOLqWPYrKdXdfULLMq6XoXsPF2u0hR8Vw48u/NqayiQv2VoLjrVhdYjKFW
-  4YcNtmdsUmKQNjYYb4DACmiim+OrTRva/WB7hurS7GmMFSiKovBT9aASxZiuJw2Z
-  KyuCUPtLJC4Rh3dFbxAQf4ctmgkEIbW984OOrxGlcRuqxEOgus2sy5NT0CErifuY
-  DaYnArcbNwYq1gI8C+q4bAUwr36FbMiNAdex6wIDAQABAoIBAGcwcuB0BCHqwbp6
-  MCsWtZPyYlWLoHyDTJdY6A0e0ru92DiPXRvGodQB7g7w3xr+wTIPRfFc0yjuT333
-  32WPUBgzO3WFZxY2ThWX9b6ntJwJ2sYdNJ2xqzyvdnALUMQDr2dw4gHiSrNKvnV7
-  9Umrte4Eo0NVG74t+FYXITfpao8rO80B/IR5OOxL4L+Ts+zlNJ3yUFblfLIsvxfQ
-  vhSDOg5JLqh9UWdIHQXeTZ1xFrYOuIXSQ6eHDQ7wMu2oYZDE48wAuEI4SvmJFrwD
-  KSm9+GlTm4NOcwy7U6/qahwtGgpiZ78vzA+F0Fe6JcADIoRabyEmyibJd7k5ecP4
-  AAd6H2ECgYEA72x6co47qOBjZimSKSu7teqsom27uT24BuUlwEmt/gh8ZwGfCuom
-  gGi14FdjlLBMQtu1V0JIl8iEijy/dYNLWJokvsDvB6pBfj/eZC2qEEgFqpNN6pDs
-  vBPRVQo+WVyIfb5l/dfcMb3gg5pYzv8U0/O3sXJx1m1GmanDckrXln0CgYEA76gh
-  G/98Jus4fAiI1HRSzKcMQ9EYZinbzrkTjAv1+PvxfCjdfoQENZ5JFWgDX07YszS3
-  yFNuXZGMfhAYt5CW3H/l9GwERFSLAgVTN5a//Mvg8EC38S5dPHVQw+Vhr8G4OU3P
-  rY+b3tKC67Gk0ZPSiBF/QnTGyEyX8TazwNDGjocCgYEApaKbd4L0vRk3Suc5iagK
-  vYizk89sjnOnS4XdvxB6AYOnZK+XcrqYlj9ai/CJIMVyjNJouwxNIkyDfQsXvVlu
-  l8ZT42+gLeJYWtoepZl9zLO2z9IGll9al6byK+3hQnskpjFBaAKdAACHQSRXiiSo
-  KRWzoFw3awvASvBKGVizmxUCgYEA7oXsphwKqgWUi0ZHQQShYBSmjVyvpwbkQYRM
-  oydIYc4Hk6ZshL3KHr9yR77lFFe6L+o5PEVlY/U32kQVBaX/sGgPK8zSFlv6mkFI
-  iNweKvGT6CrRqFaX71Nn1gEXz8DDpSz/lOOIpCXqrcB5pSk18b1QZokpSzOISkhC
-  cZaY+EMCgYEA0iGYQnX01hVgmCQtl1r1n6mjwGU7FRWePyDgJT4PKkQwvyzTIDhO
-  9sJQz8+yoCuSeTfYx/xCJxs2Hu5YE3HILzphKq/C8YzUY2pc76TeKCOQbM5rCzYz
-  dDmH1T9wBt5cpVw+PDjqXAr3aEDFlb7o1h+nRsFp4Q5oP+SP0HjSuyI=
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-13-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-13-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDkDCCAnigAwIBAgIUODCkoPqLCUUyvbFQvs36XfUwTgMwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ4MDBa
-  Fw0yMzAzMjEyMzQ4MDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
-  MjAtMTMtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOAjhHh5
-  IeMkg9zOB9nGg27yCV3SxuHcTkkD1HlJnKYrRYbnK8YQeVHKU5CJO1Lk6yJzqc0M
-  J4207lqtz9piicmFyJ5MMply60vnhkis2ASaRoZC80wtjb+KDi6lj2KynV3X1Cyz
-  Kul6F7DxdrtIUfFcOPLvzamsokL9laC461YXWIyhVuGHDbZnbFJikDY2GG+AwApo
-  opvjq00b2v1ge4bq0uxpjBUoiqLwU/WgEsWYricNmSsrglD7SyQuEYd3RW8QEH+H
-  LZoJBCG1vfODjq8RpXEbqsRDoLrNrMuTU9AhK4n7mA2mJwK3GzcGKtYCPAvquGwF
-  MK9+hWzIjQHXsesCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
-  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFDi
-  6Um8i5JnNLZYTH6ACZ5hbWgIMB8GA1UdIwQYMBaAFABy2eZjNGs6qffLD3q7qYWU
-  Hk1GMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTOCCWxvY2FsaG9zdIcEChcVDYcE
-  ChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAM7g3+p9GOD7LS7sX
-  gif4LLcQT208QQ+iuvC5qou2QBqO1oJ+2TDEugDQDTgU6U7n5aMlPAzBpJLS+8//
-  R8KVGyysrDLlsz5ouc+ncRpW4tLHc/uT/ef0A7+4KDBvq64rPDTzuljeDLDd6ef0
-  MYvyNz4p9/pzG38sk++kARlHNOzho7VycVA1BBd6K13k09kqPW7vYomI2f4GkBgV
-  tdcSmArqmdizgY1un+/YPLBvmxoKsGy009Xgf1XAjn8J1mXRa53nAWHU3xKgLgUR
-  1EYWTcKnprwBvX4TdeUJAdHZL69XoHNNmTS6imLv9REmQFgZn0EnLGF+L4xoAjQy
-  vpCqIw==
+  MIIDpTCCAo2gAwIBAgIUGSMJBXpUf0IV535wbTM/JTlkikcwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
+  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTMtcGVlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBANg2RUXGxKml3YKV6fOKr2hvRK8xNpcTReRBnuh3WtsP
+  aIrCzso+GT2PTLcIw+3gWOjZAeOzzmf5HJJXYaCSQtwrXvGE1DDtiUZvxyZ8GVvu
+  aNupPMdcGw2Tn/gI99kTjjPm1cDK3/iIgIuQcVj7Y1Stjnh5NWjYVxzlGyjq8waw
+  efk/9B3Em8JRsJOofT+gx0ljzKE3iTsk5vPtdetY+e6LgOqbDeum8ykFnYle2sVt
+  HWjeR+/y3myGwHpeHR/wcLaEWy1FRz+qtdCXUmYfBxJmdUOVGXPStveuLtRT6gHu
+  wlKPlXU7ncNYjzasCFH6QqVnymyPMi6KpUbnw0se49kCAwEAAaOBvTCBujAOBgNV
+  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
+  EwEB/wQCMAAwHQYDVR0OBBYEFGvQCPY5pspR3GYWljkSgVun6XyVMB8GA1UdIwQY
+  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
+  MTOCCWxvY2FsaG9zdIcEChcVDYcEChcWDYcEfwAAAYcECmDoiDANBgkqhkiG9w0B
+  AQsFAAOCAQEA2VIpOzHoCobd5RQICPDKt9OaYb7K9WAYJxKAQ6BI60onISMxYsbx
+  /uRiLADG3be4HXsWy0i+34wv4Cf3sy46bvJT9b3NCtkO9hg8KAr4AGmsdItVCKDN
+  L4FkY4FsGHhqZOygoVz7Xp9urS7e2mdauV0exxh9dHW/WJvd8EbQ1ujKyHbGBQXQ
+  RXaFGn4tAp9X5XUcKLC7371B5OND1nX3DN5wAQEK6/6zY/181gnZBO3BdmukNIos
+  0QOMnBEJzJ7UY+b3SzXTdVuiov1lxp01uUXVyu4buTxDT0Lp6YONSD1C+PotZfa7
+  RwnG1UMGFNvSK668yDtGwD/6uD+MBmVrgw==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_14_peer_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_14_peer_certificate.yaml
index 538a8e34b..db8ca56f5 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_14_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_etcd_cab23_r720_14_peer_certificate.yaml
@@ -1,71 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-14-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-14-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-etcd-cab23-r720-14-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-etcd-cab23-r720-14-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDkDCCAnigAwIBAgIUO9JTxRYYqF1jE1VxgklpDefJqJMwDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ4MDBa
-  Fw0yMzAzMjEyMzQ4MDBaMCkxJzAlBgNVBAMTHmNhbGljby1ldGNkLWNhYjIzLXI3
-  MjAtMTQtcGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+CJRLW
-  Js+zX95gH6PKWHnFOkEzTLDN7dfqp8yO8AUE2SULOHydCjTOs2O6qgYW2OpG6uEI
-  5JIWINFUdEaZXdKgeT2DkmzlUB6JnUZ0OxyDGqBM7/DG84xjxYAs2ej89UkP2C5o
-  0mDrxP5RkX1qHwDo3/tU+DmYdBmWKq6Ny5KnbstwPx5k3QH6S/HLlHEbh1LTgWsx
-  yoBIvKDNHhe4vR73cfDfNcil9W/hXzMm7JrDXR8w9YoYrhrgp5raEbNxQIHleN5t
-  X5wmdoSFjQ/2PvY78/OZZ4maTciB8ZhEuDTXWZ0lglIL9+ThASuBFfgU0KpAInfn
-  3X/1OONaZdP99ekCAwEAAaOBvTCBujAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYw
-  FAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCQK
-  zb+Cc0mTbZ6F+DgqRNH1kMprMB8GA1UdIwQYMBaAFABy2eZjNGs6qffLD3q7qYWU
-  Hk1GMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAtMTSCCWxvY2FsaG9zdIcEChcVDocE
-  ChcWDocEfwAAAYcECmDoiDANBgkqhkiG9w0BAQsFAAOCAQEAr93/Ix4w3Kgx1SdO
-  bNSUdGrNg9yU4Xfvy3ZkKbzQazW9XqvwFyFW4DImEeg/gH/dsPPzJQARdN16knA+
-  p+9EAs9gi0HUN/tZsJKu9u5VytA/yTbfEgIVpgxcrkUqwSSJT1zIBpa/FkJUvjOt
-  m9nnd7H3QBGADUEmeU5lk9ivy5Gc7/8UvEUCKF86tQ7obgEwPIYLZyCAZ0GnS/OE
-  AF0IsSFazRjiGy//gvmQ8H7ghPUDXXUUV8mNwUJFiqnJ16GorKEtBvfUd1JAt7xt
-  kFeQuTlKa9lFcJqabRmy1qXJjO9JqXe4O8rB93nax/oey1lNnQsFd4OmyI+MoGlU
-  iN0W+Q==
+  MIIDpTCCAo2gAwIBAgIUFxvOkjjdFYkePXmntUlwAFx18VcwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxJzAlBgNVBAMT
+  HmNhbGljby1ldGNkLWNhYjIzLXI3MjAtMTQtcGVlcjCCASIwDQYJKoZIhvcNAQEB
+  BQADggEPADCCAQoCggEBAJXB22ldLFoThMNQLeVOZdTDVZ8ag8Q3dUzLh97xFbiR
+  ySl1RoLeUcHeFWIj14pXHR9/qHPULYU2rnmYcsl7DUSXrBYWnno/2nxCK+uvVh2k
+  0TlWJL/JMQ0XMiEjRCqLp+fID01FNxohMFkagST/E9RUn6t/PqD1ZzzT7NWdhx5n
+  gGO2AT8g8/JbiEenIVMTce3qbZTSc9XIoxa8wIxhmqzuioqh/Hb/EjJbGnbU0GQ+
+  ma3XufS25XUozGhayvg6h8XtdEvq4EpK8oB5o7UVnQVlJmnYoV7DH7apaTo11Vap
+  R1UnEHFxHfoX5Ak1a/5E0QfmdLdm/jXG+Gd98RKeoqsCAwEAAaOBvTCBujAOBgNV
+  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
+  EwEB/wQCMAAwHQYDVR0OBBYEFH4icjR+0VOH7GVVa6OkmyHlVu7GMB8GA1UdIwQY
+  MBaAFCKWQ+9xoL/cCCEyvOWTw1aGibXsMDsGA1UdEQQ0MDKCDWNhYjIzLXI3MjAt
+  MTSCCWxvY2FsaG9zdIcEChcVDocEChcWDocEfwAAAYcECmDoiDANBgkqhkiG9w0B
+  AQsFAAOCAQEAGXRYMVMCV3FjTaIU4rnrP660XeoLkn9JopsDk1Cs0Ypv+QBLPR31
+  Ss3sbxEc28IyMf27ezCk7qMhp/RaCMLXv7L0fyO/+73H1DC9FHc6iqPZdn2xplHk
+  zTVXVL5edIYDYieswt9iy9D15AFPAswndn9ZRz9DM8k3itMTKRfNr+lzGysPgST9
+  otHWz8vUZNz6xoSOTwL3yej6Q9oxLJdM7tCez3v0nxxAYzH3CbT6eFcN6niID2i5
+  47bXAZk75Uunu/jpsNoRS4rMmh7EH9Dj8zglBINIl74kYvFykNNsg8UWNvY9hF81
+  iqXuIrZ7ZKSfxKwH7wszmB69XrqsWDcJ2A==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
index 861a54094..72897f787 100644
--- a/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/calico_etcd_peer_calico_node_peer_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-node-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-node-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: calico-node-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: calico-node-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIUKlRXSr59oTwydxsc6VBYoGhg1y4wDQYJKoZIhvcNAQEL
-  BQAwGzEZMBcGA1UEAxMQY2FsaWNvLWV0Y2QtcGVlcjAeFw0yMjAzMjEyMzQ4MDBa
-  Fw0yMzAzMjEyMzQ4MDBaMBwxGjAYBgNVBAMTEWNhbGNpY28tbm9kZS1wZWVyMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw7cSgCXnASTj9VK/CV/bxB4e
-  THvAoJbJKqrkJfwN3OUSGauWe+Jd6Uq0SRsPzUxD7+OaztXqhNhqcip2BXfxJiKW
-  EH4IQObxgUY7Xy+NgNulZkquAgxhdAvHWwGTJ88zRaYDc3I7l5k/ZGle1RPaVciD
-  EDhZhlEL2LK5qnN1BIJtnEnqWjz9MwfyqhhO1K3B9Un3LmqyRwAhBGO7d2U4Cc5F
-  8iEH8ywDWw8FhTt9218nlvuNOTWm8FVWTKR2BcnlxvGnCX+TG+XRYsBOQ5D5cKH1
-  /oFV9aLyBrmOKZGJI0nI+hu7z+NXSe+zxfxrCeHl75kJxQ9B84g55GjZYGq3SQID
-  AQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-  AQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFJrs0E67cdfOb/Zoez0SlIYa
-  Spc4MB8GA1UdIwQYMBaAFABy2eZjNGs6qffLD3q7qYWUHk1GMA0GCSqGSIb3DQEB
-  CwUAA4IBAQDuIURR6aeXTATINQG9wI8rHxtp8K7BSVclxAtnGQAXEY4CY0eIy4EX
-  N5h/yFpAr5kZ8D7muyG5DxmQ86ZvxHCHmRrkpuUT4hTW/NkGtA5Wpv6H37J3EbOq
-  Ue3TZSpFlbU8Wcg/uVh1oZCScmwJf527lKXCg3RTCDjyhTZtw4QuAmlL8Xx63XrA
-  3ZCWt0el13MwPV0bcDb/rZCPrKVxIXfclc1lPRJDiGhT/ERy0L+fvKvusA3uhHq8
-  C0EUBTYHWSlmEJLfwEGmAsxb7oqp5eSzQa7qBHY+xa5kEmsUYDFAM/szlai5gA3Q
-  1DRaRh1Fz08a54gMR7VRhaygHSyKsYHL
+  MIIDWTCCAkGgAwIBAgIUaiAuk597ZX2om9Ngr8+MzXqIqfgwDQYJKoZIhvcNAQEL
+  BQAwMDETMBEGA1UEChMKS3ViZXJuZXRlczEZMBcGA1UEAxMQY2FsaWNvLWV0Y2Qt
+  cGVlcjAeFw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMBwxGjAYBgNVBAMT
+  EWNhbGNpY28tbm9kZS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+  AQEA37MhA9GYa7jzl7JxIK55tP3H5LCMOnsNb0VVf3TYkvCRECbSD+Ytx/oEfgHW
+  M9PgltNw/DCsbftlcKZWxBXQ6nMlcQJ7SE/u/+UIVp6KTmIvnsCLFLJfSPP9+X4/
+  ZpPdF/xzk1Zt/PrsKszDxntzfOsi6/+xKBB8spPjHFL2sOpE3Ur4pRtFXYfOar+1
+  oXH0o0CawVKMZ+czElEd/4q3EiEZ8ykjej8vQoWPCoTerc6iu4rvZWKmPQJ9SSea
+  BkNYVmR5VgJ7Nm84P38LgktsSSKhAlId+UxVIFFdbXT7a5EF8g+Zd0TG42V6ZkjM
+  mOTydvip2ReF2V8OQPzauOk74QIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYD
+  VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0O
+  BBYEFEiM9PUoo5t/POBzuladke7SKXG1MB8GA1UdIwQYMBaAFCKWQ+9xoL/cCCEy
+  vOWTw1aGibXsMA0GCSqGSIb3DQEBCwUAA4IBAQBIAEFyU8XwdB+qxZCxxu9D91kc
+  tkDztrHFDFlOc+hLjM8reaqyw1v/EF8TVXaxK3DdkzvInPlPVWw5hw/K5MuMdcYM
+  678SbnvEOvrmyT8zfHNw+1MgzjuQq77Ete7uQ4YEWqLh1Szn9lpMPX0/A1D+1WzZ
+  8pRfl/fX7b64Jl39TSxpQs7lPVQa18dnceYYVYNT/DBq+5PcXzaTtIA0KQ2hmQIj
+  UE8JoT4rgZE25ZzFhAIFfszW19Cru62UNuiCQRs7U4xTwdOhVxIUhzqM26ffiJ4o
+  A4kMjWHsqRMF78kDiX3r4cV0V5KPj8MT+dau+p8edYFusMbS811M7+hHCWyY
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_admin_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_admin_certificate.yaml
index 4fe805568..5a7fc823f 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_admin_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_admin_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: admin
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: admin
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: admin
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: admin
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  MIIDYDCCAkigAwIBAgIUE5IN8TZIEY+vDdMjXzipYrN8TzAwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCkxFzAVBgNVBAoTDnN5c3Rl
+  bTptYXN0ZXJzMQ4wDAYDVQQDEwVhZG1pbjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+  ADCCAQoCggEBAL6lzifZMFp4C8T/SlMUbmyzJ9Vn+Wa0dLoS3wz1VuAS4EqhcTgN
+  n3w0mDDFLPr8JX+BrrZznZmRLO6DPM4O8K2fnOhjZZLQwCbn6EoSSZfmkGR6T15L
+  7YPivoNkqubPNY/8jZTGVbhL7me07+T+evxrk9M/Kib/XOJ7Kj6jtEsNRV6F308u
+  cSdtXZHav9T1yKH0bQLkGspHJhP9m/DVdVW7d9/aE+CE2EYku2cNqw7Dr2Pm3EYx
+  aOaWZG/xRFnowh2gmQoE4d/2EXeYRMqIUF7Q2jU5xp/KKC67/AEopJEpBz2AmWFd
+  7GS4Bj1lG7vzgdR6D9nbqKJgahfDC30PNRkCAwEAAaN/MH0wDgYDVR0PAQH/BAQD
+  AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
+  MB0GA1UdDgQWBBQZ0yZL8NzfNfWaFjS63mray/mECjAfBgNVHSMEGDAWgBQUgj1P
+  ZnJbxSLOj3Gv59iDiiC+GzANBgkqhkiG9w0BAQsFAAOCAQEAshQh/YdeDk3m2Ieh
+  VHaSHtbJ+l4BGrfY8vc2SbS7425/wH3BfLMj/xf4bzuTRkhrCIhi4hNs8QYWRXxt
+  iydz7DRRFZTstzQlJzVCW7aoQGg5esdba69PxZd/19xTPPPE/hkHM8Kg8AvX06Ac
+  vH5LOpCZMKx5WAQLHSqzSVi/Kh2a5npH8tWGvYV1DJNbtF0SC0BISfxB+5xgbeAu
+  BjTbyKQNrTyy7AfUKUfD1Uv+wTUHDuajs3hFsGSH/vARSD2LrZEp22rkrKTxYF2U
+  2tqn76DySBljZQt5PeU3b7QhU649YqxoDryIiFpMZKMY4An6NL6MEQgfNp5NfsLW
+  5R3t0g==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_apiserver_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_apiserver_certificate.yaml
index 653e20c2d..0de1ede10 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_apiserver_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_apiserver_certificate.yaml
@@ -1,72 +1,73 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: apiserver
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: apiserver
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: apiserver
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: apiserver
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIID3TCCAsWgAwIBAgIUUHq94F+HucArnGjtovEfnDQHygUwDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ4MDBaFw0yMzAz
-  MjEyMzQ4MDBaMBQxEjAQBgNVBAMTCWFwaXNlcnZlcjCCASIwDQYJKoZIhvcNAQEB
-  BQADggEPADCCAQoCggEBAMJk41afRvAqm06N857UvxAvwR8mz04ha4vTYKAMlQJs
-  JTz1E3h/UJ57/0ljXLPH6Zdq2C4lCXFeiqIphOtKvfwk/ypeoquMpDlFmIZ9tEgA
-  VBJAHOdvzKex4bgk08Anq97QV78pVoWg7+OEIssg7p7NB0co6rtZZq8NWK+y0fVf
-  feeP6PMNhfoBK9TUlx9jRXzpdx4Yn4TSIBEj13P+jclIP3R0k+0tE5mFxqpEw3lV
-  u3DJ0LGM+aBTLQfa/7PxKs6LgnsDx7n7sk9COSR1F9TbG7FhGA9zwFvMxyU09bNp
-  eiuooFdBPkJSCf4OllYxCqY9XGl5mt5fH9XHqcCJmWUCAwEAAaOCASQwggEgMA4G
-  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
-  VR0TAQH/BAIwADAdBgNVHQ4EFgQUS5Lc5wmU5pHQwXKBCxCkQCGFFVgwHwYDVR0j
-  BBgwFoAUZAdfcnNMOC2YDTunLSmerT57kNEwgaAGA1UdEQSBmDCBlYIJbG9jYWxo
-  b3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVzLmRlZmF1bHSCFmt1YmVybmV0ZXMu
-  ZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVmYXVsdC5zdmMuY2x1c3RlcoIka3Vi
-  ZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVyLmxvY2FshwR/AAABhwQKYAABMA0G
-  CSqGSIb3DQEBCwUAA4IBAQB9zkuvWjWhK5xPnZMCXombp4LP6p2cBDzaTsnbgOjb
-  9wpQXtCQEEJ/7/dgGVyUmsvutWg02YLCfBctCZN/LTuD/YNCbxrZxsnmtbYSvw0M
-  oNxfw4Xi32FAB13hfjJdkrCKM4MVTIq7VjTVZoGVEL8s8e8hYAGF8qeiY13DdPnC
-  R5itpnlEvNumM8uwa3x/etwKpfBDu7LLjHI233Ik4qfEmAif3IWyYEzxkXXpJ+4Y
-  nSX2K9TAVADcuVMFGVhNsh3u9DhXW+E5h2cYKQaTmXAMSc4BifsSyFeF7oI1Y4qY
-  ZbqJVVfiiZ/fmRM1ZHY0CdOPxJQ7VAsuE2CHMVEKWafm
+  MIID8jCCAtqgAwIBAgIUdty/g00jevmcegQez659nYo8AqIwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMBQxEjAQBgNVBAMTCWFwaXNl
+  cnZlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANXBuZZL6hGav2XJ
+  AiCr4DDyaxtRQIlUZkA1ruh6jl/6bMqGD/5f9Se9x7JZHm18LR1ufjj1FDaQ8Mwd
+  MYHtYyXTyzSY2LZK4fQCOaTwAJg0cna8VhtxLGM3Ah0+TUFok5EPfv9asW5Gc5Cs
+  NelpoADTHdzODEGazzwTC4KoxiPUSu0neQf7v8a+KVSd5JSQSRll3bRedjtj3WNH
+  EgvnP5MT1SrI+n3YlCicGXayRcSo0kqdV62fMZ+SZDAyyCGOJdojw+gZTVXc6Gas
+  pywzPLvHRXq1EJwPI2gl5dMt3a2tVzpMd7uVyElvebAEKyheSQfyzzJdMgjqgfzV
+  gyc/UrcCAwEAAaOCASQwggEgMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
+  BgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUeibKrzsP
+  yVcOxnRcF9CVtLIIf18wHwYDVR0jBBgwFoAUFII9T2ZyW8Uizo9xr+fYg4ogvhsw
+  gaAGA1UdEQSBmDCBlYIJbG9jYWxob3N0ggprdWJlcm5ldGVzghJrdWJlcm5ldGVz
+  LmRlZmF1bHSCFmt1YmVybmV0ZXMuZGVmYXVsdC5zdmOCHmt1YmVybmV0ZXMuZGVm
+  YXVsdC5zdmMuY2x1c3RlcoIka3ViZXJuZXRlcy5kZWZhdWx0LnN2Yy5jbHVzdGVy
+  LmxvY2FshwR/AAABhwQKYAABMA0GCSqGSIb3DQEBCwUAA4IBAQAPSAJKNQOZhRhq
+  vi1Gjsj5Cxk4bcz0S9Bbsc5hWHMdroxRD/QCtv7ivz3Trl8IQqKYSI/xi7Gkc6ag
+  aQIzqPfSUvBw1II36i/5y5bdtjcq4i5dGBvI2f/Exu6pxcZfCs7iZuhHKv0zdvTX
+  MxqczCm68agXjyc+iFHvryeELcv1/lca8MpLwBIrp6O+5WCV/BZO1wykbCu1U71Y
+  MYadtEQieQkQpf5rQPoeQIEb2/FCmbIHCeVMBVgh+aNOodBBeUD9MUZFzOutXrb9
+  C3NfSswUwDK2NHXPLlqNzFCGixdajaGtWTdpHPVY3Yyt6uYNJumiaHm8aHj+z59B
+  Wl/d1Vjp
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_armada_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_armada_certificate.yaml
index d4c0a4aff..c6256c25a 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_armada_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_armada_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: armada
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: armada
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEAzzoDxdeBQS4VDJSH6Z+ZnxCUmz0wxwgQPtOMZB8Z+dQ85qxx
-  J/VFsfhSYORgo/loArqIFkTdz+vvzUKXoj4EKOVx2ki5mN7I1L27u+Muf/6awYs4
-  Yn8vfGaJZnXxNTZC105Y8VuyoAmla7JBoWpGvNrPNOeelLvBQC8N7vKsc7Cpokqt
-  +DDo0jwPQZ3jQGt/olfmVEib/1Kx87HTmxvkOPwwjOZez4QyeWimABvNRNubnsL6
-  0SQfe+nIq+WALGo3bef0TNN/fsVh2SqRLWQpI2xChxmwg/Eltcv05FunpbCVM0gi
-  a7JNtloskztak3dQFPH6JKHG+TDcxomSPZatGQIDAQABAoIBADWFCEBqfil1W15a
-  ZhfCboyUXa0SSqy8umVfgZzCI5VQaUIyOy9Uu2FRfwUjNopi+afqwQbvVlJC3zYm
-  Ar+WQMDHMXZs3fJLZ5b6Qagu7m2ENjfSWwelTYBVgxsBTwCtOOoeg/4h7qpCk4ST
-  Dzw/FHHmGSnSwDQtoaWQAYs7BasC+AgI+aVpnh1X2AnR0AQPlwZ8yyl94u84qJvt
-  nibPbW+nG/o1ZyVQpH0ObB4qw41N/5s7QkeTfOkj2mMZyr60SW+E25/5+wLStBCR
-  atfbX8vMnkFA9B/K4Thl5OBfE9ZcKgantVMjm9B4DE2gqJnuWSxYr3ZWoLBEYwlA
-  qLpFeDkCgYEA08CTdlsxdyNcjGsSjeEDU1/04lKTbMYq6ccj+bpXSoXpE6fywzQM
-  ppcMvEwe6yX8ZQV7nlbF2UxAXGKwzABZ0jhxjmqnNapHe+0ayKizYhszfmeDOoZl
-  BzdR7VngYQxOdtJ0ZyrrenIzm7kU2xEZ/t0ELIYc+3NdJLPztMN0iNsCgYEA+odY
-  gu2fl1Q3bMqZGXNgn9c/FbK9vRNpEAHebx8l/92JVTLaXAMqM66HNlDRNR+qSx6T
-  DWyEgH9TtB0ZgxHpvA69KgHpFvgCQXezSi2J+Qv3ZYFlUK6FW7MIfAbtjfc/NIIi
-  tnX4memOVu36uU6Id2HyhmWWkOqSPWMF4PESGhsCgYBuEK5VmecnRyEm98zIJIqG
-  /tyZ+1QX+RV7OICxoLMY0GwrRGQCJP7iZKdBBMwZbEA5/lSYJABpB6J4ou/EyfXm
-  OGKGJVfOpDjN6JvAazf6qarlbEag2BSRYKbcGZhwuWXbi17n9T47AjtjGRwHFmeN
-  uzIdNoTACuICXusxLVtYewKBgC1cOCBsmcqyit59yD6db09Bj8CD/mqviwRE8ls4
-  To8HM4hjjrm+MPPuk7i35UkzFIhJXuK9VThW1Xb1FdtvcNyF5qYmdmecO/xSifnS
-  SPr4ubB9PzTehHLX9Z9POc/MhnshXNugfISRjx4aNJ08pOTIrTq8RgizEAthVH0n
-  6NklAoGBAMjUuV+AL/RKBw9CW8tQ+Pn0vDUaynFbIgq4WhYLet31jugTJtK9qtW5
-  H0ILE/cULgCXaGZ5aGhSNHVOsuFxjFx16S3QLxOpU82GLMnd8tR3qw68xvUM5oRM
-  qYi6XUE4rlkTs4C65ZkxNEAecrilBRmtXg4Svrq9Lv/KRWRi7R+p
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: armada
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: armada
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  75dN5T8=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_ca.yaml b/site/seaworthy/secrets/certificates/kubernetes_ca.yaml
index ba9908525..6671ebbc6 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_ca.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  WAQCivhINZqGXDNrVpmYTh39BdBRN+V9guvHAA==
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_controller_manager_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_controller_manager_certificate.yaml
index 7b30a39ce..054e2623c 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_controller_manager_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_controller_manager_certificate.yaml
@@ -1,69 +1,70 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: controller-manager
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: controller-manager
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: controller-manager
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: controller-manager
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  0TbhtQ==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
index ce254032c..e92eaa989 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_apiserver_etcd_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: apiserver-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: apiserver-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: apiserver-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: apiserver-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDOzCCAiOgAwIBAgIUBNofrAJSaY3YxI5LVj74RyRcVfswDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowFDESMBAGA1UEAxMJYXBpc2VydmVyMIIBIjANBgkqhkiG
-  9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuU3x1Gf8GTi25WbeOzBI/iWxGR78XbKDjgMf
-  dp+XN0I3/GHae9VN45NoiReD5aMu7PE4Xc73cqKRxApBHOKI3ifCqnD45jtqy0P2
-  /2SCVKnyJcbySFvQ6rkuAyEkQ3mOVxxlbOLwIABCoNMbazqwVUUnwJFq2PbaLkD1
-  mxrpnqLPYsZf5E3Cs1qW4K0Jczjk/lLleh2VecaAvLAeoowv+DGOwcFqZjFAqWJu
-  nwrEYS6jbM+lMQ3ETKjujOCmPgOF3ZP+ugYVUMBBraG7T4g5VodC0gBfCGfm7mGW
-  GcoPMrURMMmbb6RVfXeYmeh4dWhVF69IAS8uWhnMXIruKMPBmwIDAQABo38wfTAO
-  BgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwG
-  A1UdEwEB/wQCMAAwHQYDVR0OBBYEFDZKfjNx0puW0O//2haYwuEhXF5VMB8GA1Ud
-  IwQYMBaAFPVEPfdwdATFHwQDM+IUuiwHW3edMA0GCSqGSIb3DQEBCwUAA4IBAQBQ
-  D8YlxBFt1IdnPDEZb0rFDA/nV8N2lToNib9yxfUDno2j1Mml0f+Sg1XIxmZ0KKon
-  J41Mzvuodx4wisvelSzk+lsD+iijrXXw5K04Gc35FbyZGXMbVXA5yPeI+wL4PVoO
-  GVNDiNO+nd1HwJhA7xcySusoPSHxVpVfcjmQ/QI0UZ88IitAU6+J85s/0dOpRx3j
-  lZpL6pJrGVHV8A0F3+7+sOPenK+BldTwhFdqAez4p34+ia6QUEwdDbBhy9rfpT4Z
-  Q015BSd4T20+m3Nzzl9eRmMqWdS307Mso5clcRcpx2n3iBoQKN3HGfsAs/+Oxavm
-  1gZiXh2yDSslBvu7HgtX
+  MIIDUDCCAjigAwIBAgIUNOJaZvp0ZPVlnwPz9mjkqXqrn5MwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowFDESMBAGA1UEAxMJ
+  YXBpc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyGKiDk5o
+  GOoWiXNcGGTU1yXHEl4bsLNPEYKH6MeED+lJgwt2nFlx1we2zAonbgimNRIHpZAg
+  xlqEsQSRUBVqLaLCdb9s7gUsFMf0T8OhhvgTikh+Ques70LuxZJj/ENtqL/LovHp
+  fQFk0v7dft43vlEOvn7SLFOLYvuY17ukDy1n6tn44lyq6uRRgZwj39SmiLcdAAkG
+  33ZydxmFIq5rAfVhwKzz7z+ttGjnTSzbISfserTUObJiZQiGvvQraexQIJy9xfTP
+  GfrX8IrNpkbWB5wU3E9S7liejfLIAytlpvx9SdoCwSA5cEtVN7ISUxgzFnJ+QK1N
+  klhS2vdbLwGX3QIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYI
+  KwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPMDd59A
+  MUXRuQAM8+dDGaptWk1cMB8GA1UdIwQYMBaAFJgnTDDrAM04thyTo+hplYNoOSCQ
+  MA0GCSqGSIb3DQEBCwUAA4IBAQB45qSlzBZQUwKdLWE2cnWltKLztwGE+NciPQjD
+  ebGmnVadxZD4lcy7X1KKkhrLtGqaSP/qInXHtNKy5JqjT9S1meaZRLFSypr9YbQD
+  ROWCxfODAN/YywnECvv37og0Tdg0i57lcdstezt2XHjbL/hFuVgxFhMzVyXd2E6H
+  MyYNyj0U8ev8zgY1fY1aLpvNXqGTXHVEc3+uQHGeSk0RNLsdSLzjdfYTZApUcBxY
+  pfhEHhxKEy4D48qls4wlvSkGVLdQdSPh2FRJx4Jrp0BG9dVj3ZqIq+kL0Xh3C+uu
+  H2PBghFXgm9XdGD4nR1EGcj/G8TlEauqlwXocxT/jogVTaDq
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_ca.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_ca.yaml
index a0ac0ab51..780177dea 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_ca.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_ca.yaml
@@ -1,68 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
index 6d3159210..ae492188a 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_anchor_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-anchor
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-anchor
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-anchor
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-anchor
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDODCCAiCgAwIBAgIUX0AWMl5eGpmyRUhUFl2nx6rp7GgwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowETEPMA0GA1UEAxMGYW5jaG9yMIIBIjANBgkqhkiG9w0B
-  AQEFAAOCAQ8AMIIBCgKCAQEA3zfOkobhIE5Nk2Uk9xG/icM9lXY1Jbwr64Ax/x9q
-  E8T1FlTlLMzbPM6vptv73nlPUz/cHAFrhkmHyQlz/YmxtoU6bnB6Tb89Mm6u+x4f
-  xCcInhUkf2Z0nActJ6d/ShHBpz1mHoYxecJOzCOWq+0AeY7rObtnaNxj8svxLWnV
-  dmzHLn9D4205bajKb81U2Gkk9Ry4onQTUDkkW28E8qrsvnUiVafWsNab22EzrgdE
-  tarSLaE57ALYvzNlEmwwDpZMWph6oyQDBcH7xGI1RCYBOf40WtGkqw8etH2rg6ys
-  AnMxJHYg/nSuTHrWIfSctflVR12JpERvC+Xij5l+3W9NdwIDAQABo38wfTAOBgNV
-  HQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1Ud
-  EwEB/wQCMAAwHQYDVR0OBBYEFBlY5USJ49V/zrBlmys6qozYxX6AMB8GA1UdIwQY
-  MBaAFPVEPfdwdATFHwQDM+IUuiwHW3edMA0GCSqGSIb3DQEBCwUAA4IBAQCskS9m
-  Y0EQZDn7SBLp7LBukAyoDZUND4gsceTC1SoBwiV0aqBwOPDhD5qoRxmUjN8q8AG6
-  17h212SEXABV1bqYpy/CLVvbtdQ0PRUB+1QdOk3mqIzkIQhU6dwqN+EfmNrOqtgf
-  pQ2j3tIeaW4TsK3Bkvd8EXKcH+VCTMS4j7sR/NNd3g4VxHIRNLhSfostrLddC/bt
-  k+BThN83OhNBIQAMwZgbNNo5qrhIsl2i2n56foJZKHErBrj3OoT7VRzaNNq8Ug+7
-  vzsFeTR0Yh6XKvcUN3nNGuKU+KFXk+NRZOnGNnNX22vUQeRrt393JVdXansjhy6r
-  /yD9AtJ1QZTWVvMH
+  MIIDTTCCAjWgAwIBAgIUK2EYuKPt70egpUnqkeRMtaxvnmMwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowETEPMA0GA1UEAxMG
+  YW5jaG9yMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA701mLY19cglQ
+  JgZwZ7SD3EgdbIx965E37+iMeVGTl4/tH7KuD1VwV0OvbgBol+mwy1Lkh9tsZ6qr
+  4cKPQJ3+16b2/yaqdYOJIRFJaQAUtj0+YLudgvxdKvTNutqH8VfBQqBThVkH91ZZ
+  Em7dJ2Xy9St67Ie+xZCE7ZgmcTW6OpTSiv07CIz/20CtkOznEsYLOC2aahg3FaYe
+  cLo+jWp5SdPrI/9r084Bq1VM8yr8tcYFr/7c0vDCLM5TbgMBKYR9g2xetagc/Kuy
+  ub0283ZB7NJsndbSv9R4KRYCJLMf5xRmmnlnJ9x3kdQxR5dQPohgnL7JX+693YmO
+  jlfC01zbLQIDAQABo38wfTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYB
+  BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBQBcZgMfIxW
+  ioYbz/VqKJGlttuXMB8GA1UdIwQYMBaAFJgnTDDrAM04thyTo+hplYNoOSCQMA0G
+  CSqGSIb3DQEBCwUAA4IBAQCcWWODPyqd3WVxmoyEnzwuSA6k/TGzJW+M0Lw2sTqa
+  9nLCsIJVNF8rDrVN902lW0Kgd0S2cLNJkfbwjT4yAWJvxzmMdqCvVW/6nZwx3UCC
+  +CPy957PV9M1YmTit4oAdH6t2E2nDw2XlKxRIbN1byT9e4EwfA3GvcYmklaWii04
+  54W8kzN9Fh4NzQhfA/w/htzEMOzKLgA6MS8/ZBJUit0Eg8kB0DbHebXeXB5s36dj
+  rEc0TCFHC66LcD3LhePnXL5+zo/1ROZ+26/4F7oQ2PMw/dktDiQsyigARcUw+twa
+  zvfW7G4MhA6rT1d1YX9JYJQP1ZYF86Pg1/ES6KFSOe7u
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_11_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_11_certificate.yaml
index 5186f3168..42448bb5e 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_11_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_11_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDvTCCAqWgAwIBAgIUeKnh3HUD8trF0ETzJFaA/iGgFmEwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
-  LXI3MjAtMTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCxKMgngSpw
-  6SBvvLVooN+qAQs65uYY87Un7cA1X9EPcPJxj/5B0IkVZY3HTDGgXpeXESqwNkkh
-  hSZ1ovhtCCdtRbP0TMehWl63+4O2Bo/zlNbmgoU3CIQeuPfpz4MNSvv5YoIf6cdF
-  6UhLke+RwlVvLfKhnacEGPPIuAT9im0StztRAJ9upejM/u6LLTeYJRx5Ukhb7Tfr
-  YfPs+KqbDYRf02trvJSoAbCc7zBI7uRiF3GS78YtfL8VakNzYSFi+S2nwk0cGsXt
-  6UuPhHuOA/Aluwsf2HdTTEEm1pIa/+8cx2sDBV06//+lR/Y25nKa6KcZ7LSRrYft
-  /hUsmtDeEB1dAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBS+DAky
-  MA3GiSMmJjOK5ffJFbVh8zAfBgNVHSMEGDAWgBT1RD33cHQExR8EAzPiFLosB1t3
-  nTBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTExgglsb2NhbGhvc3SCLWt1YmVybmV0
-  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVC4cEChcW
-  C4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAiVTDnd99zryGydLE2kxK
-  Ipw0rgkbmxZD/oZ4gO/o4DRrb4urV8cQdRL6PAqW5HyErzIQl8fv+E7vdQgTSSTN
-  ra5qiR1sYlSmO2BFxEoICSWFuFb2HnvBlSBp0EpDcb6CjdAMFiDZVzLXolRasBaP
-  MuJklpA6LYFdGiFpoXI5CZ1wk6XFgoOyhq1/M35qO7qPoqhvTu+qJVww46Hyxfqj
-  nJ1ImX3l8W9tTOhjdOs+FEicqdHqg7WcnrWkF+nxMlr82T58zCmJBZTj/k6q883/
-  Y4EOwIpNHAqiL7Oxs3u40Q8ujP6v8PVnrOKXJM8jx6VK6EHvGkYovzDpLWblPCOI
-  vg==
+  MIID0jCCArqgAwIBAgIULv9pH3Noi5bhL1krXd0WSxLx52AwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
+  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTEwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQCxFuOfi1b/RRyYT7g1JZyPnlCfoxBbyPPvs6U/Dkz6rY/E
+  jKz/X5L9J19s5CWOCn2XE6yr724aYxietwSPLBaqZiR6+npbjliex4/TrxIgVbdO
+  oIxuFfmTnXRQ+aqLs5u7WPWXqb19Cy9bH+NJDZXgiP8e42YJFLo/i+NsRlHndJqJ
+  BEGGed0Clu9YlTZ1cH82BcKiaQ0XcydFlDip9XvTear00XfyWx0DzmTSKyV1qW5m
+  F8jGhUfOfM+IV7i4D+1+dO0pY8MW96Azoa1L1+7fY7Fgn6ZE9Rno81dsAZlUiSxe
+  D++ANw5FTaJEb/5lZVpy3a5U95gXxtOX1x6r0k19AgMBAAGjgewwgekwDgYDVR0P
+  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
+  Af8EAjAAMB0GA1UdDgQWBBTAFQChWOyUUYcLrSQJsDkyZNv3XjAfBgNVHSMEGDAW
+  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEx
+  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
+  c3Rlci5sb2NhbIcEChcVC4cEChcWC4cEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
+  AAOCAQEAB8lhKtfU6YthpsRKNHrix4zyQtzjM6srAmhJ1IvXhanNTNWVvd2KgEr1
+  D4lD3kX29y2SM/0DN028JAnutGrwP/fxWR2O2a8hZyUnvjo5HFgG7bWHF/jqbtg1
+  S9HquK3H9tq3G2l0R/99MehjqKJJ/5dIe5iF+gX+DGhKFDzfiEwVarTCZROtLdTp
+  cdcH4UQWYU1/QJfPsg2kJtjrgtmPee8EQqRHpYzBCc8/rO9W37uQpLtYM/YQyheo
+  nGhZNSLvYEk40VKdnjwH0ehx2FdMbhyj/MPYp+zaiKLvmaTlpEdKxDOpFpzmoGJI
+  0o6IWhsQKEhnwXcqUeaYGjuv7Y9HtA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_12_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_12_certificate.yaml
index d43f12e0f..03da0b8e9 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_12_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_12_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDvTCCAqWgAwIBAgIUfF/oCh4vO+1LBTIP6KSq6sz1bRowDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
-  LXI3MjAtMTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCw70BX/Tix
-  eEPYziO5zBG/iYub6qUvnOs48Eqqw8xVSDH1F+aUIMj7gB+e4SscB3o8+wBDOcZB
-  A1F1rapurSXBBoD4VeF4VnnxPaJgP2eJ1jlKhj1rJFA9ZXxt6UzO995pFQA+di0J
-  hyLoQQKruLKCr+XJ2WN20d1/EFZF6sK+OREI3knnQ6eJmb1df8vuGjyk1JQfkGrK
-  J7SA/z8BmgXrYvudZJsGouuQYgawUdoJWwKxiYh0mvjlDI2XRtSqKPWT/F6V5r+7
-  jINvyPDHBW+70IkUMm+pHzeUq6mV/pTtmxMwEIpHlGphhObUE6+3P74Myxygngoh
-  povH9jDHQZcDAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQU/Ifv
-  Vx7+veINa9hkEYw5l9hWYTAfBgNVHSMEGDAWgBT1RD33cHQExR8EAzPiFLosB1t3
-  nTBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEygglsb2NhbGhvc3SCLWt1YmVybmV0
-  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDIcEChcW
-  DIcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAWD+nxhHw2+pQZMFrlkWb
-  C71K4Alc9+72s5OR1nu5KE/jeDLLq2386fm/6ACDryk2A5frUSGGPAhTlX/9qzEi
-  Ch52Y3J95Ifsdqdo6pGbKLkYpkUjSzI+a6T/Kt3IOsyj38t6GX1cFI6ySZ5g96Zj
-  flPRXLlEvc3aDyeUpoxnpoEelTryTl9jPKL4YIQotOLtk/YUtnQZpw5dsCm/Qw+x
-  rL0wNJxDoqrw0esrsDb+vYWq8sqSCTDtbpdLCu73HQ4xAKZQOMQiV6HRSHJDRC7l
-  e20PK1gpcDuN1Koo97zSuR/X10Oo0d95xXMgP06+TaG5iEyU9iXQQr/jk8pJeeq0
-  Gw==
+  MIID0jCCArqgAwIBAgIURkwRsm/AdRVIjE5z4NXxtCRN1eYwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
+  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTIwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQCbGaSURVDhl9KIf/9zseP5Fu4jvqxP0rzKLXCLe2eTsIiS
+  VupHSV6v7v+QJDqwRHlYiXUbiKO6ADbITP4U6jsBuJ6/0nNpjF7DTVDWbm9gXXOC
+  cwb/aOA2/DIr04lYsLwgYXz5+WmA94KjJuCSpQFsHKV/gZaLzPC7q3piGozC3ElW
+  sDFLIcz7+m2TFID35pFyKZ05tgAwulzj2JCqYnejxuxxMiGuhcIuCr62BGjvBfHR
+  P1JbVBGWnjMdSRn7BH4SzUITsjScG4M/UMMEp4XGFvnhv/1Y3CNs5Kf1yLjceJpW
+  PfjqtdH5d5G2qX4GQgL3CZz101N1VCwQpII4SikjAgMBAAGjgewwgekwDgYDVR0P
+  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
+  Af8EAjAAMB0GA1UdDgQWBBSXPDi2/Yjt48tTFlYzB3c8XN/UwTAfBgNVHSMEGDAW
+  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEy
+  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
+  c3Rlci5sb2NhbIcEChcVDIcEChcWDIcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
+  AAOCAQEAfxkLEHqTE3yleRLy/WVEn0B9vW8wMH1C+7XNolrculj3pJjdhfGEyQgn
+  LhNtrUEfxr3ZdNnO7xMFdvVehrUTxfHG4E5lc1Dl5sOfuEwXiCspzaSL5NXurfuE
+  oTNU40EX3m4ec4bt4HtN7srctja3SCYrsREQI3uwnxJGzqHtQ6FuvtnAmUZRGXEY
+  Yihr+S59ooNIGADutCpXdhtASIseU389NwyqlfgN8rbMfix83eCN54sg32U5eCXf
+  lGHXAfX/2kheY8pI187xqsvMQp9s/tRZinMgTt/8TlewZTCqx4IgAnz92+hTFfSt
+  z/q/euwYpF/nhbrHrPyRLZcbctHtKw==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_13_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_13_certificate.yaml
index f8487a49f..320cab05a 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_13_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_13_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDvTCCAqWgAwIBAgIUUV0jfB9kdem5WKEMRbJ7kHu9exgwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
-  LXI3MjAtMTMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCj4ZVyv1vz
-  k9u7UbPa90RJGESrp+yQyLYNnKAI52VDWDQ4RLQhS6tuq0JZkvCab4v5luVcRKg9
-  UGf0blvafqOcnAS5HyQQCetOSH8pV1fivFH2z5aErRc3IZmO/cGHoJWmDGsbpDAa
-  BOadI8HHiC3cmQ3hy4kOmi/TNmtr2229pF5WDfJGC7mJTMqpwtZlQJ9gcxDw4hEq
-  iK3rjta+NDGEEPR17Vb/NhsFcGKVzTukNsBvl0SNg4nQJUTDjxxd3nZhkBhojXh1
-  8PnJ/2L33pXxrbbGDc4+2m/yv80MucvvpsYxqK5jnTouTNdee/dAsrEFK4eW6BE7
-  dSD5Xeqtle6BAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQyYaqV
-  nNZcYFg65+EiGe9mUzHBwTAfBgNVHSMEGDAWgBT1RD33cHQExR8EAzPiFLosB1t3
-  nTBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEzgglsb2NhbGhvc3SCLWt1YmVybmV0
-  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDYcEChcW
-  DYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEA16gHynNqu9pGWD8g26BI
-  j2DvgFmqOjJrAw5SI6rPoGqW0WQ+Rv31KR/UbHMjgIelkHRGr0KIDxKFA7zIEsKc
-  sTMAm0k05uHaz1grBRQYB2nYL7BHI3E//zNSjSiGmY2LXM2Gshy9wq+2luFBh33V
-  PsyrE+n5BtqxAQ0x/INPWrxqT6Sy0oIQ2Tw94VrAdbUqRQo0nCfTs5YtOcrVNEnD
-  jed+bXXe/zRoH0PkzWISzW47/KX0fWNdvUFq3ckN+3nG6htZdw1feLzrrvRg/CRq
-  SppRT8k7P/FR0Fiq9FTG8+pc1EYddQE0ZpVTJhF6FKDPI/4A5rq8u+vYbeAkH74J
-  Hw==
+  MIID0jCCArqgAwIBAgIUIcw/IsKIbfpglMdCcCbQr9v5e78wDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
+  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTMwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQCzhw6NGmaYDo3SN7Zj30WnsLI6eQ5RWYV12y+2JsqNgdCf
+  8Yy719HxYbWzYRvMzxWLLYgPyHUBrdFuaSmPIq1aYawbtTbMOSopP6YklAMyUYVr
+  nY9b5E5r74j4PRlQ6Xzb/5IuaocxzvU9TtF2ZmgZHLvxgOH1tq/7qesLV/fI15xr
+  nFkYSyTAiAb8Ndq+5fCzbavAGcSEoOsaCaYRakKADku8vvXwdmT8fEerX4fHxAXn
+  rcw5eKOI5mQ6/kdygwFH/7eyjvSmvPg6GFdQbcPAUZeyAdikFI8x5LNOu57RimKY
+  6jM9PEoY3OlGD95UXaZpVAT8BugmY3TFPBh05JRxAgMBAAGjgewwgekwDgYDVR0P
+  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
+  Af8EAjAAMB0GA1UdDgQWBBSnZ9k7sqqA6JFHqbHN4pZNGCWbMzAfBgNVHSMEGDAW
+  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTEz
+  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
+  c3Rlci5sb2NhbIcEChcVDYcEChcWDYcEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
+  AAOCAQEADXXYbdAmj2X/0Oylu/6zE1SYmn4oHCb0KApAsHNnqN2tlqjOiCn6gFpT
+  gaOQVhRX6aELLRlLjtcHx92qgKI6fnbca5ZdEFygAUWUJ9NUzUJdgp3EfWPXYVDS
+  qP+cyibEkzJQ5ed+DJ4hCeuACgDXyYXAJwmB75EClLshQ49BpCpq9yWpaaoKVolG
+  d4u0ohgZjQklKRP6+YHIQ6o+uCfqm6vXFSoXtfNT7qNFcVroW7PJOh42pKBNg6z2
+  Obtx0V9iMvC8op8haKL6ta5cJBrWFgzBM+HaDKq9zO8MbSg4SzlJQPWkk3W06CnL
+  nDpjm2zqaAQzmyXl1WMJKp8ictp0kA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_14_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_14_certificate.yaml
index dd891f2d5..cc362a7b2 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_14_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_cab23_r720_14_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  MIIEowIBAAKCAQEA653fsVwA1ZLFKVNxbVteVAkxATeComttCPc35+lXMGaUJq8K
-  UoiAMeAq/WEmSrZzjj6vCF4SYjMXNq9GVCsh05sPpi5CjgKBhq47mKAiSnfGgw4/
-  EA54TOSL0vslCE4nBfhTCUThlOe9tTGyCgb6rCQz5oHJ9Qmu4I5nxClpwZIUWOME
-  G20Ca8QxoFkauwyNINFtN5LIA0i9jnr/YG2ToerBdw+7cb0PCT8kEXDE4O1PyX2n
-  m5Yfmul+cotwq3tJmvUR9OkV5+EMf335dkxNSZ1JioEj1aNk0Ri0gXQP8gVfyjh5
-  4F0Qb4KMk2v6vc697n0ukM6g4ddFMxe2J9uDmwIDAQABAoIBAEcKYtfnFZlPl4LO
-  VfTTB63u14e2ZPzzxvxdDc4u3MsLIsBHJqWb4osnO88J67G7MTxCSiQLuR9CqE0k
-  q9/U4W4b4qwIZqjKuKMTBYUPQ0eQtZnuQbVlp4AHqOEEODY42itCpEa3Lgznkpt/
-  UF8Vm58rizqFB4+KS+AJD+BlXC2weZsLWGIathUXlKvBrI+8FNA+uxijFZ+ZOCAk
-  WxjD0dctjGBUPPeMIcB3Wq1oJRwqLDyKXPMOfA+hNvpcIGrSFkhIaDaMmfx0i/DD
-  HdfI2XdukNvgGheeR4G/IDupHW8hDUII/d6z9KbSZPH7PaUsECJh6iTnnekGQxQq
-  CP1N3IECgYEA/2Rqx1GZu79ieNmZnbdm1rWjk/JT8zzo/cq0r1JE5XviFXgHi917
-  gBPCF5GQvG6YALi8pnUcRK5/yhZCWg0dXZXW/BAQYuENdAxK6WATdpUdHKPfCpDS
-  q42CGoBz3UWbKTuOa3WsrgWcsBMJQP/Ex/nRarDkoFGEPDdGlZA0G9UCgYEA7C1o
-  2pEyG49kSj+4v1P2funJKtimf1Z0K6Pl4dDQ3DsvY3kdx14+VCIlA7tUfvWOND0H
-  Juj4hOxyvVTIbjYRoDnJF1vEYNLQ/9FR93xT+iXIaUsnuMe2aNYN+TdlcZUC0s/g
-  /Ry5qz09ZDfVJy9Mo3m5E5eMRZUJtLCb5C06Ca8CgYEA1G7BhtOwTYPvM9jEN3Uj
-  XHsv+lL6U3wZzWj8DE0hM8VtFDCIDmYHYUyOCK6zNpnDY+5GNSt6fQKtFvqW7HK2
-  N274qSfviV/rodjLwv2AkwWLdpQ0ZYR7R+loDAVG2woX+x8n4ui53vKaF7dt3hwh
-  obmB4P4M3fGQTcoosyWEwpUCgYBC2V+SbgKW1nF2qq6qSSO+LIIqRIRsCpZ7O7r3
-  vdlAXOg+6atKIRzXR4rekYmLHgoQMy3xD4Q4a4zWlkbdGyTGC1Ul7W2aUlGh9yeS
-  O3ixlzwwwXsOzEiPR/dQkSN/kMPp07lFK3pKQ906nqsQmkzBANUn/H9Ruquyn0Kg
-  xURmNQKBgEoqLJY//z/GQdTZdg3mRKgYYwKESXua8JMwHIwspokvxlTZSnrDj4Po
-  IoA2NRFb3MkjQDM1sR8QntT6/NPdY4ouhtioR+DN2pq4qiZ8cOZnGNtS/P6yiPBq
-  TS03W6XiWEdXZUEQAbhgEfTDnnSYbCsGN2/huOWrh7vrgDO5xIs8
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDvTCCAqWgAwIBAgIUbkMO7qmaduWZtCGLZ/7O4aQFLFgwDQYJKoZIhvcNAQEL
-  BQAwGjEYMBYGA1UEAxMPa3ViZXJuZXRlcy1ldGNkMB4XDTIyMDMyMTIzNDgwMFoX
-  DTIzMDMyMTIzNDgwMFowKDEmMCQGA1UEAxMda3ViZXJuZXRlcy1ldGNkLWNhYjIz
-  LXI3MjAtMTQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDrnd+xXADV
-  ksUpU3FtW15UCTEBN4Kia20I9zfn6VcwZpQmrwpSiIAx4Cr9YSZKtnOOPq8IXhJi
-  Mxc2r0ZUKyHTmw+mLkKOAoGGrjuYoCJKd8aDDj8QDnhM5IvS+yUITicF+FMJROGU
-  5721MbIKBvqsJDPmgcn1Ca7gjmfEKWnBkhRY4wQbbQJrxDGgWRq7DI0g0W03ksgD
-  SL2Oev9gbZOh6sF3D7txvQ8JPyQRcMTg7U/Jfaeblh+a6X5yi3Cre0ma9RH06RXn
-  4Qx/ffl2TE1JnUmKgSPVo2TRGLSBdA/yBV/KOHngXRBvgoyTa/q9zr3ufS6QzqDh
-  10UzF7Yn24ObAgMBAAGjgewwgekwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQG
-  CCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBTcNOq6
-  O3TP9WRl5S0OMkesvsr/4DAfBgNVHSMEGDAWgBT1RD33cHQExR8EAzPiFLosB1t3
-  nTBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTE0gglsb2NhbGhvc3SCLWt1YmVybmV0
-  ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1c3Rlci5sb2NhbIcEChcVDocEChcW
-  DocEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsFAAOCAQEAf3e/MzWfe6V0d2x7b3tl
-  /GsWLkMzCp8wXxFVEHMPzSxASjkiFqsKZOPDjdrGq1eZUlV7mYM31sxYcsq0LEU3
-  avmdLduRpJJIWxyRhNBv4ORPtC7PU1ppJsVEGIHaKT+1rnvxM3AjEJ3NP6uxEuV/
-  DfNHUDnCA8wE8OC8n/TsqFBHkL7YU6gGHyYZmI+rOvy7FryXxCwJF94LUhN2etRM
-  nZ9Q/KbJShPBpfnwGPXDxKd/dn6f941kXL2utok+MxXH2DthXjocFZvev6pvCXPL
-  Huzt1uyl0hIc1w8bsvTLO0khBKMhLfeqdM4EoVnuhjn0dN0P/y14frs6mJEdh5UR
-  TA==
+  MIID0jCCArqgAwIBAgIUW8Uz1gNYpw25g6BbSOaC7gi9lHYwDQYJKoZIhvcNAQEL
+  BQAwLzETMBEGA1UEChMKS3ViZXJuZXRlczEYMBYGA1UEAxMPa3ViZXJuZXRlcy1l
+  dGNkMB4XDTIzMDMxMDIwNTAwMFoXDTI0MDMwOTIwNTAwMFowKDEmMCQGA1UEAxMd
+  a3ViZXJuZXRlcy1ldGNkLWNhYjIzLXI3MjAtMTQwggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQCvwinBI656gcab2VTyocWar5pjxNw2A0u//bDy+Qflrzv7
+  QH7/bPBmYnzw22VbwWbK2pPrFqQQt3YYhtgMDoxdR59rX5vaij5+asSdklSy7YMr
+  YHHTNUmMA08euyhz82eWVx67+TnfpCmrvzm3eppXmn6tWbUSMv+k0kgVV6VThX23
+  vbCIFtK9vESmpT+Hyn8bw+xPsci74TwezZt1OU0BE9WNHTDX+i6+tJQWz7GWROW3
+  fZeg0i9bXErlrkj10tIAZmB4ET2qma8PoU6hmJHKMxPlGJWmEu96yAUtbX1OUUXJ
+  hlFuZ9zFN/kFcrZnCawdvzWOrQPMw5ydp7stWEmtAgMBAAGjgewwgekwDgYDVR0P
+  AQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMB
+  Af8EAjAAMB0GA1UdDgQWBBToktSxjM6sRjZ04osKruDfBkEU2TAfBgNVHSMEGDAW
+  gBSYJ0ww6wDNOLYck6PoaZWDaDkgkDBqBgNVHREEYzBhgg1jYWIyMy1yNzIwLTE0
+  gglsb2NhbGhvc3SCLWt1YmVybmV0ZXMtZXRjZC5rdWJlLXN5c3RlbS5zdmMuY2x1
+  c3Rlci5sb2NhbIcEChcVDocEChcWDocEfwAAAYcECmAAAjANBgkqhkiG9w0BAQsF
+  AAOCAQEAd30qunuk0RH/gGgdFI4bF4mP/iYFXkGE41ZfMoVtAsP0YYo96cwEHW3k
+  p6nXByUxYHXP6n/njaNHVveNFyeCnEs5wzwISusGxI5fMNBnwMsbnITsy41Hsd8n
+  VEl0hPspW4grt6rZTW+lYreRInbF5mRQwC/GRqZ4017fuEKI5B8PEDWpCyA9kcRC
+  QOy5mxe/ApBXeosB9TuFhw2hofrtOoxPPfZb2Q3gijdTurZwFj5gsCU9OexxrZje
+  FDfarS7yjW32KKZXh5ms51abXr+CoyYjgh7xDpdNKc6pBU5qY9ugjPBSOk5f66S+
+  Qo0EUOuCkZWEvDcvJqMa1zbstQqf1Q==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
index 4ac41e312..21a5a4548 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_kubernetes_etcd_genesis_certificate.yaml
@@ -1,71 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-genesis
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-genesis
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  ihocgoim76OdvEI2NqPhxQ==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_ca.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_ca.yaml
index daeefe12d..c7ed8e858 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_ca.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_ca.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateAuthorityKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDMjCCAhqgAwIBAgIULAQrsqQVY+P7jXHDlX01KV9qvEowDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjcwMzIwMjM0ODAwWjAfMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2Qt
-  cGVlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM7O+EBaIiRk9osK
-  QXJO/lB+aB8XcwZ4usKVAYNKYgBvsjDqQ459ccIuNYwdOj9IQhj1WlGbmya9UHLh
-  OTZhc5tXM8zsUVzuwmywREhbMq8ksrMhejbImdCWUnyOQVZnJhmD364KjdwkoZN8
-  PZxSeNBF5/CJcpnZl8SSLFGSUHqLLMIszN78T7NV2TvAMbh+J1IfDNupSiIcSBTa
-  hvL95uvVFeAcd1Lq82YP7bhXckQDd1180WTQgCa+/9DUPdfBuAKTelSdrH7Wgzdi
-  yTP6z8btF93SnP0A3p8UkEiUi+4XOa/1qw1HsXqJ77yNT/nVVM0kiC58drktAAEL
-  I95YjDcCAwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8C
-  AQIwHQYDVR0OBBYEFAdfuSvlVWJSejk2PXeIfNGeXRuIMB8GA1UdIwQYMBaAFAdf
-  uSvlVWJSejk2PXeIfNGeXRuIMA0GCSqGSIb3DQEBCwUAA4IBAQBMrj97zSreFjz4
-  Jfgslteb8k82UHrw69tRyAnMWE4NuRjuEfhEd7XlCgEpK34t2qLjO2UPgGMnND5p
-  7s8kAlKcnLJ9DLRvjKwIjym1qy481gwRLMSm6HPE7sRoPBg+qphcn8sJwi+JhkGd
-  Te66W9G9n+NkNZCvCyK40VzgINGCiLqRs/3z9WG5XSRdpCrN17biW0FE9jBRL2j0
-  aksHP//PoJNEeVV8GWD87MD+qLP3xkj6XvHCCOhqkKr1gg9W57tVaQCu6I2KMiK4
-  KLYvLQ3S3wCVogPL0IbZ1K9Jx2OiyAhCMZ8TO7rRnPDFF+ejVZQIcrmUsdlqeXUD
-  TPc/cG+j
+  MIIDXDCCAkSgAwIBAgIUQnDS8AMcNXuqsorcS0qlj/O6rW8wDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjgwMzA4MjA1MDAwWjA0MRMwEQYD
+  VQQKEwpLdWJlcm5ldGVzMR0wGwYDVQQDExRrdWJlcm5ldGVzLWV0Y2QtcGVlcjCC
+  ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMgTtdLS4M4QLzWtdgpqHS/2
+  /T4oLHb40PeKprHT2m07XpcZIwx9cnttKBnlyynb1IhnOk5gWlqXB7tFEQTVJJ05
+  Yu3a1pkjSBbRICemUxV19sreCCrcBrVcQ4qXWLxqzPfNC8X6FPR5sSkAiaPC0roD
+  zgpqYHAP6ZtSC2KXniIupQUFS5LFZ2FbqmdzUfFdowm7JGgQ9p+bdhqFbLvC1WB4
+  WJCmDs6S1LmLwB6Y7uHQv0ZbOoc1vVAv7nlWpA/guHBhWc2f/ojUJRqYDIEoAi4A
+  8Mo/CMMe1cfk2VP4M3IfHaEpktV/8o2CE4veX1m1sQe0PYvBKYUAsmyfOuqxDZkC
+  AwEAAaNmMGQwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYBAf8CAQIwHQYD
+  VR0OBBYEFGQ2WkUpyS3UlJC17O9WNyn/ZIqUMB8GA1UdIwQYMBaAFGQ2WkUpyS3U
+  lJC17O9WNyn/ZIqUMA0GCSqGSIb3DQEBCwUAA4IBAQCPIITFlgO2K+EMI4+/OVVf
+  Uc5QYSbRb+2e3Ww2BX80IMjHXZnUuw01Zy1zFnIF/A+zZZrp0UpW8bCbZWyrUmc6
+  9avZ/sjK9A9FPmhhMljv0XYj+0txreGrjpCx9uJIFFgh+IBT7+5d+0KYHjb/o7hT
+  /gNVQoivY7pL0siEVvA1B/SuU0XDyY/pxmTusdqAtUoJrPz2Fj5dxBIbCb1mX6Dl
+  uOeqqWPao5KEiXsVPzkGesPBhn4XIo6P4kNoYpth0KqpZ6XnVgiQ+4EGBWrO4YHe
+  asvsQdfKlshdq5BpZUGHzgAkEcvzaoMPwRLnJxx2pVBXxzTANBVaW1mQuZeXnLdQ
   -----END CERTIFICATE-----
 schema: deckhand/CertificateAuthority/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_11_peer_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_11_peer_certificate.yaml
index 9b180ea34..cabfbe330 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_11_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_11_peer_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-11-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-11-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-11-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-11-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDxzCCAq+gAwIBAgIUFeWSrhYu1rMJE6A8Q8GrJot5WO8wDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjMwMzIxMjM0ODAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
-  Y2FiMjMtcjcyMC0xMS1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEA6fc1/B482kWnPkx462crrtfayhjK4kSjB/xT0yhtL7BG6Tb80dB0d18ePI0b
-  jmi3g/TF1T7HthuWP7UkpXRe6bHuRcr7D6g7bDfQJswAm9/eVYJCAX9mtnOnTGnr
-  gVy/kEGoVcNObcIEv/123uj1QErD7631YkrysSJurhImXbPH3Pq0q0wd3JGO7+S6
-  tH6+qZrY+ZOj37RzplicC42kc1Gt62NQ+Uj7+arOwIA/enjYfX6iZY4n2asTvMV2
-  h2FlAi7ZwW7F8yc5KH4n2cqhFLJKED3CmXc2d58PSFpyMsHQX4WFM69/OVZxF04i
-  tZGoJaNe3MODK85RlJJvbtGrrQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
-  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
-  HQ4EFgQU2fve9yvaVO/kD7y7PofFZtWnWycwHwYDVR0jBBgwFoAUB1+5K+VVYlJ6
-  OTY9d4h80Z5dG4gwagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMYIJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAB2Yoj+b
-  3RKRrBiOotVubH1YpbAZ6u7vlt/bwde3JYj5WPhgnw3oQindEC949QBztu/ESMy+
-  t+QngIsQpPei5pRfolSxDUMwIToGO8fgQ8veHuT9Uz3klKtoA6NkspOrT3wLrZWI
-  30aeQQAB/LljgYzsRPxsksdHYkSL3HI34uqAwbh0D5oYE7VmCeYQeJNYZx3CCQ9w
-  fs6CyY1qfmQuvauUbiCIazd8oGnVSd/SsPT5NuAIpv+fBszFQjGGTYMTIB5x+V+w
-  3JNYRwB23vFXwXA12X79F0ft7kg0tnym+HdPtNFJDzN3R/hR6uyYcroq2uRlAxbr
-  z4NTCBsJVnJ5hnU=
+  MIID3DCCAsSgAwIBAgIUR9Ud85YoTs248uMh3xEYunKAzbAwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
+  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMS1wZWVyMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyQJibGOvV+CFBszYqWtig8OGW/V09jH2
+  ccTe7he5bdqeuvL2/MDiHchJ+ZfGp1y7Y4rAoPGLanjtyxkfeWrkFP/Aok3UrobT
+  hHZ1LMP1zI1gg9dptabwXAFgN9C2M0o2G37hdPHktSNQLMMABZodcQ2Ub0v+eASS
+  qis6JqmiPtXOXeO0SglIMUDo1jN4q6co45JyX8/66vTIxUOfUqgxhX0Uu9WInsMu
+  FNUOrQM8Ek54fl0qWrSowaX2GJ/iyxLNjTeREmIHMA2uKJWlPPX7mExVOgl8oNf0
+  On3zRxBxU5/NVq+h9ugB03g0wPLJZ2jCPIdsW2jkMFUtIATP+10W6wIDAQABo4Hs
+  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUsVnw3ZY9kNEv0tm+AiFJboIuauIw
+  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
+  MjMtcjcyMC0xMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJ
+  KoZIhvcNAQELBQADggEBAA7LTGlGV3EgiEkE+VVSF2kI57+dfnsPVcVmnovKUAev
+  Fsc1NNEGFka+q7wsFVwqlcujVKVp00Wd37flzX1h/MNtiUmHZbfLXpUYPgL0c+KN
+  qyxqvCVgo1S0cQee5pF+PIqhKLQS+j2LlBNtDaJSwVpbl1EM/oknwB3JEuunyUR7
+  Xgns1LSKq6ZOqXmAxqWYyC0AiekAACv2M3I7CCfQ+nGV9W9gFaSHMxhE1X/kDqch
+  RQftzsD3yfp3RI5A7feLmirP0WK2Sgj1wJvHv+uQNhwjUo2RkXsFo4lbtL2w3sIq
+  LwIPIIGGC6CcEezHQ5LqBDvIL21oXWzKPV3pe0e19g4=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_12_peer_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_12_peer_certificate.yaml
index bb1e54bbb..7ed35f1fe 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_12_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_12_peer_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-12-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-12-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-12-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-12-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDxzCCAq+gAwIBAgIUXf3xSXlIqhcEbBuWiFh5BlV0eO8wDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjMwMzIxMjM0ODAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
-  Y2FiMjMtcjcyMC0xMi1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEAtcrj8dz0gIIO4arC3+vEvBcIfFPBERvsVHpS/LZ9BXBYITAeZsdoUt7u1fL3
-  FtNP8OyOA/onnSUX4DYmltl8DHXngFdSLVdJOL2zo9EuICF0zpAM1NWKCptTjoqH
-  NcRsvTRbdpAq7RRbjH2CBb4W+oTcabIkXVT+s4PH+HJR8RQwDghtQIs3OTWTgxxV
-  xLURbMbDLKhZQyL8G/PSOwbt+HIO6E7SG3fEh1ERnHUUUvUyWgsUh2oguY8oTcL+
-  +eBcb2HAE1mhhoZYUU2HzlJw+zbe39NDAG7tBzogmgnZCLJPbpH64sjYRS8cQa3j
-  RXRirDGhjWb7fumaJTmGSatDlQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
-  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
-  HQ4EFgQUjhJ46IEsZkZp7XY/dkUelCZexHUwHwYDVR0jBBgwFoAUB1+5K+VVYlJ6
-  OTY9d4h80Z5dG4gwagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMoIJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFQyHBAoXFgyHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAJ7FyR1p
-  hypE7VirMckqyYPzJC82gVuXy/EUoFjTXjc4FcoPpQdjhQWZG7pCMeh8VaYCGoFd
-  ryfhdvhhmdWOJH9xF6Lns5xE+hmjWNP7bHSrgS1L3lnZFtiMIG8/nsETqPRg38fy
-  2O+32p0JrceyMmYeHzDpzqpNQxzVl3dB/IAppuwJQ73unUnaw4avaHJ+LpUa2G3b
-  4SbhUnbn4b3BO3tO8zfOOuNP8k8xjlL6h7A6HItrdcpW0DYVQnnSWag84y4Yj6VO
-  n1ubvDeqje37ZkecRoSUqZUcPinXtaEewmcn/2RSg/AZKo5+qRSrs0Er/UlQP1GB
-  BGcR2baR0LYSJHw=
+  MIID3DCCAsSgAwIBAgIUAYGHm5GamqgBCHb11EpPaBrPGxMwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
+  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMi1wZWVyMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvLyYfdBHmTSp93v8fm2ZCYMRD91yrp/L
+  J2/IbHvOGHiOjSnjNzm4Vbu8bD6yCNPfJk4zd+AookFM1ESrzwPqlyvY4XBNxAc1
+  BTKLSiWTCGV078JR4C4LgO6adZCDpsvI2iv3GgcWwtZwnkDuCMKC0H1X2jQVYglE
+  idgRFCGnq1tuJS2Dt+JIMenZ/7gZMsW9caI6GTxTlNGVleSP1BWlMLsGfaZolyFK
+  uZvbPDOh1qzVlr2wdYyuBJtD9+KxRfMJ+hFI85+UQ2XCx0sNPx8vn4N9x0mZhALB
+  xj25FqG36Ah+S2g2p2io+jaiL5dDU8jKERpXqWeIFaYYjCs1ZH3FcwIDAQABo4Hs
+  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUoVVXTWHC7AUZJ3UX5AJGwa2thTkw
+  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
+  MjMtcjcyMC0xMoIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQyHBAoXFgyHBH8AAAGHBApgAAIwDQYJ
+  KoZIhvcNAQELBQADggEBABzgNfui8VwZRV5I8vzSyxFmq7XdrGUX28MBm2jXic1L
+  1lY6Ag4G+ztaCzYHqirgWBGzbUdzGLSv1iUoACVgRA0iGbzuQ5tQMO+xisiM2tNk
+  4Hv1mcvjqAxINldOCMGgNeGf1blMq2GVq1ov5BjXfvNid6fikb8zosb7juoD1sz4
+  vA6zroJmYmoczrkwu3iUdyqeW8mHyDZgId4IgbJdPDUcr6Q+hrVleDZ5qR70tLzo
+  CPWuXIbvQ3nSFNZW61elfk/fTpo1Ml3049wXc85LtyOrPdwoGvOKljyZb22eh02s
+  ucv0x6tNVyP3xKELVeQAywrC1oUZ9CAUzrPsMMsWkko=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_13_peer_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_13_peer_certificate.yaml
index 39e4b692f..382d229e1 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_13_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_13_peer_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-13-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-13-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-13-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-13-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDxzCCAq+gAwIBAgIUF02npxuikJ8wwv/97FK5nU+Fm3MwDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjMwMzIxMjM0ODAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
-  Y2FiMjMtcjcyMC0xMy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEAnmR6u0nK6RNUgAR1CrB8HmFS1CbvpfLgjidmXLSk4p0LfhvB6aL7c4wdtl2F
-  bfX3TBl3xcEbB8qzkIJucLG5EiZca94knOMsvd/64W6u15RvDCkKayWXRP4m6CcN
-  tFs7SNOEFTno5nPyivj/LlanKfNx6rw2bjIZzhxVUqXe7WDP72EeI1+SlTSUSikH
-  pIZVsPP5Vp6sNR6Emo7i2tcHOpF4G9266FWBEXuvDRUEqclAoBpF5qFFIljAez3g
-  s4QlV7ngh8ie9CIOeBNBWlrZMrLkIYEz9bW2FB3BBtlk+Pn0UN9J/NByWIEB66Fg
-  CkTdr7dPitrNq0Q9mNO+FEXx3wIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
-  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
-  HQ4EFgQUs0kqMCYRo8QzgugnPznWVXMUs4cwHwYDVR0jBBgwFoAUB1+5K+VVYlJ6
-  OTY9d4h80Z5dG4gwagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xM4IJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFQ2HBAoXFg2HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAHYf5dFW
-  uDZIup//TUXSxvYxUdn2ZUmWNekO4+oWAXDEKyKybOFXCIKRJca/pknCe/pD/nK/
-  z2ysHH2RUE0+s2c3+8WxLYalktCMNR6J0Zjgxogw8JSqT010xxWiB1N+8CnacO+9
-  XIx8YYQ+hzW44Y18LAHykKe84jYRghj1nhnjhZTgEgOFwSzwT10b9PO7W8uhpneL
-  7YL1XGFzGlz7KqviaSzdZpwnSJ3jglRGJYpIe2zkbEJZTihAW2YHAqHafnZo0vWd
-  eXPMOcFYA3SKigxXzYZQZoD/hSSi4Wnwpi2ZTCpFSkFlhILQ3iRPhSC3aKYKYt3+
-  VoDEsLo/fpksIFA=
+  MIID3DCCAsSgAwIBAgIUO4yjODAHBgSYStpTWOAxfT5o/FIwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
+  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xMy1wZWVyMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm8dBTNTWmc8D54asl6pAmvHvY8FxQvi8
+  lcGZLxx4sEiqvp3Fuxoq+HnYT86/fM9HL8E3XSXA+CUNyCTNfCvhuXt4xn7QFyGZ
+  bL2TI+o0pO27W1SbCCx/nqDEG3mxoOPOoZN+KIh2EUtTFPnvUD/B6L2sxpWsB7lb
+  CMMylNud0EXjVd64ubTk3w2ett4eFTGtHmNkBPI7wW/4gKC53S07CZzNjXuC+oBv
+  C1A3n4zz0GOdMggCJxAdu0b7EcJEtmF5Zftct84+GVewrV1Td1+Dg+GFh79u9IaB
+  7NaMBs7gRRfEjXTg35aCMEPRAhtlN8BWrSEAVcEM5oVwStDAaPIeBQIDAQABo4Hs
+  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUhoZMiBgy6DO0DImN/U7WjWEW2KEw
+  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
+  MjMtcjcyMC0xM4IJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQ2HBAoXFg2HBH8AAAGHBApgAAIwDQYJ
+  KoZIhvcNAQELBQADggEBAJ9iPBGe8FhJW7tYmXuHaH7KY+BsUQqoGMFFbm1cC04Y
+  eu07ry5QpZcgNeW+nmE3CLjJmoG+XQ3e9lEkT7fHAyNddkEd/5lx+4i5cyyXdmdI
+  rSOmht1W3KTN/dVxWAy8fxVBsaMUSylXsuwo+U+kxONPB4nVjCsTjEitA2thMQmF
+  8Sqr3q+nHizs1/llb8nAkbsF98ikoM62QvsGe2dxaLUoueOcFaqKYcJpRJoeHs2c
+  UF84ok08VVDjS1zwIa73cRp5agFMeF2LRGsZ+EXBWMKBxug4o/kK7smnRCbe33k5
+  HReiinvDZwc1qCtXAa4vUY27baq6+nPd3fzHU1ovyz8=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_14_peer_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_14_peer_certificate.yaml
index 9515cc1fa..3dde3f399 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_14_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_cab23_r720_14_peer_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-14-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-14-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEApVwzNhFynQhs8HiFXnObOi31y679htHwqIt3yw4yCZ2nq4R/
+  SEO/BViDtyx+FQIQW1siNl15wJZgBy5aBvtTyJWDmQNPajUDZRVSa98VcxPQxkqu
+  td1LmFpyY4c1LL83SzMcP+OL9Zc2XqPORW1aYsgZOfs20yhlzTkU7c2vSCg9rjr0
+  4rqsKWVtT237GMQ9bu2GFg4Hc5GVPrzgxwEXtB2v/XxWAB/E3sAr0pjlJM05kRdE
+  6d5ukFAYNFLLbhZLOE7F8HAOXFyFHgFmumW+YcygipIMC0mPZZ4iZnqAfLQAwR9j
+  4bhHcUuMeIph6PK4aUbEKGflQYtPl2kZH2QkUwIDAQABAoIBACBfQm9NTyDK63jQ
+  P1vUSglDwiDT6zIfm3uDgjowVz9mq9J6J+jfyl+jinWrsisuskEQQExgVFuNlNMT
+  EfDX9vkHvDGSYlOqeTWqzO3tSGe082Q+bqGP5yK2Yjp118Ug0hRYtykSxO2ZYr14
+  WANjexRnk/iz43HHMNbSW/SKFcyMM6fijX/XwzVUFx6b8bVv3J/pV+/47nky/RTk
+  xYR67c3kRPafffm9urnAalAlIShPZfW2I4skK7JLfQ6cWburvQPhE1lOLepms/TF
+  6O4p/1BVzVtIkKT+u1FaAZdMX8CXuwsz3KWBqCn9AQhx3i+A1YTnAkjoJpwkJ9b1
+  uUxQtTECgYEAzo4wzpWGiD2feSZ53Ii8XQfURXomspRlTVC/RSu6sWVXYhb/Crv4
+  CwQvNBobeKChMRwLFuL3S+Nrq3j3GQMzBJL4uUKte51lsJDjuvXCFjtdtg2IojJ5
+  2+OVCac3SxQDmCBpwodGoStufE7I4pkHJbrivx91eUWjTr+4xywTVc0CgYEAzPGL
+  YQk3wDZ9/lJ5maWCTvK7ZTeFgwp7cyaUubYA4HwllXmJImCdR/iX1I1ISEra8A1e
+  XLEmSmm0v9rlaEVYqsdf4cWNwKqt6f3Qf245KCnXy9vGuy9hg2EL3w5l05QyjQsz
+  qG3piP0XOfTIMGPF9e8RjJlR40I0yKHIqG1PQp8CgYBiZOOlFR9v+QLloEl+n3gz
+  TM52hji26u/Sw7tJhQo7BQ56QIAfqej/vm+J/0HE1afTkAtMTLQG53/bwBTdSmPc
+  MvLetX+Umibd1DdXUUiydHcwiQPkV+0qrR/K6GfzkMYhipc2vmAL2HeaKaGSJ9l6
+  xKrM5nx8V4rysWuhHULcpQKBgQCg/dX5gh4zdhr/X5Z6ZhO5JOCkoDrXN7LGQDZw
+  tFJ4Bc4YX4KkaLTkxpmutNVlRLg7/qRzuA1WQzdjxvaTNHZ0oW3mkyPJh8pal7Hj
+  iJiJvmTwlVLF1HCLnf6PWGYREMetGHGaC816eSZ3tpxTtuzZRtXIVuCG34lLWhug
+  g03SDQKBgCdpwfBHVPZK5o+AN+dQbxY1IebkBVhB66sDfKuSXReHgbKTF/iK4hbH
+  AIxcD4WRiGXQ6HwnYry7tIb1lTiJ0PVNtv9ndhtbnekcnvekr8gZMw//1C7T35V2
+  H+y/tHfzvme4HnnS54Sya2ozfyidWqUmS61ZHiALRklP19DirSjO
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-cab23-r720-14-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-cab23-r720-14-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDxzCCAq+gAwIBAgIUA+bDWYMpq5rlLuC6aE9Afr99isswDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjMwMzIxMjM0ODAwWjAtMSswKQYDVQQDEyJrdWJlcm5ldGVzLWV0Y2Qt
-  Y2FiMjMtcjcyMC0xNC1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-  AQEA6kIUUmReXSBuBXaZuAuoLHsp5uQxrfFO+L46VqUyeunly5WohvIGc+H+8qL4
-  Nc2LGisTNbB2Vnpg5+/Myv0L6MBppRgQdoMHD7/rRgMP5gjhIgV5N4YBWgc/Mia0
-  YhruJins/fBHz8Fph6Hu0hmwyuRuChWIiYgU11bA/tCxACQ6qjPiRyhyt+cB6QIA
-  ciNOQJBqaMnyk83FxIWTPMrnDBoh8rNxBiNH1bOLEVzpeT/bKLqQzfKDnDOUsXgZ
-  +irClH2Y43y2xcjQllVYYSMLdYToQ4JWelldpOCvlu9j6n9HQKdTSU05p8tYSzE+
-  jEtJF3ljSjEhRNz1kQcinKDJ7wIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAd
-  BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNV
-  HQ4EFgQUu6mEOyw2+eVLCGNt4bd2nTla0DYwHwYDVR0jBBgwFoAUB1+5K+VVYlJ6
-  OTY9d4h80Z5dG4gwagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xNIIJbG9jYWxob3N0
-  gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyH
-  BAoXFQ6HBAoXFg6HBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBAF/2WyyD
-  vpgDi/CAq56gTmUpLi6M49io8gUcPHftXR84+n4nvYIMbECg02yHV8RCYf6AWaKl
-  Ray7XIkkIH4hqf/NjEBtaFLPDE2g5z9nlNZkYWqzd06HaMgNH9Hhhevnygt+GNZG
-  yv0eAdQ2DsGhehRUq4Jf2yFyeJMqP3bLLD4IWo4RjFpUvoyeElnbyGYkF5g4e7f2
-  dnyPl5beDcdV8wWQwOGWnyUY6j6zM+khg5mDw1qZCHy5+OqE98qAjLMzx920arE4
-  HwYFsdlJWTOp95OivbjTYPd9Zo62Y+7hXqdAy5Jcx90uo4YfwZBBJasI1Kh4oAYp
-  bYfIyPqBZEbOaV4=
+  MIID3DCCAsSgAwIBAgIUL/kF8wF5es5Et465tJbrZwwZOg8wDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAtMSswKQYD
+  VQQDEyJrdWJlcm5ldGVzLWV0Y2QtY2FiMjMtcjcyMC0xNC1wZWVyMIIBIjANBgkq
+  hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApVwzNhFynQhs8HiFXnObOi31y679htHw
+  qIt3yw4yCZ2nq4R/SEO/BViDtyx+FQIQW1siNl15wJZgBy5aBvtTyJWDmQNPajUD
+  ZRVSa98VcxPQxkqutd1LmFpyY4c1LL83SzMcP+OL9Zc2XqPORW1aYsgZOfs20yhl
+  zTkU7c2vSCg9rjr04rqsKWVtT237GMQ9bu2GFg4Hc5GVPrzgxwEXtB2v/XxWAB/E
+  3sAr0pjlJM05kRdE6d5ukFAYNFLLbhZLOE7F8HAOXFyFHgFmumW+YcygipIMC0mP
+  ZZ4iZnqAfLQAwR9j4bhHcUuMeIph6PK4aUbEKGflQYtPl2kZH2QkUwIDAQABo4Hs
+  MIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+  AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUGp/oW1Zu/dpeZqncIAmi41rMhv0w
+  HwYDVR0jBBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2Fi
+  MjMtcjcyMC0xNIIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0
+  ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQ6HBAoXFg6HBH8AAAGHBApgAAIwDQYJ
+  KoZIhvcNAQELBQADggEBAIvvv5DTLKOCm3lT03Nv+3vnYx9Mzb2pV768fPW686xe
+  FvYexnc8XU1ksuvXigXDyku0L2/9EpiKbwO2b0X31lTpuXZ0JfDMU9TB23xaAKlf
+  4BhoCSFDbyaeHXhK+aSx1bhCUmb+T7/78W9CIvW2Wk9gtPuvyslJ2Vvb5eLTwU2c
+  O/JzXPuLx09QMnG7AJC1EoBM2BySTM4HmoywXCtLkq6subHJtDSeT55XLakMG/cY
+  i7a6cdeG4FxBrBPuuiXDTFNUZs1K+JUuzto/6ZIFATP8YBz+YCPb8uVTgPiJ7Q5G
+  E0JtyCZfr5oxgcaqLNgaurTqu0HqrZnwRbx/12Tu8bM=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
index b866f1662..39f7ab402 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_etcd_peer_kubernetes_etcd_genesis_peer_certificate.yaml
@@ -1,72 +1,72 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-genesis-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEArreAPHbkIEUxeiBGn/Vt0BZQj3mHkmToajpPLaS+82cVGIh9
+  9WTT/UZMZZvv99L1D4s28xX97b8eaJa7PJPCoGUeeVKtMix5Dprcrg6FQa1U0pu7
+  vWA70wayqmrx6dwrInzp5ZHgwjmfECLO2qOEh4HNWYdETypjzcugz10UIPmf1PsM
+  1oqS0D/QZMFoogjuIQ3bNDdkgASFujz3hPGJa6Ibuil4FYqkCsKdClUshSKKgZfx
+  7RLXUCHwCckeKnRQ+DnNhOFoEqnMOrsKBxcG60HGniof1IFND1aQWxEpwFatNtAT
+  6O2poBwD6KFd2Qla97PW8NZGWn0dQ3yL+EV56QIDAQABAoIBAHlDJx/QLLkxDQwE
+  RsBSqWrZcgSChtPWcXD5E2dMhrONAhlK8pFU78VD+1YyirTol+m35+WDiABwu3w/
+  0ahTrauBQ0tVVJwUPdkjJrMvpNFWqh6atAzWM+9dILgjDdAQXWfMZtJNEz/6mimq
+  3wLkpuEd+BaBSangc/CrueryYTwYn2T/Vj1GO+c7SSja3vN+6m5to5XXFMMJCIaF
+  q85Thvlv9NIvlCkmMtueH+nrRmLCMiBKjuRoVstITdb8I7iT2M8Jnm+z8w6wDhYx
+  tyNp12xCCsmg+Bf0LpB/TmL3jB61jC8UpTnwcSkgy28/0Wk55f0cjAQqQmh1JO0n
+  Us68cDkCgYEA2WukTVQ6lIbdTmores9NZtT7itciukV3HXrqqPb/NtVZ9o99znvW
+  kydaPkxsjkpy++cfJ0Ms/yhl++rwgGxdvgQ0FB6oUQVQQ5N8J7mXRu8EXb7PfhJR
+  Q2HC70RavM9E9M2IpUhVCeQWA/RGM5fKCX2KoCX+JsPbySBl95UZKWMCgYEAzbgJ
+  xWpEPDXH8k3E1bATTgpeXz9LBI8k2cqPSok5A/q/4ERA8L8vPh3mk82pIZ9v1KXn
+  gEb1xsFXbefKyiILtxpqNhxVxyEkpdP3udpR6PIzzV6pw7xgvZIrJOW8uRDkdEBY
+  xrcTowvUiXAIRUZwuegY7mNujzZTFxfL/CWVV0MCgYAEQnuhmDjdmBbV5nabnVwi
+  26FiAv0HMT04MqROUyiE5oEwt3b7iKmXkHnQJqcp0oOWM90EY+iJxzzYRq4Xlgfw
+  JRzwF/msPLJp4IXaMWSpWx12yLo/+hPlghDTpz8v28+6DBzVQCmKXBGiWjLV5+9p
+  aDBDGvtzvvqbYisdQqqPiQKBgQCFgoxs4AO649iJK+m0GVreCiKnRCeGpPPwmOKY
+  KCilqYX/oaxX0mxxruwnPpEmrhfg9W8iNGtr+6ynOojE2IWr5uvJhGgzHRJwwPmE
+  V+lS+mWeQnKBAu/x+Dwh7SunHAx4Wg6DoOuQpKviKqBjfUzJipUrmcJ2FXalhR8w
+  3J9oiwKBgEfAm/iE/PajRPDMqRCs0kzJan2mfvW1Xw6l+8KgdK5bbEHY13y92TVf
+  cz1+BbVnumc8TYm8xLX0s6oy+Jux5IxaxGiuJiwn4IAedrLb0FDkV/W4OpK+4EXM
+  xSsigupqibDn0pFjUS4pxm1R/xVtIyQVloiKeJwbXkYN9idbkZPC
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubernetes-etcd-genesis-peer
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubernetes-etcd-genesis-peer
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDwTCCAqmgAwIBAgIUSgiSFn7ANF2Xa8XXvoRewvnSdCswDQYJKoZIhvcNAQEL
-  BQAwHzEdMBsGA1UEAxMUa3ViZXJuZXRlcy1ldGNkLXBlZXIwHhcNMjIwMzIxMjM0
-  ODAwWhcNMjMwMzIxMjM0ODAwWjAnMSUwIwYDVQQDExxrdWJlcm5ldGVzLWV0Y2Qt
-  Z2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqihx
-  VauIl3MZ/3y/cV7DbKHIBjv5jr4y8wdI2Oj9GWhlkAhPzk/bVsBAJUfuMaD2/qCg
-  K9iPQNP0xU5X4rTGNfxsRr9Q/qdBhexlGh8mzFBEpN8FNXBPSKL2jU1f0iXc++XW
-  C379fck//HJM1MoKbTHH2SSph9ijlHcPgmA23Dfvxk5Dl0s70JjOg3iatc2sCePg
-  770YBUSmbLn0VDrFjsf6tettQ71fIabb8Iszb3ikui5CoPsdpNcCyLk258rjMP2Y
-  FSxMdwWqeJ0LJpRj3IRD3XssxjYUzB+FSI/i1swswGeOPl9cwWBnoZ9X4i/sAxiT
-  aLXY6MSqeaEbFoBECQIDAQABo4HsMIHpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUE
-  FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU
-  RNoJipt/idLHFtO/81nwRHMWKrMwHwYDVR0jBBgwFoAUB1+5K+VVYlJ6OTY9d4h8
-  0Z5dG4gwagYDVR0RBGMwYYINY2FiMjMtcjcyMC0xMYIJbG9jYWxob3N0gi1rdWJl
-  cm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3ZjLmNsdXN0ZXIubG9jYWyHBAoXFQuH
-  BAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcNAQELBQADggEBALoqCqEOlnDhwFUn
-  TfmKUfXQXOybfEqCWRXTgxoLafzEb3NriZnh/HfI9zq9SSEPCO+RI+1DkJLwqwg0
-  cs+kTu+aW9T5WSe2578npG/H70ImSPovk7uTebD76ysl+03Z2WU3fHZQLaEghmtK
-  DrU/uuehOgvliVV0zKLeAJHz0JdmJ289EJm57Nl4DoxOCNnMzxvY5D8Jh1EeCVUK
-  8EzoDMl4HfGnE3PRqqgQkctzIHt/B5w8uqJ/cvfkT46SyPybIDYFY0SsutoRSsvA
-  UkuXyMvK8AeuTEAhQgZZaoVjQdNeKsWIgcHO3rqAGDSGuwtRx578sjiU2Puh2FnO
-  kTBeZUE=
+  MIID1jCCAr6gAwIBAgIUXCCUwxKtjG1P8SU9NfqXNuhgJoEwDQYJKoZIhvcNAQEL
+  BQAwNDETMBEGA1UEChMKS3ViZXJuZXRlczEdMBsGA1UEAxMUa3ViZXJuZXRlcy1l
+  dGNkLXBlZXIwHhcNMjMwMzEwMjA1MDAwWhcNMjQwMzA5MjA1MDAwWjAnMSUwIwYD
+  VQQDExxrdWJlcm5ldGVzLWV0Y2QtZ2VuZXNpcy1wZWVyMIIBIjANBgkqhkiG9w0B
+  AQEFAAOCAQ8AMIIBCgKCAQEArreAPHbkIEUxeiBGn/Vt0BZQj3mHkmToajpPLaS+
+  82cVGIh99WTT/UZMZZvv99L1D4s28xX97b8eaJa7PJPCoGUeeVKtMix5Dprcrg6F
+  Qa1U0pu7vWA70wayqmrx6dwrInzp5ZHgwjmfECLO2qOEh4HNWYdETypjzcugz10U
+  IPmf1PsM1oqS0D/QZMFoogjuIQ3bNDdkgASFujz3hPGJa6Ibuil4FYqkCsKdClUs
+  hSKKgZfx7RLXUCHwCckeKnRQ+DnNhOFoEqnMOrsKBxcG60HGniof1IFND1aQWxEp
+  wFatNtAT6O2poBwD6KFd2Qla97PW8NZGWn0dQ3yL+EV56QIDAQABo4HsMIHpMA4G
+  A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
+  VR0TAQH/BAIwADAdBgNVHQ4EFgQUrE+VZW9g+YfGB6axImqsSl/pw9MwHwYDVR0j
+  BBgwFoAUZDZaRSnJLdSUkLXs71Y3Kf9kipQwagYDVR0RBGMwYYINY2FiMjMtcjcy
+  MC0xMYIJbG9jYWxob3N0gi1rdWJlcm5ldGVzLWV0Y2Qua3ViZS1zeXN0ZW0uc3Zj
+  LmNsdXN0ZXIubG9jYWyHBAoXFQuHBAoXFguHBH8AAAGHBApgAAIwDQYJKoZIhvcN
+  AQELBQADggEBAK4eDJKblEy6x3BjlSKqDviYwWHH6Uo5CFQSFVjM+riCRTHuRoIG
+  qifxrMGsFFBTMtyKI04SRQsDKgjd78//GqNR3mYmm6VlrZZSI8F0UTCcZndCLMYd
+  ZMbaewEMfHSmK952Q01Gjx9GyNwCzXK3fgut8nSxVvGiKhDKlDZt1IN3iHzenh0K
+  2KvKcX5eWMymODRBqgQB1H3k8wH/ZzwPE9vHe6zb41IxAiYyXLDl8T0mPp7/wdMH
+  YX6ySt+F5r6POVtL+qFZAC6hIbFahPd6YdTRsHYjsj2dkIsprjvnWkuuRvyNWcdS
+  9a7ZoaB3GuZdfH+QTH0kDAw07JJJm0g9Ytw=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_11_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_11_certificate.yaml
index 27eb9cdb2..1e7c2beba 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_11_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_11_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-11
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-11
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  e79Hwl9YLemNgOYhi6o=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_12_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_12_certificate.yaml
index 0960eb605..776d544e9 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_12_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_12_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEAwnBppWUaejt/Dr2iS/22tFgkLJjNsLVAQxaW6T+SodZXVTVU
+  KyVNG5fnjZo1Vlz2oCkFoy2KWuzOrdsANpxsqaGlfIonPXNYIz7XVXtLH/gNetpk
+  exaRknnUXqXj2kLxdopLWXiuBw675/R0Y/pjM4yRsKz+M0Kc2cQKRTZzNTSZf/HM
+  ikbgqmqhCiOc1+hi4yGi0gzAAVLO3YR8LGw7q4MB+VBvIjtChU3RRMgLzuMams0l
+  2iOs9Uhjk4qL/OrFlW37+UBZmenrK4aZg2ORMfbNkKlP4xrB57M1/bxKKD08XpjW
+  eZVwSBoU7gKg3ksKWSTQazppCTNKnaLBsJn7WwIDAQABAoIBAHZ9jsQOIt6OV1Wi
+  Vr88dBTfCdxrmh2vtuOrZnfqF++r8Tip8QsCBkVkguWWLh7dNCZSGW9hl0jluuXT
+  6gNdvBJ7wZ9tiZA3NGT2LL+ZDSUEQyK06Drie//pYnPzYDFoTkHQ8S4rDtKaNgSa
+  wjsTIVUOutIR+i8+ztseTqvzDK5EuXt3+0f8nm7DILKw688/BstuxZhjcVKkOz4H
+  NKhW1qiYGzyWrIlY/tKDKrRxoQFNHz/vYLZPq4FhHvxp9qdgQ2iqubTqEUsCoHhv
+  npxjIpMypH86q7GrubrmIAn3DwSodiQnsogwSNrOpysR9YrI3zL7lMgY5kbiRZQG
+  YAHUfOECgYEA6VzjncbwR27WnrFLpUG2EJFyggqy0+1hQh21mn2GgKn5rs5wqBJV
+  qOyYQQQkPoTm2LRiDVDBNvStzvnIwtplDTP/lskg3M1PREi4SxqQFpu0hr7DxQ6J
+  GWjaDMsO/CiF8/fJKLw5lEbd77Mg0R3X4IR8zUXGMKdJ7zs+QAxFvvkCgYEA1Uzt
+  tINRBOxxpH5yXc+wNmGy6ofIn6UyD2UXg7qx5LMp5RQrs9UH8X4iOs+AmiG67IAI
+  6sjXLJoUTYR1A3GgvU9uZ9tYvV2zLfzePBO3cs2bd2h1Y15cVNQ6w/IvnMQYFJ5C
+  GrwmBaZLP1VCFbfEpYfSYitT2QEHPLRZr60/nfMCgYB69uRFTf9sVH4ojpmikZaC
+  8nEZDtQeEbYu5YK8zinigC49qy/3j/mtEkZD9A+5FcSiKaKFC6lT8Ofo6PudmQCo
+  TV7/MCntzw1WmM7rXCrSjuc4HSsBGeCqD/LdzN2vhxbWcBmCKnRYqmLlnEjNh+Ep
+  wAYXEA4Xsv6lXV022ICj2QKBgGvBVUSgIknueOq0xmoGBeszKAO7XOrptYR5eYue
+  wUfcCwojSoCq2jxxkDFNqpYy/A+GDvstQybRH/iZNdPrj1yTyB7HfOkNcPuGh26q
+  Nz7UB/om10a/4L0qChX7P3pexhuEZ7jB3CN2gwUXuS7ni3xkRTA62z0Be/p60eQi
+  DcVpAoGBALCH8XgAlIdIBrCwUghOp0fD6qaB3AK2NA126WeWAqY3vJ0hTVb9KJYY
+  iFaUNvHzW8ZJWvCUbmT9N4gToE3a1BxN2UsCc8pGih/iI+OCR5eylaOe9/Hzwhwp
+  xG1AhWquSMQ1MDQR6SYqXHSCnBz9WpelM1w59CqJXX6Xk7faqBS0
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-12
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-12
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  0nij+uyu5OlzUoVpGEA=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_13_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_13_certificate.yaml
index 9bff8ba0f..a2fbd1aea 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_13_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_13_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-13
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-13
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  znxsuaN1nBImgmvunro=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_14_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_14_certificate.yaml
index aad19ff43..290904499 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_14_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_14_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-14
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-14
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  HHXPDepHqOPnW+ifAE8=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_16_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_16_certificate.yaml
index 8d1b7728d..edc3254be 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_16_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_16_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-16
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-16
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-16
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-16
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  49MivV1+GjaAA8FNLZQ=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_17_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_17_certificate.yaml
index 85e0c9c29..c009dbfea 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_17_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_cab23_r720_17_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-17
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-17
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-cab23-r720-17
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-cab23-r720-17
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  tNKrQnt1rW0DBQDLHlI=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
index 112559a6c..eb80459fd 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_kubelet_genesis_certificate.yaml
@@ -1,70 +1,71 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-genesis
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-genesis
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: kubelet-genesis
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: kubelet-genesis
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  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
+  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
+  8vG8ubdGuO0BNFp8kOE=
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/certificates/kubernetes_scheduler_certificate.yaml b/site/seaworthy/secrets/certificates/kubernetes_scheduler_certificate.yaml
index db81b6eb7..404640620 100644
--- a/site/seaworthy/secrets/certificates/kubernetes_scheduler_certificate.yaml
+++ b/site/seaworthy/secrets/certificates/kubernetes_scheduler_certificate.yaml
@@ -1,69 +1,69 @@
 ---
 metadata:
-  storagePolicy: encrypted
-  name: scheduler
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: scheduler
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  MIIEowIBAAKCAQEAwJFn9VwFBlqa1caBwg6IpUY/MUkHRfooB8i4Kv+FF0F3BjKk
+  10H+6ap9JswOtzCBQkpXMcRhMPNvprOX+uzPW8ZYIKNxkma0kC7PomK/C7Ybs6t+
+  z3883D3kUrByxrlvSEtgCBOMkCiJZw9cvtaSRVMRQsAaG8SKpBAUDoqs07MTR8AR
+  8nLcz8NN3PnIWhJJNKuk8jWZToTifIjuep+naJA5jwDrL8lxhs/s1F7hvSQ+DZRq
+  8jwcBu9zqKCz834i3ZXkolBQOomdbTwG5CZSz4MdE2+tByzqnSSdSRH4/oGc9hFr
+  R8hgcjWX5Mu4zcIPgkvc8mLaiHm2fqIAWskAIwIDAQABAoIBAChOBtlHAlI7Io89
+  9ii8zALzugRBycDuw/QlIc72HlAoxpXIgdIAIS+dHIbDTQ0wnM1YK/nhpYoOWb8l
+  ddjyOdB2qjlinEHNN1u6QIE3c88qtY+chHU/p2hdl+1quws3AsC57gaiuNfvdBrb
+  D0luNb1GzqUO+if3siD2sIv+oH/KbXuz47wvYVoDShCC5jqBgjB2CQdPuM/tljpQ
+  XeI5ZDQtxE4Vx//jZelML05x/5d1y4mljBbH8YAJN5n4NOesTbQ9TpaYmOdpIMm7
+  li1dHyjS9VQst3aHJlVJTyRUyEGGVJEkHVMSj4Ghfbf5Dwc+699+gbHsqCQ2GrqT
+  baV3zrECgYEA3PB8yK7srg8jIFdAlrYp9fta0dWvDTyySxIVYz3kGNZvsGJBIsU1
+  aGmB0uzia6eKnh6n804u07FjiDuQ3VP27O9qAPX5QRV4SVtEIAuP6POqB+3plY01
+  m4q2amW/XAIyyBjR6ldZ6aXAVmofOacCOTD8GtvUz4gXXMM0z74z6tkCgYEA3yBZ
+  cxrRa/WsLTo7fCdpZ2YtZKhQ3sDMmQXPOzyYzGjFPweSJnvfFUnVSNRxurfeD9jO
+  dlQLCaoOyonTOS8/ccqBnJGvlkO6+JsFsgMYokvvgzyqP6c7IflfbaoVtHn9+1ao
+  GddoFtSAdzhLNOK+D93RaAM2pJ5vshavfsrzjVsCgYBuVG2L7cZlWUvKP6gSWt9z
+  ZdTBinrDGndSg7JIf8SjHpphs38hdOepv15ETWT4K49OTLLEDlvV/PReOJir3d0m
+  DpyZ5DtXY/hQcZIAiqWPx/Y1xXnq47xMcyWK1kqMEND5GWPiKULOKaZ1wMLdEGhM
+  1QhgBT0tcaFxAk4iG7JjaQKBgE8Vyz62KbZnXICnXEA0Q/LnT32W/xsFIT+3xG0N
+  nGcPV6Jwj4febgLAqb1nt2vkEexx/zQHs+XYBegaE+j36zfs/CW/qYnMNfA6Gjmv
+  SUL1QU616O4o2xe+qOlY2NqgRrqYS3rlU7qL1YDsThPPrmg3SirgwLR2h8aKred2
+  Df9zAoGBAK03pA27ioQUmlCpcZQ2VO0WeZ7UWiRTstpakRD6zhACbgCwumnkqLxg
+  1N7OI7gEiwEpRbFyXHiI+LDCzlEmf+jTB/KHNYX88oebpHWI/eLIMSeuIobuVnEe
+  +4CisuRN1zOO8d4uyOzzQiO3vMcUgZHurktaQisoKKDifARmzwCv
   -----END RSA PRIVATE KEY-----
 schema: deckhand/CertificateKey/v1
 ...
 ---
 metadata:
-  storagePolicy: encrypted
-  name: scheduler
   layeringDefinition:
-    layer: site
     abstract: false
+    layer: site
+  name: scheduler
   schema: metadata/Document/v1
+  storagePolicy: encrypted
 data: |
   -----BEGIN CERTIFICATE-----
-  MIIDQjCCAiqgAwIBAgIUH48CzIiIvoRHVLWssyeRJ4TAxx0wDQYJKoZIhvcNAQEL
-  BQAwFTETMBEGA1UEAxMKa3ViZXJuZXRlczAeFw0yMjAzMjEyMzQ4MDBaFw0yMzAz
-  MjEyMzQ4MDBaMCAxHjAcBgNVBAMTFXN5c3RlbTprdWJlLXNjaGVkdWxlcjCCASIw
-  DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOm/X087LFJnbMieIaenJ72OsyQ2
-  dRuGY7DgVvCPXS+mWUaeTozisZD1IvXpKRjiLaT+YrcQIOIbVHvxdMuLyPhHaM6Q
-  GYeu3ENIZou6GCl9DMhXwTBgngrKt1MxS/3/twFA/nZN2Lucl6d352ChZlc57SJd
-  +FaSUD5B/zhyJCWM8dfRAEU+NygHGU5vGLoOBkar6G0gSaByPDdSNtalDJwAymC/
-  KsybBTvtXR4Du+0y0smQc77xbEgf84jkXg+fJH2V5K/hI1C7a9vbPeeTjTuD1XdT
-  ioximFQb+1dmTEyHqYb57KLn85MYLfulYoDphbjfSwtYV9yVcknTu6FIAE8CAwEA
-  AaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-  BQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQWBBQ7irPASUJbp15b+6e/rHJ2kdu2
-  sDAfBgNVHSMEGDAWgBRkB19yc0w4LZgNO6ctKZ6tPnuQ0TANBgkqhkiG9w0BAQsF
-  AAOCAQEAnH3UCXe8SCyyxbj9ZL8A+ID7Cz+bi1RwOPOGtjb8WzV4wGCQqfd/Brvo
-  EZn05dMN2U3pv1WZBzaC6VQE7ire+2aULnNxEmjV7lbJUn2p38cQt22Hxn51y70y
-  x226I5RBkos7l8PBZSOe2msgEEwzPPPxbUHMSEz8Df+DK9MIQHnRIjRiHk0cmpVi
-  eLyLQOtXIDP8Lmb9Z//cVIm8y781RouV3sxau7GhaYQHcotButiufS6H2avPN1KJ
-  8TELYagF1IQVP+XBSc+xwBYm/JwtQmUb/8ovl/E9aE+l9/K+mliX5jW0YDUqh7HF
-  lrtmHMPAa6KL2xV1ncq9Vcg/J/5L/A==
+  MIIDVzCCAj+gAwIBAgIUKUhx25fdNSXCXljvEtbnOY1quekwDQYJKoZIhvcNAQEL
+  BQAwKjETMBEGA1UEChMKS3ViZXJuZXRlczETMBEGA1UEAxMKa3ViZXJuZXRlczAe
+  Fw0yMzAzMTAyMDUwMDBaFw0yNDAzMDkyMDUwMDBaMCAxHjAcBgNVBAMTFXN5c3Rl
+  bTprdWJlLXNjaGVkdWxlcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+  AMCRZ/VcBQZamtXGgcIOiKVGPzFJB0X6KAfIuCr/hRdBdwYypNdB/umqfSbMDrcw
+  gUJKVzHEYTDzb6azl/rsz1vGWCCjcZJmtJAuz6Jivwu2G7Orfs9/PNw95FKwcsa5
+  b0hLYAgTjJAoiWcPXL7WkkVTEULAGhvEiqQQFA6KrNOzE0fAEfJy3M/DTdz5yFoS
+  STSrpPI1mU6E4nyI7nqfp2iQOY8A6y/JcYbP7NRe4b0kPg2UavI8HAbvc6igs/N+
+  It2V5KJQUDqJnW08BuQmUs+DHRNvrQcs6p0knUkR+P6BnPYRa0fIYHI1l+TLuM3C
+  D4JL3PJi2oh5tn6iAFrJACMCAwEAAaN/MH0wDgYDVR0PAQH/BAQDAgWgMB0GA1Ud
+  JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAAMB0GA1UdDgQW
+  BBTB1fmgRh5ZZTXLjnkmwnB7f5YLyTAfBgNVHSMEGDAWgBQUgj1PZnJbxSLOj3Gv
+  59iDiiC+GzANBgkqhkiG9w0BAQsFAAOCAQEAjNDqGFEeSSHB98SKwzRCy/Y7Cnqm
+  1gIPh0W0J8PQwgIN8pW5ko7INQZo4RnzA/x/5XpQplGENz+9yzue7jmV574j9472
+  yN1nU7Z4NgXC3rQygmYtyi+eok6BsoZwuo2kuWIcvufXXARZxpIAFDE3vp7plQz1
+  0RG2ZvyRpjrDJvI+1zv/cKFoFbW13ZesmiHunBSaybl+mESu0ZHXTIEJdxBeNXQv
+  H//ZaxQWfBjXCnFYeAYQQuAIn3/8Qi0ucytHjcVFskgbZ3w1GjzK+R+5ttU09OIH
+  EePVJWVhP0U0yLI1Se+r+d6zG/oTQDQllL+aGm4e1SrXdZLmKwieDHuHUA==
   -----END CERTIFICATE-----
 schema: deckhand/Certificate/v1
 ...
diff --git a/site/seaworthy/secrets/keypairs/service_account.yaml b/site/seaworthy/secrets/keypairs/service_account.yaml
index cbcc0f3f9..b378fa935 100644
--- a/site/seaworthy/secrets/keypairs/service_account.yaml
+++ b/site/seaworthy/secrets/keypairs/service_account.yaml
@@ -4,36 +4,36 @@ metadata:
   layeringDefinition:
     abstract: false
     layer: site
-  schema: metadata/Document/v1
   name: service-account
+  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN RSA PRIVATE KEY-----
-  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
+  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
   -----END RSA PRIVATE KEY-----
 ...
 ---
@@ -42,17 +42,17 @@ metadata:
   layeringDefinition:
     abstract: false
     layer: site
-  schema: metadata/Document/v1
   name: service-account
+  schema: metadata/Document/v1
   storagePolicy: encrypted
 data: |
   -----BEGIN PUBLIC KEY-----
-  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3NYuMXjbKD8vXWNTDRwk
-  y8GM3yqJ20pZVV8hRD66Wlxge1oiN4tYpe2Z/rA4uHkq2wGAJgNA8XObpY2fiwUa
-  0JQ07cqXOIF3X+NgQAJfXsEENT8EQcJIKqAU5PVrSuj/4SgvQCMlkk5usTHFUAXN
-  PmmtjmMGAsUC6a4dhfCxhMVmmPUu+gVvnsJ8tm0Fdoz32H1nrvWeYE9vITIkK4Qf
-  +cZaSfuevrMniwkqnLvmlfif8Mk5jPYP/BmNE6S5KJlkP8RjZOVV6lolka6d87Ja
-  /BYIpllNIWKC/vHHuDT1MUIpMrbmGxsyTxLyXPD9loN/UYXZNnVX5n5yFeLlOLRF
-  BwIDAQAB
+  MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTqxykNPrV3UrDzbVV1d
+  xh/PA/T3cQ6J2BeNki14Dd+1sI3IkXH67AYbegYpqqFsTtI1S25PsZE2xwjNRa2y
+  +vm7swsLAAWtTE6LHMSkDCqnFJrVf7tME9Di4OK9hU5x+OPSA1qsBfwmCnmu/WRP
+  MLp6gZZBx7rEWL8fBbdvQVDCJjPX/8NgQO7stWOn7kV2y7QaVXSfiZz7l5xc9Kdl
+  LDJk2I00AomdvSdXALy5vhYobaYaExasKatEKAj6QGiAk97+Ejbv5Zf2HLP2zD8B
+  OGC6tdAFpUYNYMP1eprzgBRMI+pUB1Ax/HSMEJVnqbcDaNHOobmHDuRssysh77Tn
+  WwIDAQAB
   -----END PUBLIC KEY-----
 ...