diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index fb6385f..a3f2595 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -42,6 +42,8 @@
       SERVICE_8300_IGNORE: "yes"
       SERVICE_8400_IGNORE: "yes"
       SERVICE_8500_NAME: "consul-rest"
+    volumes:
+    - "/cord/incubator/voltha/consul_config:/consul/config"
   #
   # Registrator
   #
@@ -51,12 +53,17 @@
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
       # "-internal",
-      "consul://consul:8500"
+      "consul://consul-tls:8500"
     ]
     links:
     - consul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
+    - "/cord/incubator/voltha/reg_config:/reg/config"
+    environment:
+      CONSUL_CACERT: "/reg/config/voltha-CA-template.pem"
+      CONSUL_TLSCERT: "/reg/config/voltha-cert-template.crt"
+      CONSUL_TLSKEY: "/reg/config/voltha-pvt-template.key"
 
   #
   # Fluentd log server
diff --git a/consul_config/encrypt.json b/consul_config/encrypt.json
new file mode 100755
index 0000000..dee628f
--- /dev/null
+++ b/consul_config/encrypt.json
@@ -0,0 +1,3 @@
+{
+  "encrypt": "+tuEjD1y6blji2ze7THkcw=="
+}
diff --git a/consul_config/ports.json b/consul_config/ports.json
new file mode 100755
index 0000000..72ad1dc
--- /dev/null
+++ b/consul_config/ports.json
@@ -0,0 +1,6 @@
+{
+  "ports": {
+     "http": 8501,
+     "https": 8500
+   }
+}
diff --git a/consul_config/ssl.json b/consul_config/ssl.json
new file mode 100755
index 0000000..f37128e
--- /dev/null
+++ b/consul_config/ssl.json
@@ -0,0 +1,7 @@
+{
+  "ca_file": "/consul/config/voltha-CA-template.pem",
+  "cert_file": "/consul/config/voltha-cert-template.crt",
+  "key_file": "/consul/config/voltha-pvt-template.key",
+  "verify_incoming": true,
+  "verify_outgoing": true
+}
diff --git a/consul_config/voltha-CA-template.pem b/consul_config/voltha-CA-template.pem
new file mode 100755
index 0000000..020da35
--- /dev/null
+++ b/consul_config/voltha-CA-template.pem
@@ -0,0 +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
+-----END CERTIFICATE-----
diff --git a/consul_config/voltha-cert-template.crt b/consul_config/voltha-cert-template.crt
new file mode 100755
index 0000000..587c562
--- /dev/null
+++ b/consul_config/voltha-cert-template.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApMCCQCX5iDODvryVzANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMC
+QUExCzAJBgNVBAgMAkJCMQswCQYDVQQHDAJDQzERMA8GA1UECgwISUNlcnRpZnkx
+ETAPBgNVBAsMCFNlY3VyaXR5MSQwIgYDVQQDDBtJY2VydGlmeSBDcnlwdG9ncmFw
+aHkgR3JvdXAxHjAcBgkqhkiG9w0BCQEWD2NhQGljZXJ0aWZ5LmNvbTAeFw0xNzA2
+MDExMTAzMjlaFw0xNzA3MDExMTAzMjlaMIGaMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExEzARBgNVBAcMCk1lbmxvIFBhcmsxEzARBgNVBAoMCk9wZW5Wb2x0aGEx
+DzANBgNVBAsMBlItQ09SRDEdMBsGA1UEAwwUUi1DT1JEIEFjZXNzIE5ldHdvcmsx
+JDAiBgkqhkiG9w0BCQEWFXItY29yZEBPcGVuVm9sdGhhLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL6MygF1d8jLOSjiteHic7/8EN2tN6q/cvts
+Zo7e5PDLtv7LyJJ0aCC5Jborvyh2JzC5pCpCrQMBvlJULwqU5Ft6Y61g+EVJg3Km
+OF3VvQw0Jx3P31BUCOZmbj8SPAzZRuBnTuw2EG8Kllk0caEojQojY0dvb0977hnT
++j/fp91c7bsgHy4PKtupwOeUHkOM3ZcxU7KrX53BZmylJVXqE9otDTljTqhj6F4x
+SloGBPOsm6wcX0WtS5QfCFFjmaA3JlTcXWffLhrP+N1bLlKb10IWGlxiBVy52gzm
+5Tn3hlFMaOUDHHa4kXBCAjfFPzYg9vyT+waGd4AQ+ebcbui0C6sCAwEAATANBgkq
+hkiG9w0BAQsFAAOCAQEAceO2v7DmInxsh3qHCMcBKFuaTV6rB6Upg8+onpMDpD+a
+rriNMg6nfq50nzdpjbeYg+Qiaqornws9WnYO9d446kgVtTDbWnkzqjkBr9In0rx3
+r7MBk755BjMNa3KKT/BFQRl6kwCK0G7FQI5EPiFXyt08anXDVThRd+2q21GLpqRP
+uh7qvFhLcmglCQsfSXFwvdL6v8LCS1EDNOlSncnLCgjXCefU9DakEtbvnl96RQ4m
+BQeIaGjY+9ZWq30BqVer3MiZfIvBZnWvEIA/RLCzbxttr6KsOrQWW3WvntpIK6bo
+0eIhTC/EDuEgorvjPxOfOHklNdTuAY/sjofuHPrctw==
+-----END CERTIFICATE-----
diff --git a/consul_config/voltha-pvt-template.key b/consul_config/voltha-pvt-template.key
new file mode 100755
index 0000000..27b51dd
--- /dev/null
+++ b/consul_config/voltha-pvt-template.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAvozKAXV3yMs5KOK14eJzv/wQ3a03qr9y+2xmjt7k8Mu2/svI
+knRoILkluiu/KHYnMLmkKkKtAwG+UlQvCpTkW3pjrWD4RUmDcqY4XdW9DDQnHc/f
+UFQI5mZuPxI8DNlG4GdO7DYQbwqWWTRxoSiNCiNjR29vT3vuGdP6P9+n3VztuyAf
+Lg8q26nA55QeQ4zdlzFTsqtfncFmbKUlVeoT2i0NOWNOqGPoXjFKWgYE86ybrBxf
+Ra1LlB8IUWOZoDcmVNxdZ98uGs/43VsuUpvXQhYaXGIFXLnaDOblOfeGUUxo5QMc
+driRcEICN8U/NiD2/JP7BoZ3gBD55txu6LQLqwIDAQABAoIBAQCZohodIwD5PCFR
+/bh374Uz/Z/7m3WOjd2/KZ9nAf/Exfs9ZEDLFGAAQkdQ24S8ssbWWlcqW6fzDKzO
+5GEpPvL/bqZ/W/fQpXz+K1a3EWXjOQlw1/FNavPiECRDZghUs7qZo7HWcaC+ZuLh
++Y7ESVWuHuok5ovwohNPb8INTd6icq0XixjXQvqCwjYptgYxZOK791QLCDVSYUlK
+XJ80S5j59OkV8xpT69cSlVp12Fhd1Waq1MQPjre0e2H054w/HwMtgfPEokkqTT1m
+kmE/ryTJDbXAMo6B8VnzMfEEVUQRI4IWy6g3X5rQe9mYs0H7cHdCwTXrZ0Tk/bxI
+HmUtNakBAoGBAPECx2H/80LBhRE4htJ7Ua4o6cfC18gW9vxaEoEwPrHEHtabh5vg
+QHG26Gtq0U0CosJr5Sww9YV1AACm0oVlRbLPSCElpdzUV/kWPnPTZOezJ0YaRDi1
+f6yFi5KvYGXaPqYZ8VYNjQY1LoZlrQ8Np+aQ0a+77Q/anPLKY3WacMERAoGBAMpm
+mqBo7Qn87213GmWZH+sEkzQFZPkveXgCCHWh6mrvWJOBxthOBPIvOmO0oNMevt4s
+C2hkRpBZFsgtrfLTrLilJHMb3MXWsmjfVl0AWydA3HaguXW8Hmhrboa3/CErobms
+f/hlBhew8n13Gs+KF//u1oXVSnPLu+FBKfVVusD7AoGAL+CIcSxiS8GbyJb9GXUL
+/df80QUgzovZVroh8O3/llrKcYGGB+4dfzmBpE0c9PpwEMVUSloTfAaJEJgTPBKp
+LONGhecvstWwADhuAZ5d7jVFuQRgxw8vJLuGxYX3VWRsi5ydt6WLfU81RdeO8G2b
+DA96yDlB16NrCEQyS9t5SLECgYEAx6rop45bKRtI52gztj6U6jgdL5iSv/BBmE4J
+ImKU6uErNHk2PHTbFD/bDjlG3n7aNDqnFli18/ivLNNDYuXG4nCnwJaf+NuQLT0F
+6cFMKzElTDHKQ4dNSB2Tb3tZUy/D33N42wZuODjrPzKcVFkay/RF1MlRJWK6+cBb
+MBdeoLkCgYEAlG8TcBHQc0nuTL5/9qjLzQ7q7pwwyf93BZj6iCEUc+c4DSmluTY6
+QA5UAhQx2iishzEwnz4lNsafsEQlmfm6hbJvmYAwWQq2coOVEF9r3sxptU+NJTsN
+tX0fPfg5B3eWHMO+K7MmCSbzoyvB7oU7JfgZ5YE+SN/UQ26URSWaGVo=
+-----END RSA PRIVATE KEY-----
diff --git a/reg_config/voltha-CA-template.pem b/reg_config/voltha-CA-template.pem
new file mode 100755
index 0000000..020da35
--- /dev/null
+++ b/reg_config/voltha-CA-template.pem
@@ -0,0 +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
+-----END CERTIFICATE-----
diff --git a/reg_config/voltha-cert-template.crt b/reg_config/voltha-cert-template.crt
new file mode 100755
index 0000000..587c562
--- /dev/null
+++ b/reg_config/voltha-cert-template.crt
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDqzCCApMCCQCX5iDODvryVzANBgkqhkiG9w0BAQsFADCBkzELMAkGA1UEBhMC
+QUExCzAJBgNVBAgMAkJCMQswCQYDVQQHDAJDQzERMA8GA1UECgwISUNlcnRpZnkx
+ETAPBgNVBAsMCFNlY3VyaXR5MSQwIgYDVQQDDBtJY2VydGlmeSBDcnlwdG9ncmFw
+aHkgR3JvdXAxHjAcBgkqhkiG9w0BCQEWD2NhQGljZXJ0aWZ5LmNvbTAeFw0xNzA2
+MDExMTAzMjlaFw0xNzA3MDExMTAzMjlaMIGaMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCQ0ExEzARBgNVBAcMCk1lbmxvIFBhcmsxEzARBgNVBAoMCk9wZW5Wb2x0aGEx
+DzANBgNVBAsMBlItQ09SRDEdMBsGA1UEAwwUUi1DT1JEIEFjZXNzIE5ldHdvcmsx
+JDAiBgkqhkiG9w0BCQEWFXItY29yZEBPcGVuVm9sdGhhLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL6MygF1d8jLOSjiteHic7/8EN2tN6q/cvts
+Zo7e5PDLtv7LyJJ0aCC5Jborvyh2JzC5pCpCrQMBvlJULwqU5Ft6Y61g+EVJg3Km
+OF3VvQw0Jx3P31BUCOZmbj8SPAzZRuBnTuw2EG8Kllk0caEojQojY0dvb0977hnT
++j/fp91c7bsgHy4PKtupwOeUHkOM3ZcxU7KrX53BZmylJVXqE9otDTljTqhj6F4x
+SloGBPOsm6wcX0WtS5QfCFFjmaA3JlTcXWffLhrP+N1bLlKb10IWGlxiBVy52gzm
+5Tn3hlFMaOUDHHa4kXBCAjfFPzYg9vyT+waGd4AQ+ebcbui0C6sCAwEAATANBgkq
+hkiG9w0BAQsFAAOCAQEAceO2v7DmInxsh3qHCMcBKFuaTV6rB6Upg8+onpMDpD+a
+rriNMg6nfq50nzdpjbeYg+Qiaqornws9WnYO9d446kgVtTDbWnkzqjkBr9In0rx3
+r7MBk755BjMNa3KKT/BFQRl6kwCK0G7FQI5EPiFXyt08anXDVThRd+2q21GLpqRP
+uh7qvFhLcmglCQsfSXFwvdL6v8LCS1EDNOlSncnLCgjXCefU9DakEtbvnl96RQ4m
+BQeIaGjY+9ZWq30BqVer3MiZfIvBZnWvEIA/RLCzbxttr6KsOrQWW3WvntpIK6bo
+0eIhTC/EDuEgorvjPxOfOHklNdTuAY/sjofuHPrctw==
+-----END CERTIFICATE-----
diff --git a/reg_config/voltha-pvt-template.key b/reg_config/voltha-pvt-template.key
new file mode 100755
index 0000000..27b51dd
--- /dev/null
+++ b/reg_config/voltha-pvt-template.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAvozKAXV3yMs5KOK14eJzv/wQ3a03qr9y+2xmjt7k8Mu2/svI
+knRoILkluiu/KHYnMLmkKkKtAwG+UlQvCpTkW3pjrWD4RUmDcqY4XdW9DDQnHc/f
+UFQI5mZuPxI8DNlG4GdO7DYQbwqWWTRxoSiNCiNjR29vT3vuGdP6P9+n3VztuyAf
+Lg8q26nA55QeQ4zdlzFTsqtfncFmbKUlVeoT2i0NOWNOqGPoXjFKWgYE86ybrBxf
+Ra1LlB8IUWOZoDcmVNxdZ98uGs/43VsuUpvXQhYaXGIFXLnaDOblOfeGUUxo5QMc
+driRcEICN8U/NiD2/JP7BoZ3gBD55txu6LQLqwIDAQABAoIBAQCZohodIwD5PCFR
+/bh374Uz/Z/7m3WOjd2/KZ9nAf/Exfs9ZEDLFGAAQkdQ24S8ssbWWlcqW6fzDKzO
+5GEpPvL/bqZ/W/fQpXz+K1a3EWXjOQlw1/FNavPiECRDZghUs7qZo7HWcaC+ZuLh
++Y7ESVWuHuok5ovwohNPb8INTd6icq0XixjXQvqCwjYptgYxZOK791QLCDVSYUlK
+XJ80S5j59OkV8xpT69cSlVp12Fhd1Waq1MQPjre0e2H054w/HwMtgfPEokkqTT1m
+kmE/ryTJDbXAMo6B8VnzMfEEVUQRI4IWy6g3X5rQe9mYs0H7cHdCwTXrZ0Tk/bxI
+HmUtNakBAoGBAPECx2H/80LBhRE4htJ7Ua4o6cfC18gW9vxaEoEwPrHEHtabh5vg
+QHG26Gtq0U0CosJr5Sww9YV1AACm0oVlRbLPSCElpdzUV/kWPnPTZOezJ0YaRDi1
+f6yFi5KvYGXaPqYZ8VYNjQY1LoZlrQ8Np+aQ0a+77Q/anPLKY3WacMERAoGBAMpm
+mqBo7Qn87213GmWZH+sEkzQFZPkveXgCCHWh6mrvWJOBxthOBPIvOmO0oNMevt4s
+C2hkRpBZFsgtrfLTrLilJHMb3MXWsmjfVl0AWydA3HaguXW8Hmhrboa3/CErobms
+f/hlBhew8n13Gs+KF//u1oXVSnPLu+FBKfVVusD7AoGAL+CIcSxiS8GbyJb9GXUL
+/df80QUgzovZVroh8O3/llrKcYGGB+4dfzmBpE0c9PpwEMVUSloTfAaJEJgTPBKp
+LONGhecvstWwADhuAZ5d7jVFuQRgxw8vJLuGxYX3VWRsi5ydt6WLfU81RdeO8G2b
+DA96yDlB16NrCEQyS9t5SLECgYEAx6rop45bKRtI52gztj6U6jgdL5iSv/BBmE4J
+ImKU6uErNHk2PHTbFD/bDjlG3n7aNDqnFli18/ivLNNDYuXG4nCnwJaf+NuQLT0F
+6cFMKzElTDHKQ4dNSB2Tb3tZUy/D33N42wZuODjrPzKcVFkay/RF1MlRJWK6+cBb
+MBdeoLkCgYEAlG8TcBHQc0nuTL5/9qjLzQ7q7pwwyf93BZj6iCEUc+c4DSmluTY6
+QA5UAhQx2iishzEwnz4lNsafsEQlmfm6hbJvmYAwWQq2coOVEF9r3sxptU+NJTsN
+tX0fPfg5B3eWHMO+K7MmCSbzoyvB7oU7JfgZ5YE+SN/UQ26URSWaGVo=
+-----END RSA PRIVATE KEY-----