diff --git a/features/sandbox/keys/public_key.pkcs7.pem b/features/sandbox/keys/public_key.pkcs7.pem
index ee11608b..3c2ddf94 100644
--- a/features/sandbox/keys/public_key.pkcs7.pem
+++ b/features/sandbox/keys/public_key.pkcs7.pem
@@ -1,18 +1,9 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAcGgAwIBAgIBADANBgkqhkiG9w0BAQUFADAAMCAXDTEzMDgwMTE3MzU0
-NVoYDzIwNjMwNzIwMTczNTQ1WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0kX0qkf4FOHXuFqlVmbgo+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhE
-i2x5z16RAsEw3cjd2BG78WHz1lcu3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCW
-XrAKb7xIXPJVd0ivP82ZPe71CmkFtiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHH
-JzU6X+hOnq8GRZBwKh6Ljl31JYE2DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPa
-LRgyNjiDIJSTRlWLVJbYj6KDSoUD2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0K
-R7t3pWGiHEuRYZkGDU5jKB/8bK7DRwIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBR7PyZZ/WlaSjAf6GO2GLWXO5aINDAoBgNVHSMEITAfgBR7PyZZ
-/WlaSjAf6GO2GLWXO5aINKEEpAIwAIIBADANBgkqhkiG9w0BAQUFAAOCAQEAspcX
-VNb156OZqPxteosI2ijeewDH0sc3ogRDZnxbXqG6Pa44QzJNTUULaX3iEfmFw4TL
-MW90NU4w4rzSIBGDGHTBOKZZBa2iTVRsYHuQ7Sd1A1MKc1dDFs9+Uj/6/vQ8Fkdx
-v+iei5N/XFccgto4HiohXvEZhT4NjONIFR9UL+lWChp8OVb+ifOWCKF69iUUbMPC
-uD7+UkrCYoVeVXkG1Rvw4E6BAbi75P6inX0lUnzNs4B0rvFynnV1Nsdb89cxI3pL
-Q0yVE8/aIP9donqjXTu0h/GmOtVQH654NCQSs1dLD+K4+8mn591Nv4uLrCiNJzTM
-zGRUV6zOPlUa3ye6Dg==
------END CERTIFICATE-----
\ No newline at end of file
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kX0qkf4FOHXuFqlVmbg
+o+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhEi2x5z16RAsEw3cjd2BG78WHz1lcu
+3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCWXrAKb7xIXPJVd0ivP82ZPe71CmkF
+tiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHHJzU6X+hOnq8GRZBwKh6Ljl31JYE2
+DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPaLRgyNjiDIJSTRlWLVJbYj6KDSoUD
+2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0KR7t3pWGiHEuRYZkGDU5jKB/8bK7D
+RwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/features/sandbox/puppet-envvar/keys/public_key.pkcs7.pem b/features/sandbox/puppet-envvar/keys/public_key.pkcs7.pem
index ee11608b..3c2ddf94 100644
--- a/features/sandbox/puppet-envvar/keys/public_key.pkcs7.pem
+++ b/features/sandbox/puppet-envvar/keys/public_key.pkcs7.pem
@@ -1,18 +1,9 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAcGgAwIBAgIBADANBgkqhkiG9w0BAQUFADAAMCAXDTEzMDgwMTE3MzU0
-NVoYDzIwNjMwNzIwMTczNTQ1WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0kX0qkf4FOHXuFqlVmbgo+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhE
-i2x5z16RAsEw3cjd2BG78WHz1lcu3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCW
-XrAKb7xIXPJVd0ivP82ZPe71CmkFtiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHH
-JzU6X+hOnq8GRZBwKh6Ljl31JYE2DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPa
-LRgyNjiDIJSTRlWLVJbYj6KDSoUD2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0K
-R7t3pWGiHEuRYZkGDU5jKB/8bK7DRwIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBR7PyZZ/WlaSjAf6GO2GLWXO5aINDAoBgNVHSMEITAfgBR7PyZZ
-/WlaSjAf6GO2GLWXO5aINKEEpAIwAIIBADANBgkqhkiG9w0BAQUFAAOCAQEAspcX
-VNb156OZqPxteosI2ijeewDH0sc3ogRDZnxbXqG6Pa44QzJNTUULaX3iEfmFw4TL
-MW90NU4w4rzSIBGDGHTBOKZZBa2iTVRsYHuQ7Sd1A1MKc1dDFs9+Uj/6/vQ8Fkdx
-v+iei5N/XFccgto4HiohXvEZhT4NjONIFR9UL+lWChp8OVb+ifOWCKF69iUUbMPC
-uD7+UkrCYoVeVXkG1Rvw4E6BAbi75P6inX0lUnzNs4B0rvFynnV1Nsdb89cxI3pL
-Q0yVE8/aIP9donqjXTu0h/GmOtVQH654NCQSs1dLD+K4+8mn591Nv4uLrCiNJzTM
-zGRUV6zOPlUa3ye6Dg==
------END CERTIFICATE-----
\ No newline at end of file
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kX0qkf4FOHXuFqlVmbg
+o+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhEi2x5z16RAsEw3cjd2BG78WHz1lcu
+3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCWXrAKb7xIXPJVd0ivP82ZPe71CmkF
+tiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHHJzU6X+hOnq8GRZBwKh6Ljl31JYE2
+DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPaLRgyNjiDIJSTRlWLVJbYj6KDSoUD
+2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0KR7t3pWGiHEuRYZkGDU5jKB/8bK7D
+RwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/features/sandbox/puppet-hiera-merge/keys/public_key.pkcs7.pem b/features/sandbox/puppet-hiera-merge/keys/public_key.pkcs7.pem
index ee11608b..3c2ddf94 100644
--- a/features/sandbox/puppet-hiera-merge/keys/public_key.pkcs7.pem
+++ b/features/sandbox/puppet-hiera-merge/keys/public_key.pkcs7.pem
@@ -1,18 +1,9 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAcGgAwIBAgIBADANBgkqhkiG9w0BAQUFADAAMCAXDTEzMDgwMTE3MzU0
-NVoYDzIwNjMwNzIwMTczNTQ1WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0kX0qkf4FOHXuFqlVmbgo+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhE
-i2x5z16RAsEw3cjd2BG78WHz1lcu3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCW
-XrAKb7xIXPJVd0ivP82ZPe71CmkFtiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHH
-JzU6X+hOnq8GRZBwKh6Ljl31JYE2DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPa
-LRgyNjiDIJSTRlWLVJbYj6KDSoUD2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0K
-R7t3pWGiHEuRYZkGDU5jKB/8bK7DRwIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBR7PyZZ/WlaSjAf6GO2GLWXO5aINDAoBgNVHSMEITAfgBR7PyZZ
-/WlaSjAf6GO2GLWXO5aINKEEpAIwAIIBADANBgkqhkiG9w0BAQUFAAOCAQEAspcX
-VNb156OZqPxteosI2ijeewDH0sc3ogRDZnxbXqG6Pa44QzJNTUULaX3iEfmFw4TL
-MW90NU4w4rzSIBGDGHTBOKZZBa2iTVRsYHuQ7Sd1A1MKc1dDFs9+Uj/6/vQ8Fkdx
-v+iei5N/XFccgto4HiohXvEZhT4NjONIFR9UL+lWChp8OVb+ifOWCKF69iUUbMPC
-uD7+UkrCYoVeVXkG1Rvw4E6BAbi75P6inX0lUnzNs4B0rvFynnV1Nsdb89cxI3pL
-Q0yVE8/aIP9donqjXTu0h/GmOtVQH654NCQSs1dLD+K4+8mn591Nv4uLrCiNJzTM
-zGRUV6zOPlUa3ye6Dg==
------END CERTIFICATE-----
\ No newline at end of file
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kX0qkf4FOHXuFqlVmbg
+o+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhEi2x5z16RAsEw3cjd2BG78WHz1lcu
+3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCWXrAKb7xIXPJVd0ivP82ZPe71CmkF
+tiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHHJzU6X+hOnq8GRZBwKh6Ljl31JYE2
+DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPaLRgyNjiDIJSTRlWLVJbYj6KDSoUD
+2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0KR7t3pWGiHEuRYZkGDU5jKB/8bK7D
+RwIDAQAB
+-----END PUBLIC KEY-----
diff --git a/features/sandbox/puppet/keys/public_key.pkcs7.pem b/features/sandbox/puppet/keys/public_key.pkcs7.pem
index ee11608b..3c2ddf94 100644
--- a/features/sandbox/puppet/keys/public_key.pkcs7.pem
+++ b/features/sandbox/puppet/keys/public_key.pkcs7.pem
@@ -1,18 +1,9 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAcGgAwIBAgIBADANBgkqhkiG9w0BAQUFADAAMCAXDTEzMDgwMTE3MzU0
-NVoYDzIwNjMwNzIwMTczNTQ1WjAAMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA0kX0qkf4FOHXuFqlVmbgo+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhE
-i2x5z16RAsEw3cjd2BG78WHz1lcu3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCW
-XrAKb7xIXPJVd0ivP82ZPe71CmkFtiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHH
-JzU6X+hOnq8GRZBwKh6Ljl31JYE2DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPa
-LRgyNjiDIJSTRlWLVJbYj6KDSoUD2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0K
-R7t3pWGiHEuRYZkGDU5jKB/8bK7DRwIDAQABo1wwWjAPBgNVHRMBAf8EBTADAQH/
-MB0GA1UdDgQWBBR7PyZZ/WlaSjAf6GO2GLWXO5aINDAoBgNVHSMEITAfgBR7PyZZ
-/WlaSjAf6GO2GLWXO5aINKEEpAIwAIIBADANBgkqhkiG9w0BAQUFAAOCAQEAspcX
-VNb156OZqPxteosI2ijeewDH0sc3ogRDZnxbXqG6Pa44QzJNTUULaX3iEfmFw4TL
-MW90NU4w4rzSIBGDGHTBOKZZBa2iTVRsYHuQ7Sd1A1MKc1dDFs9+Uj/6/vQ8Fkdx
-v+iei5N/XFccgto4HiohXvEZhT4NjONIFR9UL+lWChp8OVb+ifOWCKF69iUUbMPC
-uD7+UkrCYoVeVXkG1Rvw4E6BAbi75P6inX0lUnzNs4B0rvFynnV1Nsdb89cxI3pL
-Q0yVE8/aIP9donqjXTu0h/GmOtVQH654NCQSs1dLD+K4+8mn591Nv4uLrCiNJzTM
-zGRUV6zOPlUa3ye6Dg==
------END CERTIFICATE-----
\ No newline at end of file
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0kX0qkf4FOHXuFqlVmbg
+o+UDrJdneH8XnmWM+stAs0XpzEQqErelZUhEi2x5z16RAsEw3cjd2BG78WHz1lcu
+3NP25BM990YQDl6e9pvmeMNA+wCK1bwD7fCWXrAKb7xIXPJVd0ivP82ZPe71CmkF
+tiFr14mqNWrEpP/d2eQ4PAaCimAEbBKyRRHHJzU6X+hOnq8GRZBwKh6Ljl31JYE2
+DG3KQ+ydM+r411jY2sjSykOovbeRb7FCyOPaLRgyNjiDIJSTRlWLVJbYj6KDSoUD
+2+R95Owb5Z1OUL9Yn/BRIv5RyDvfBr42sp0KR7t3pWGiHEuRYZkGDU5jKB/8bK7D
+RwIDAQAB
+-----END PUBLIC KEY-----