diff --git a/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java b/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java
index 1523e9c..fa91686 100644
--- a/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java
+++ b/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java
@@ -86,7 +86,7 @@
 
     private short radiusPort = 1812;
 
-    private short ofPort = 6633;
+    private short ofPort = 6653;
 
     private DeviceId fabricDeviceId = DeviceId.deviceId("of:5e3e486e73000187");
 
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
index 0c28a6f..fd7c35d 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/Controller.java
@@ -65,7 +65,7 @@
     private ChannelGroup cg;
 
     // Configuration options
-    protected int openFlowPort = 6633;
+    protected int openFlowPort = 6653;
     protected int workerThreads = 0;
 
     // Start time of the controller
@@ -160,8 +160,8 @@
         if (ofPort != null) {
             this.openFlowPort = Integer.parseInt(ofPort);
         }
-
         log.debug("OpenFlow port set to {}", this.openFlowPort);
+
         String threads = configParams.get("workerthreads");
         this.workerThreads = threads != null ? Integer.parseInt(threads) : 16;
         log.debug("Number of worker threads set to {}", this.workerThreads);
diff --git a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
index c82078a..c52f4bb 100644
--- a/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
+++ b/openflow/ctl/src/main/java/org/onosproject/openflow/controller/impl/OpenFlowControllerImpl.java
@@ -86,7 +86,7 @@
 @Component(immediate = true)
 @Service
 public class OpenFlowControllerImpl implements OpenFlowController {
-    private static final int DEFAULT_OFPORT = 6633;
+    private static final int DEFAULT_OFPORT = 6653;
     private static final int DEFAULT_WORKER_THREADS = 16;
 
     private static final Logger log =
@@ -103,7 +103,7 @@
     protected ComponentConfigService cfgService;
 
     @Property(name = "openflowPort", intValue = DEFAULT_OFPORT,
-            label = "Port number used by OpenFlow protocol; default is 6633")
+            label = "Port number used by OpenFlow protocol; default is 6653")
     private int openflowPort = DEFAULT_OFPORT;
 
     @Property(name = "workerThreads", intValue = DEFAULT_WORKER_THREADS,
diff --git a/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbConstant.java b/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbConstant.java
index c1133bb..e91c928 100644
--- a/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbConstant.java
+++ b/ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbConstant.java
@@ -60,7 +60,7 @@
     public static final String EXTERNAL_ID_VM_MAC = "attached-mac";
 
     /** Openflow port. */
-    public static final int OFPORT = 6633;
+    public static final int OFPORT = 6653;
 
     /** Ovsdb port. */
     public static final int OVSDBPORT = 6640;
diff --git a/tools/build/docker/Dockerfile b/tools/build/docker/Dockerfile
index fd61ad8..ee9666a 100644
--- a/tools/build/docker/Dockerfile
+++ b/tools/build/docker/Dockerfile
@@ -45,11 +45,11 @@
 
 
 # Ports
-# 6633 - OpenFlow
+# 6653 - OpenFlow
 # 8181 - GUI
 # 8101 - ONOS CLI
 # 9876 - ONOS CLUSTER COMMUNICATION
-EXPOSE 6633 8181 8101 9876
+EXPOSE 6653 8181 8101 9876
 
 # Get ready to run command
 WORKDIR /root/onos
diff --git a/tools/test/bin/onos-set-controllers b/tools/test/bin/onos-set-controllers
index 5b3cd6f..27cc16c 100755
--- a/tools/test/bin/onos-set-controllers
+++ b/tools/test/bin/onos-set-controllers
@@ -6,7 +6,7 @@
 controllers=""
 
 for node in $ONOS_INSTANCES; do
-    controllers="$controllers tcp:$node:${OF_PORT:-6633}"
+    controllers="$controllers tcp:$node:${OF_PORT:-6653}"
 done
 
 ssh ${ONOS_USER:-sdn}@$OCN "
diff --git a/tools/test/topos/onos.py b/tools/test/topos/onos.py
index ae6045e..f9d4ba2 100755
--- a/tools/test/topos/onos.py
+++ b/tools/test/topos/onos.py
@@ -31,7 +31,7 @@
         Controller.__init__( self, name, **kwargs )
         # the following have been done for us:
         #self.ip = ip ('127.0.0.1')
-        #self.port = port (6633)
+        #self.port = port (6653)
         #self.protocol = protocol ('tcp')
         #self.checkListening()
 
diff --git a/tools/test/topos/optical2.py b/tools/test/topos/optical2.py
index 36cdbad..b778592 100644
--- a/tools/test/topos/optical2.py
+++ b/tools/test/topos/optical2.py
@@ -69,7 +69,7 @@
 
 
 def run():
-    c = RemoteController('c','127.0.0.1',6633)
+    c = RemoteController('c','127.0.0.1',6653)
     net = Mininet( topo=OpticalTopo(),controller=None,autoSetMacs=True)
     net.addController(c)
     net.start()
diff --git a/tools/test/topos/solar.py b/tools/test/topos/solar.py
index ea11b66..f316162 100644
--- a/tools/test/topos/solar.py
+++ b/tools/test/topos/solar.py
@@ -23,7 +23,7 @@
         # We are creating the controller with local-loopback on purpose to avoid
         # having the switches connect immediately. Instead, we'll set controller
         # explicitly for each switch after configuring it as we want.
-        self.ctrls = [ RemoteController(cname, cip, 6633) for cip in cips ]
+        self.ctrls = [ RemoteController(cname, cip, 6653) for cip in cips ]
         self.net = Mininet(controller=RemoteController, switch = OVSKernelSwitch,
                            build=False)
 
diff --git a/tools/test/topos/sys-nonlinear-10.config b/tools/test/topos/sys-nonlinear-10.config
index 2b999d3..b3a718d 100644
--- a/tools/test/topos/sys-nonlinear-10.config
+++ b/tools/test/topos/sys-nonlinear-10.config
@@ -56,7 +56,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -66,7 +66,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -76,7 +76,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -86,7 +86,7 @@
            {switch,4,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -96,7 +96,7 @@
            {switch,5,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -107,7 +107,7 @@
            {switch,7,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -118,7 +118,7 @@
            {switch,8,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -128,7 +128,7 @@
            {switch,9,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -138,7 +138,7 @@
            {switch,10,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -148,7 +148,7 @@
            {switch,6,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
diff --git a/tools/test/topos/sys-nonlinear-4.config b/tools/test/topos/sys-nonlinear-4.config
index b843146..b1451be 100644
--- a/tools/test/topos/sys-nonlinear-4.config
+++ b/tools/test/topos/sys-nonlinear-4.config
@@ -18,7 +18,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -28,7 +28,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -37,7 +37,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -47,7 +47,7 @@
            {switch,4,
               [{backend,linc_us4_oe},
                {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-               {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+               {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                {controllers_listener,disabled},
                {queues_status,disabled},
                {ports,
diff --git a/tools/test/topos/sys.config b/tools/test/topos/sys.config
index 2b999d3..b3a718d 100644
--- a/tools/test/topos/sys.config
+++ b/tools/test/topos/sys.config
@@ -56,7 +56,7 @@
           [{switch,1,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:01"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -66,7 +66,7 @@
            {switch,2,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:02"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -76,7 +76,7 @@
            {switch,3,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:03"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -86,7 +86,7 @@
            {switch,4,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:04"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -96,7 +96,7 @@
            {switch,5,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:05"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -107,7 +107,7 @@
            {switch,7,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:07"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -118,7 +118,7 @@
            {switch,8,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:08"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -128,7 +128,7 @@
            {switch,9,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:09"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -138,7 +138,7 @@
            {switch,10,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:0A"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,
@@ -148,7 +148,7 @@
            {switch,6,
                [{backend,linc_us4_oe},
                 {datapath_id,"00:00:ff:ff:ff:ff:ff:06"},
-                {controllers,[{"Switch0-Controller","10.1.8.147",6633,tcp}]},
+                {controllers,[{"Switch0-Controller","10.1.8.147",6653,tcp}]},
                 {controllers_listener,disabled},
                 {queues_status,disabled},
                 {ports,