diff --git a/.env b/.env
index 80b9bf2..81f31cc 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,3 @@
 TIP_REGISTRY_URL=https://s3.us-west-2.amazonaws.com/ucentral.arilia.com/tip_selfcare_registry.json
+MULTI_DEVICES=false
 PARENTAL_CONTROLS=false
\ No newline at end of file
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 6bb3403..bfaa8c4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -135,8 +135,8 @@ android {
         applicationId "com.telecominfraproject.openwifi.myopenwifi"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3
-        versionName "0.5.1"
+        versionCode 4
+        versionName "0.5.2"
     }
     splits {
         abi {
diff --git a/ios/MyOpenWifi/Info.plist b/ios/MyOpenWifi/Info.plist
index 04bca37..fe3874d 100644
--- a/ios/MyOpenWifi/Info.plist
+++ b/ios/MyOpenWifi/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true />
 	<key>NSAppTransportSecurity</key>
diff --git a/ios/MyOpenWifiTests/Info.plist b/ios/MyOpenWifiTests/Info.plist
index 0be5c20..9952aa5 100644
--- a/ios/MyOpenWifiTests/Info.plist
+++ b/ios/MyOpenWifiTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.5.1</string>
+	<string>0.5.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 </dict>
 </plist>
diff --git a/package.json b/package.json
index 524bb81..74661e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myopenwifi",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/src/screens/Dashboard.js b/src/screens/Dashboard.js
index 0a714f7..cdb19ab 100644
--- a/src/screens/Dashboard.js
+++ b/src/screens/Dashboard.js
@@ -1,3 +1,4 @@
+import Config from 'react-native-config';
 import React, { useCallback, useRef, useState } from 'react';
 import { strings } from '../localization/LocalizationStrings';
 import { pageStyle, okColor, infoColor, errorColor, primaryColor, whiteColor, grayBackgroundcolor } from '../AppStyle';
@@ -161,18 +162,20 @@ const Dashboard = props => {
 
   const renderAccessPointButtons = () => {
     return (
-      <View style={componentStyles.accessPointButtonsContainer}>
-        <TouchableOpacity onPress={onAddAccessPointPress}>
-          <Image style={componentStyles.accessPointButtons} source={require('../assets/plus-solid.png')} />
-        </TouchableOpacity>
-        <Text style={componentStyles.iconLabel}>{strings.dashboard.network}</Text>
-        <TouchableOpacity onPress={onDeleteAccessPointPress}>
-          <Image
-            style={[componentStyles.accessPointButtons, componentStyles.deleteIcon]}
-            source={require('../assets/times-solid.png')}
-          />
-        </TouchableOpacity>
-      </View>
+      Config.MULTI_DEVICES === 'true' && (
+        <View style={componentStyles.accessPointButtonsContainer}>
+          <TouchableOpacity onPress={onAddAccessPointPress}>
+            <Image style={componentStyles.accessPointButtons} source={require('../assets/plus-solid.png')} />
+          </TouchableOpacity>
+          <Text style={componentStyles.iconLabel}>{strings.dashboard.network}</Text>
+          <TouchableOpacity onPress={onDeleteAccessPointPress}>
+            <Image
+              style={[componentStyles.accessPointButtons, componentStyles.deleteIcon]}
+              source={require('../assets/times-solid.png')}
+            />
+          </TouchableOpacity>
+        </View>
+      )
     );
   };
 
diff --git a/src/screens/SignUp.js b/src/screens/SignUp.js
index 46156fe..09082ef 100644
--- a/src/screens/SignUp.js
+++ b/src/screens/SignUp.js
@@ -90,7 +90,7 @@ export default function SignUp(props) {
 
   const deleteSignUp = async () => {
     try {
-      // Delete the current sign-up process upon success or failure. This may be removed in the future. 
+      // Delete the current sign-up process upon success or failure. This may be removed in the future.
       await subscriberRegistrationApi.deleteSignup(email, macAddress, signUpStatus.id);
 
       if (isMounted.current) {