diff --git a/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
index 618c631..c4965e1 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/atomix/cluster/impl/AtomixClusterStore.java
@@ -213,7 +213,6 @@
     @Override
     public void markFullyStarted(boolean started) {
         ControllerNode.State state = started ? ControllerNode.State.READY : ControllerNode.State.ACTIVE;
-        states.put(localNode.id(), state);
         membershipService.getLocalMember().properties().setProperty(STATE_KEY, state.name());
     }
 
diff --git a/lib/BUCK b/lib/BUCK
index 8204bf4..7482082 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 5 Oct 2018 20:40:12 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 12 Oct 2018 17:49:41 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 pass_thru_pom(
@@ -242,73 +242,73 @@
 
 remote_jar (
   name = 'atomix',
-  out = 'atomix-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix:jar:3.0.6',
-  sha1 = 'a8c1401b9f5d3757c8cfa2b7905d928825507cf8',
-  maven_coords = 'io.atomix:atomix:3.0.6',
+  out = 'atomix-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix:jar:3.0.7',
+  sha1 = 'd2c0cdbdc4e7c242d1fe476892fdbc31a1468d43',
+  maven_coords = 'io.atomix:atomix:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-cluster',
-  out = 'atomix-cluster-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-cluster:jar:3.0.6',
-  sha1 = '8d91e0caf5c2739476826b32bdcf21afc32bf433',
-  maven_coords = 'io.atomix:atomix-cluster:3.0.6',
+  out = 'atomix-cluster-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-cluster:jar:3.0.7',
+  sha1 = '1bf4ca3d10f8be0c87588b531a200d982ef6f1a3',
+  maven_coords = 'io.atomix:atomix-cluster:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-gossip',
-  out = 'atomix-gossip-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-gossip:jar:3.0.6',
-  sha1 = '5db475ea2702fabfb8eb19079bc07979bc706c17',
-  maven_coords = 'io.atomix:atomix-gossip:3.0.6',
+  out = 'atomix-gossip-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-gossip:jar:3.0.7',
+  sha1 = 'c702172c4d77cea0fb95ad953ee36c2bae73db34',
+  maven_coords = 'io.atomix:atomix-gossip:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-primary-backup',
-  out = 'atomix-primary-backup-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.6',
-  sha1 = 'af3a4475a54a83fe8eafd58925c04db608eec150',
-  maven_coords = 'io.atomix:atomix-primary-backup:3.0.6',
+  out = 'atomix-primary-backup-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-primary-backup:jar:3.0.7',
+  sha1 = 'b5269c7bc1172966928ec14af098f02c65c78c97',
+  maven_coords = 'io.atomix:atomix-primary-backup:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-primitive',
-  out = 'atomix-primitive-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-primitive:jar:3.0.6',
-  sha1 = 'bb65acf0dd5e805ffc27f0f768e2fe5310d83a71',
-  maven_coords = 'io.atomix:atomix-primitive:3.0.6',
+  out = 'atomix-primitive-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-primitive:jar:3.0.7',
+  sha1 = '41c55b48913ceffecaa846395e19dbe2e959d145',
+  maven_coords = 'io.atomix:atomix-primitive:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-raft',
-  out = 'atomix-raft-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-raft:jar:3.0.6',
-  sha1 = 'f3497269b021f8794ba26296f6779977fd213f0e',
-  maven_coords = 'io.atomix:atomix-raft:3.0.6',
+  out = 'atomix-raft-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-raft:jar:3.0.7',
+  sha1 = '9b294e0568df35d1a58971b2748426da7d13e849',
+  maven_coords = 'io.atomix:atomix-raft:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-storage',
-  out = 'atomix-storage-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-storage:jar:3.0.6',
-  sha1 = '0cebbfd8932c7ed27d173d9f3487687317905f5d',
-  maven_coords = 'io.atomix:atomix-storage:3.0.6',
+  out = 'atomix-storage-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-storage:jar:3.0.7',
+  sha1 = '451575082ad5bd0257372bd34c29ac0bf1120133',
+  maven_coords = 'io.atomix:atomix-storage:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
 remote_jar (
   name = 'atomix-utils',
-  out = 'atomix-utils-3.0.6.jar',
-  url = 'mvn:io.atomix:atomix-utils:jar:3.0.6',
-  sha1 = 'd99e63b9df25b59baea5c2fedbd6ad9dab6de59f',
-  maven_coords = 'io.atomix:atomix-utils:3.0.6',
+  out = 'atomix-utils-3.0.7.jar',
+  url = 'mvn:io.atomix:atomix-utils:jar:3.0.7',
+  sha1 = '647aee1cab71c3b816c8a205d0d55bdae9047434',
+  maven_coords = 'io.atomix:atomix-utils:3.0.7',
   visibility = [ 'PUBLIC' ],
 )
 
diff --git a/lib/deps.json b/lib/deps.json
index e0e7953..b03c475 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -138,14 +138,14 @@
     "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42",
     "amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1",
     "asm": "mvn:org.ow2.asm:asm:5.0.4",
-    "atomix": "mvn:io.atomix:atomix:3.0.6",
-    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.6",
-    "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.6",
-    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.6",
-    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.6",
-    "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.6",
-    "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.6",
-    "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.6",
+    "atomix": "mvn:io.atomix:atomix:3.0.7",
+    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.0.7",
+    "atomix-gossip": "mvn:io.atomix:atomix-gossip:3.0.7",
+    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.0.7",
+    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.0.7",
+    "atomix-raft": "mvn:io.atomix:atomix-raft:3.0.7",
+    "atomix-storage": "mvn:io.atomix:atomix-storage:3.0.7",
+    "atomix-utils": "mvn:io.atomix:atomix-utils:3.0.7",
     "classgraph": "mvn:io.github.classgraph:classgraph:4.2.3",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-cli": "mvn:commons-cli:commons-cli:1.3",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index 5cb24b3..53fba24 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Fri, 5 Oct 2018 20:39:53 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Fri, 12 Oct 2018 17:49:17 GMT. Do not edit this file manually. *****
 # ***** Use onos-lib-gen *****
 
 load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -156,51 +156,51 @@
     if "atomix" not in native.existing_rules():
         java_import_external(
             name = "atomix",
-            jar_sha256 = "3007f7e5a8a768e8010ce53218746f1f594728a25b4905793159cc1bbfcff631",
+            jar_sha256 = "4d6c72efa8e42908dbb3e6594fde5f5aef7a7c5c981da67a624ba2cbf2959b71",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.0.6/atomix-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix/3.0.7/atomix-3.0.7.jar"],        )
     if "atomix_cluster" not in native.existing_rules():
         java_import_external(
             name = "atomix_cluster",
-            jar_sha256 = "e1e0f4d49e176433c0880a3dac5ebfa64c3673885ec8899f13ec4799100d8d23",
+            jar_sha256 = "2415ca61a697593eaacf7afb5884b999fdd77600ba21b5edda5a3af50a8fcb10",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.0.6/atomix-cluster-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-cluster/3.0.7/atomix-cluster-3.0.7.jar"],        )
     if "atomix_gossip" not in native.existing_rules():
         java_import_external(
             name = "atomix_gossip",
-            jar_sha256 = "0c9cc7f56bcd8018733f789579294dbfae1afa2b2e5954f4a4fd49b9d05cd6d0",
+            jar_sha256 = "ebc82fe9dc396ab03c7dd8e8db1507b90238d1d426c585390ea5fcc0696675fd",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-gossip/3.0.6/atomix-gossip-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-gossip/3.0.7/atomix-gossip-3.0.7.jar"],        )
     if "atomix_primary_backup" not in native.existing_rules():
         java_import_external(
             name = "atomix_primary_backup",
-            jar_sha256 = "889b38e96b872edda59e0864dc530c4d5c818e8d7aa109646df3912cc7f5efc7",
+            jar_sha256 = "0205ffef779bcb55144355679a34f1adeba6644f8949bed0cd8f80ffb48aa014",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.0.6/atomix-primary-backup-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primary-backup/3.0.7/atomix-primary-backup-3.0.7.jar"],        )
     if "atomix_primitive" not in native.existing_rules():
         java_import_external(
             name = "atomix_primitive",
-            jar_sha256 = "aaac2be34f2c4b832bf8fb2a7b0685680462b59168268bf210c89d7a8882baa8",
+            jar_sha256 = "8f37e8e73c168e48b7fd45c40514b447eb319a78bdb0a3af5520d0546b9551f1",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.0.6/atomix-primitive-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-primitive/3.0.7/atomix-primitive-3.0.7.jar"],        )
     if "atomix_raft" not in native.existing_rules():
         java_import_external(
             name = "atomix_raft",
-            jar_sha256 = "e19b58b84003c4d3fbbe824915ae3fccd4bba403a4d2ddf08e41027bcaead451",
+            jar_sha256 = "76c3d624e4f384cb9bc43430f5a57fca4eb7b9ec1394a67020b5a5bb7c0f1988",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.0.6/atomix-raft-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-raft/3.0.7/atomix-raft-3.0.7.jar"],        )
     if "atomix_storage" not in native.existing_rules():
         java_import_external(
             name = "atomix_storage",
-            jar_sha256 = "4be2fbd90e670bf1001c6e636695335a346745281de8383383c2d7d98623d71f",
+            jar_sha256 = "f190f17969c4c31fee50af99034c6a569505a7d7afd3b034661373d455377dd6",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.0.6/atomix-storage-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-storage/3.0.7/atomix-storage-3.0.7.jar"],        )
     if "atomix_utils" not in native.existing_rules():
         java_import_external(
             name = "atomix_utils",
-            jar_sha256 = "eade85cd718bc088f726de45c4b1d84d16d52ce6565fbd84873152df87a7c79c",
+            jar_sha256 = "d13840f8bc55385167ca18637b955fd554d6b3ee0fe1c20c8ba1c87f0cc68cde",
             licenses = ["notice"],
-            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.0.6/atomix-utils-3.0.6.jar"],        )
+            jar_urls = ["http://repo1.maven.org/maven2/io/atomix/atomix-utils/3.0.7/atomix-utils-3.0.7.jar"],        )
     if "classgraph" not in native.existing_rules():
         java_import_external(
             name = "classgraph",
@@ -1363,14 +1363,14 @@
 artifact_map["@aopalliance_repackaged//:aopalliance_repackaged"] = "mvn:org.glassfish.hk2.external:aopalliance-repackaged:jar:2.5.0-b42"
 artifact_map["@amqp_client//:amqp_client"] = "mvn:com.rabbitmq:amqp-client:jar:3.6.1"
 artifact_map["@asm//:asm"] = "mvn:org.ow2.asm:asm:jar:5.0.4"
-artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.0.6"
-artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.0.6"
-artifact_map["@atomix_gossip//:atomix_gossip"] = "mvn:io.atomix:atomix-gossip:jar:3.0.6"
-artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.6"
-artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.0.6"
-artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.0.6"
-artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.0.6"
-artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.0.6"
+artifact_map["@atomix//:atomix"] = "mvn:io.atomix:atomix:jar:3.0.7"
+artifact_map["@atomix_cluster//:atomix_cluster"] = "mvn:io.atomix:atomix-cluster:jar:3.0.7"
+artifact_map["@atomix_gossip//:atomix_gossip"] = "mvn:io.atomix:atomix-gossip:jar:3.0.7"
+artifact_map["@atomix_primary_backup//:atomix_primary_backup"] = "mvn:io.atomix:atomix-primary-backup:jar:3.0.7"
+artifact_map["@atomix_primitive//:atomix_primitive"] = "mvn:io.atomix:atomix-primitive:jar:3.0.7"
+artifact_map["@atomix_raft//:atomix_raft"] = "mvn:io.atomix:atomix-raft:jar:3.0.7"
+artifact_map["@atomix_storage//:atomix_storage"] = "mvn:io.atomix:atomix-storage:jar:3.0.7"
+artifact_map["@atomix_utils//:atomix_utils"] = "mvn:io.atomix:atomix-utils:jar:3.0.7"
 artifact_map["@classgraph//:classgraph"] = "mvn:io.github.classgraph:classgraph:jar:4.2.3"
 artifact_map["@commons_codec//:commons_codec"] = "mvn:commons-codec:commons-codec:jar:1.10"
 artifact_map["@commons_cli//:commons_cli"] = "mvn:commons-cli:commons-cli:jar:1.3"
diff --git a/tools/test/bin/atomix-install b/tools/test/bin/atomix-install
index 5a10413..af210ae 100755
--- a/tools/test/bin/atomix-install
+++ b/tools/test/bin/atomix-install
@@ -47,7 +47,7 @@
     [ -f $ATOMIX_INSTALL_DIR/bin/atomix-agent ] && echo \"Atomix is already installed\" && exit 1
 
     sudo mkdir -p $ATOMIX_INSTALL_DIR && sudo chown ${ONOS_USER}:${ONOS_GROUP} $ATOMIX_INSTALL_DIR
-    sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.6/atomix-dist-3.0.6.tar.gz
+    sudo wget -O $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz https://oss.sonatype.org/content/repositories/releases/io/atomix/atomix-dist/3.0.7/atomix-dist-3.0.7.tar.gz
     tar -xvf $ATOMIX_INSTALL_DIR/atomix-dist.tar.gz -C $ATOMIX_INSTALL_DIR
 "