diff --git a/Makefile b/Makefile
index bd54a7a..29e7243 100644
--- a/Makefile
+++ b/Makefile
@@ -486,8 +486,8 @@
 		helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
 			--namespace kube-system \
 			--values $(ROC_VALUES) \
-			atomix-runtime \
-			$(ATOMIX_RUNTIME_CHART); \
+			atomix \
+			$(ATOMIX_CHART); \
 	fi
 	helm upgrade --install --wait $(HELM_GLOBAL_ARGS) \
 		--namespace kube-system \
diff --git a/configs/latest b/configs/latest
index 082e0e1..9c9dcff 100644
--- a/configs/latest
+++ b/configs/latest
@@ -7,9 +7,7 @@
 
 # For installing the ROC
 AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella
-ATOMIX_CONTROLLER_CHART   := atomix/atomix-controller
-ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage
-ATOMIX_RUNTIME_CHART      := atomix/atomix-runtime --version 0.1.9  # v0.2.0 not working
+ATOMIX_CHART              := atomix/atomix
 ONOS_OPERATOR_CHART       := onosproject/onos-operator
 
 # For installing the applications
diff --git a/configs/local b/configs/local
index 69fd664..1e9ad35 100644
--- a/configs/local
+++ b/configs/local
@@ -10,6 +10,6 @@
 
 # Support testing aether-roc-umbrella chart
 AETHER_ROC_UMBRELLA_CHART := $(WORKSPACE)/cord/roc-helm-charts/aether-roc-umbrella
-ATOMIX_RUNTIME_CHART      := atomix/atomix-runtime
+ATOMIX_CHART              := atomix/atomix
 ONOS_OPERATOR_CHART       := onosproject/onos-operator
 
diff --git a/configs/local-sdcore b/configs/local-sdcore
index 66d7f92..1fb023d 100644
--- a/configs/local-sdcore
+++ b/configs/local-sdcore
@@ -8,5 +8,5 @@
 
 # Support testing aether-roc-umbrella chart
 AETHER_ROC_UMBRELLA_CHART := $(WORKSPACE)/cord/roc-helm-charts/aether-roc-umbrella
-ATOMIX_RUNTIME_CHART      := atomix/atomix-runtime
+ATOMIX_CHART              := atomix/atomix
 ONOS_OPERATOR_CHART       := onosproject/onos-operator
diff --git a/configs/release-2.1 b/configs/release-2.1
index a06c447..a0582cd 100644
--- a/configs/release-2.1
+++ b/configs/release-2.1
@@ -6,12 +6,7 @@
 
 # For installing the ROC
 AETHER_ROC_UMBRELLA_CHART := aether/aether-roc-umbrella --version 2.1.33
-
-# For Aether 2.1, Atomix controller and raft storage have been removed
-# ATOMIX_CONTROLLER_CHART   := atomix/atomix-controller --version 0.6.9
-# ATOMIX_RAFT_STORAGE_CHART := atomix/atomix-raft-storage --version 0.1.25
-
-ATOMIX_RUNTIME_CHART      := atomix/atomix-runtime --version 0.1.9
+ATOMIX_CHART              := atomix/atomix --version 1.1.2
 ONOS_OPERATOR_CHART       := onosproject/onos-operator --version 0.5.6
 
 # Config files to use