diff --git a/compose/docker-compose-ofagent-swarm.yml b/compose/docker-compose-ofagent-swarm.yml
index 428f122..956031c 100644
--- a/compose/docker-compose-ofagent-swarm.yml
+++ b/compose/docker-compose-ofagent-swarm.yml
@@ -37,9 +37,6 @@
             - --controller=onos:6653
             - --grpc-endpoint=vcore:50556
             - --instance-id-is-container-name
-            - --enable-tls
-            - --key-file=/ofagent/pki/voltha.key
-            - --cert-file=/ofagent/pki/voltha.crt
         volumes:
             - /var/run/docker.sock:/tmp/docker.sock
         networks:
diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 6f24e8d..fc7a276 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -193,7 +193,7 @@
   #
   ofagent:
     image: "${REGISTRY}${REPOSITORY}voltha-ofagent${TAG}"
-    command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name --enable-tls --key-file=/ofagent/pki/voltha.key --cert-file=/ofagent/pki/voltha.crt
+    command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name
     depends_on:
     - vconsul
     - voltha
diff --git a/compose/docker-compose-system-test-with-etcd.yml b/compose/docker-compose-system-test-with-etcd.yml
index 0204f4a..6b40c4f 100644
--- a/compose/docker-compose-system-test-with-etcd.yml
+++ b/compose/docker-compose-system-test-with-etcd.yml
@@ -257,9 +257,6 @@
       "--controller=${DOCKER_HOST_IP}:6653",
       "--grpc-endpoint=@voltha-grpc",
       "--instance-id-is-container-name",
-      "--enable-tls",
-      "--key-file=/ofagent/pki/voltha.key",
-      "--cert-file=/ofagent/pki/voltha.crt",
       "-v"
     ]
     depends_on:
diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 6b4b19e..e47aec5 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -239,9 +239,6 @@
       "--controller=${DOCKER_HOST_IP}:6653",
       "--grpc-endpoint=@voltha-grpc",
       "--instance-id-is-container-name",
-      "--enable-tls",
-      "--key-file=/ofagent/pki/voltha.key",
-      "--cert-file=/ofagent/pki/voltha.crt",
       "-v"
     ]
     depends_on:
diff --git a/compose/voltha-stack.yml.j2 b/compose/voltha-stack.yml.j2
index f46724f..2d79e7a 100644
--- a/compose/voltha-stack.yml.j2
+++ b/compose/voltha-stack.yml.j2
@@ -373,9 +373,6 @@
       - --controller=onos:6653
       - --grpc-endpoint=vcore:50556
       - --instance-id-is-container-name
-      - --enable-tls
-      - --key-file=/ofagent/pki/voltha.key
-      - --cert-file=/ofagent/pki/voltha.crt
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock
     networks:
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index f364875..ebc6a3c 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -52,9 +52,6 @@
 FROM onosproject/onos:1.13.5
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
-# Install Key Store Options
-ENV JAVA_OPTS="${JAVA_OPTS:--DenableOFTLS=true -Djavax.net.ssl.keyStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"
-
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
 ENV KARAF_VERSION=3.0.8