diff --git a/docker/onos_cfg/onos.jks b/docker/onos_cfg/onos.jks
index 5f1a6b3..155e29e 100644
--- a/docker/onos_cfg/onos.jks
+++ b/docker/onos_cfg/onos.jks
Binary files differ
diff --git a/pki/voltha-CA.pem b/pki/voltha-CA.pem
index 020da35..a36ae71 100755
--- a/pki/voltha-CA.pem
+++ b/pki/voltha-CA.pem
@@ -1,24 +1,24 @@
 -----BEGIN CERTIFICATE-----
-MIID+zCCAuOgAwIBAgIJAPJ6fEmhoTNbMA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD
-VQQGEwJBQTELMAkGA1UECAwCQkIxCzAJBgNVBAcMAkNDMREwDwYDVQQKDAhJQ2Vy
-dGlmeTERMA8GA1UECwwIU2VjdXJpdHkxJDAiBgNVBAMMG0ljZXJ0aWZ5IENyeXB0
-b2dyYXBoeSBHcm91cDEeMBwGCSqGSIb3DQEJARYPY2FAaWNlcnRpZnkuY29tMB4X
-DTE3MDYwMTEwNDg0NloXDTE3MDcwMTEwNDg0NlowgZMxCzAJBgNVBAYTAkFBMQsw
-CQYDVQQIDAJCQjELMAkGA1UEBwwCQ0MxETAPBgNVBAoMCElDZXJ0aWZ5MREwDwYD
-VQQLDAhTZWN1cml0eTEkMCIGA1UEAwwbSWNlcnRpZnkgQ3J5cHRvZ3JhcGh5IEdy
-b3VwMR4wHAYJKoZIhvcNAQkBFg9jYUBpY2VydGlmeS5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDc8MNuk3rMFBZ2LihVoXxVjH5Ac4vj2Z1d1hB9
-ZS/u2x9d3orB3wknjz86m4/xmb8A7JVqrIqE5nBDksx2/Dg6Q9CfcXYGLm1XKJZn
-tC1bNt86/fgQ4hzY37e+ifN2RYroJPhmQYG7+B8PaBXNtnXiVKQnBXep00c8z0V3
-icmcJfjJbibdu5Nz106wnZMXo6r/gm2UZ3EIWaBjiEJeybb3nZgYXyNApi3h5TZC
-YUFRhFfRuiwvUbdt/LNKfD/+KY3SqPA0I8Em+jKw4/DxNv4f0mdAgHdSYAqDsPN5
-W3yagdS2u4sTuthCA2WEt95ky12+p2BYh1rUf2qm+dznXYXfAgMBAAGjUDBOMB0G
-A1UdDgQWBBT4si3SSLYyzr+B4zBWNvnd+D5d+jAfBgNVHSMEGDAWgBT4si3SSLYy
-zr+B4zBWNvnd+D5d+jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBG
-wl6nsMDSHGJg6cytlrda3eXHE4AqPUWNcHxjAwuU47ZUKlIPl0lMYQAluJqKVtLH
-uLp3Kz6ANYPhHajiIDpOn6QnD3j3OBMK34XntxqHqBm97Pziy8a28qrxNmCqykWt
-+QpDzTuNyLgTNO9dPXiiYeo4gDpwZtPV7Y7mQDqCLmvYbKl+U5kITdsb+MR+Rpmf
-M9+N8jQosSu2dWW6zG1FLsEsQQzaTQcgNdg5k/zqGG3DgK3sy4qHvN+92FhIY1aM
-1tRU3TqNUkXmnsrt6sd3DFnueq8pCwyfuTh7gqCJdCoIjGCNRjlSLYn7W7bVCZRm
-evIu27IInqmZIvkH7AHY
+MIIEATCCAumgAwIBAgIJALW5KdiecoNnMA0GCSqGSIb3DQEBCwUAMIGWMQswCQYD
+VQQGEwJVUzETMBEGA1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU29tZS1DaXR5
+MREwDwYDVQQKDAhJQ2VydGlmeTEaMBgGA1UECwwRSUNlcnRpZnkgU2VjdXJpdHkx
+DTALBgNVBAMMBEFCQ0QxIDAeBgkqhkiG9w0BCQEWEWFiY2RASUNlcnRpZnkuY29t
+MB4XDTE3MDcwNjE3MDMzMloXDTE4MDcwNjE3MDMzMlowgZYxCzAJBgNVBAYTAlVT
+MRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQHDAlTb21lLUNpdHkxETAPBgNV
+BAoMCElDZXJ0aWZ5MRowGAYDVQQLDBFJQ2VydGlmeSBTZWN1cml0eTENMAsGA1UE
+AwwEQUJDRDEgMB4GCSqGSIb3DQEJARYRYWJjZEBJQ2VydGlmeS5jb20wggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDWXdtOUprhRYsx/iFp2Q3ICsDsr2bi
+k7Bf6Z7DZzN+k8xXFrFEcmM2Smaw5xFPCtc9bjV9wyosjHwkrNhEJSkyPbX5EUvI
+m19pgytirjx4Va8MRj5RGrVe8M0ifpwBTLvehPpEoLGXp6DJ0u4Py1/9xIdqbeWS
+PhCHIR/lnEjuGODNPMbGWoay4DPGmoFIeMm2CViV3kxMH347iPfqFFJHXmqAbfDI
+qjFUL6A2v2jTpqv8WQlWbZGafIuRHlsMFkfJe8KvppOxMqUFLCONfewJDR8saK6d
+JfGr6xQ3gN2kk4KWPq2EYazNJNPiXRv8yrgSJznOC/ujtBCqftHrOehxAgMBAAGj
+UDBOMB0GA1UdDgQWBBQdzUTQpHAOGDuS+lY/dvaZEXDrBjAfBgNVHSMEGDAWgBQd
+zUTQpHAOGDuS+lY/dvaZEXDrBjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUA
+A4IBAQBpPS6uTTGwap4y3OSXD0CsccX0wyzEw4O07uaDI0QIbJNiOQXCMUWuGRos
+UCqgKAnb3+ccUi2OVWO0kh7N0JuIpnvfH9+eZO/3ucyhs9SQ5BOBzINSVnb2LBh3
+x4yK8IDRhz81gdBmVgB/vjQ58eMDBBwV1is/DVlohZFeNsQ8t/33VLMAAdHFIewW
+ieVDWZrITyKHvsl7YGXFXy2R/Q9felHPY+p7NlhHP38MgXYdbpAllO7YOCvtj9q/
+5TWsgWgOQaBJFW2s/3dlvWiNNbgwKxdO85rNDTdZzKn7sIeMsK499YHBPYwWXp++
+Jctzc86PVAOz+HDtDHs1t/ix8wM/
 -----END CERTIFICATE-----
diff --git a/pki/voltha.crt b/pki/voltha.crt
index 456876c..ed5e70e 100755
--- a/pki/voltha.crt
+++ b/pki/voltha.crt
@@ -1,22 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDnzCCAocCCQDWGTSrh75/vjANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMC
-QUExCzAJBgNVBAgMAkJCMQswCQYDVQQHDAJDQzERMA8GA1UECgwISUNlcnRpZnkx
-ETAPBgNVBAsMCFNlY3VyaXR5MSQwIgYDVQQDDBtJY2VydGlmeSBDcnlwdG9ncmFw
-aHkgR3JvdXAxHjAcBgkqhkiG9w0BCQEWD2NhQGljZXJ0aWZ5LmNvbTAeFw0xNzA2
-MTQxNTQ2MzJaFw0xNzA3MTQxNTQ2MzJaMIGOMQswCQYDVQQGEwJVUzELMAkGA1UE
-CAwCQ0ExEzARBgNVBAcMCk1lbmxvIFBhcmsxEzARBgNVBAoMCk9wZW5Wb2x0aGEx
-ETAPBgNVBAsMCFNlY3VyaXR5MQ8wDQYDVQQDDAZjb25zdWwxJDAiBgkqhkiG9w0B
-CQEWFWNvbnN1bEBPcGVuVm9sdGhhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBANTRjeapGUWe+3dUGAu7YPUmD2+RyspP6DrJU+9qT7dhyjg14qwM
-KrHz/7qKCzQkzvB5uBX4ne9bdCGySbe3GUnUjbSX2dKIdyG/+mNJS8MqL3nUncU5
-6FVyIuZkh3HVyecmlHbh2Rz0ZKLQWQByvuubbUkz4Aa+SpH5dQURzBqTy+RtuQ3D
-Qc1a4+a7DcuM5Kmv1TdmzdRjkwFwYXTYM3wvSK6oi4GgpuLOOGKnQjy0MeATl8zC
-EDfbRF8ZK0xFjzkMh6vtfbjnoVVUPxLCDiPAaxqYTdHYKV6036Q9QOLNQnvedBN/
-NssJy9N/rn0wr7tNJ0l+o3R8fH0LgkNyGLMCAwEAATANBgkqhkiG9w0BAQsFAAOC
-AQEAJSDalFDHxpSS1S7HOzG9H5ZOzQBfIUznRg7PBI2Ys/dQHkPP4HcjbLdCFVHt
-FOzo2tW16P+85hbcZI/1AtuXZWxEClQHWIxpIqAUPh8YxHjgr60krrQOtTKouKi9
-80GW9/NLWdW+b1YxRMYX7fRrkaLv4HO0HECNYC6E4Lb0urDhLBwNPqRolIve+2SY
-vJdy9rI1u6nMdmqdZkRtjxMe3bRUb1TeXg0OmJG/ubco65drxgpvsQqWWK5iCT32
-R+buKMtdpNJDOM55aa64WTgeWdg9IbSchlsoKJTRekUvHX2S3y1mshZxLaee89Mo
-kPudyekeIoMHrOcdltiVarCKdw==
+MIIDpjCCAo4CCQC8Ii1FHMd/NjANBgkqhkiG9w0BAQsFADCBljELMAkGA1UEBhMC
+VVMxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAcMCVNvbWUtQ2l0eTERMA8G
+A1UECgwISUNlcnRpZnkxGjAYBgNVBAsMEUlDZXJ0aWZ5IFNlY3VyaXR5MQ0wCwYD
+VQQDDARBQkNEMSAwHgYJKoZIhvcNAQkBFhFhYmNkQElDZXJ0aWZ5LmNvbTAeFw0x
+NzA3MDYxNzExMjJaFw0xODA3MDYxNzExMjJaMIGSMQswCQYDVQQGEwJVUzETMBEG
+A1UECAwKU29tZS1TdGF0ZTESMBAGA1UEBwwJU29tZS1DaXR5MREwDwYDVQQKDAhT
+b21lLU9yZzEWMBQGA1UECwwNU29tZS1PcmctVW5pdDENMAsGA1UEAwwEQUJDRDEg
+MB4GCSqGSIb3DQEJARYRYWJjZEBTb21lLU9yZy5Db20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCxrvQHxtVRWPqu4Dx05HeOUzmYGWZXpTnN7tfF/H7i
+iSFhOq9ZIHtiGowaiQUCCuxWAtP6IfM2w3etCtwL/JxgjD9mSlTuALm0Xv3xdQK4
+bEngemY93DcSvm49bDFv7CIJk0bvW0PwuFriOLcS3A7ARWUA6oBFskKPng51XM8V
+eh32mBLH+O6/MSLtB9Ig8FU7BtnZq/djdJNm5ikwG4Of0oUAy1hOa48Ena3uHRBX
+HjBk+v+ffzbDxBaMZ0xyML86cuVUl1maG03VVvgX66qvMHN3OcSjm+TSJRYIcm6v
+Dn6X+jg6UOZLM0Hh9CWo+IO10kPXjflC2lmExkaz6bUBAgMBAAEwDQYJKoZIhvcN
+AQELBQADggEBAIKnUDMh5Rh02zwZ5LVOFbffgM04BhMCJumW4Z+3bng33mhkboAp
+fMA46/6rwb6GWqqH0BXwhfrr637NNuOqwvlfT2PARLXLJgp97Kyl1qcBkA5YBX+L
+QLQZ1lVmn0MkngYd7G8mBgnXhSnRJbD3H7L5QpJRLtqspVcAh001hnlPe4P5OF/x
+/GJTmivvPRvX6GB8mMMp70LhMcq/Iy1wdl/6ILXKj9c3RbHxl901ZpXbjzEaSqVt
+g023PkDz+RDJAh1Z6k/ZsuoqUO/vcmK+hlTZhEGTSW48dwnuG6ih17ZKvLoD9zUP
+aw8FmD4Sg/YH5F+ICscW9p5ErjSXLItn9B4=
 -----END CERTIFICATE-----
diff --git a/pki/voltha.key b/pki/voltha.key
index 044d805..e1bab13 100755
--- a/pki/voltha.key
+++ b/pki/voltha.key
@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----