diff --git a/android-sdk/build.gradle b/android-sdk/build.gradle
index c27719f76..b8f6eb865 100644
--- a/android-sdk/build.gradle
+++ b/android-sdk/build.gradle
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven'
+//apply plugin: 'maven-publish'
 
 version = version_name
 group = group_id
@@ -86,18 +86,18 @@ dependencies {
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
 }
 
-uploadArchives {
-    dependsOn = [':android-sdk:releaseJavadocJar', ':android-sdk:releaseSourcesJar']
-    shouldRunAfter = [':android-sdk:clean', ':datafile-handler:uploadArchives', ':event-handler:uploadArchives', ':user-profile:uploadArchives']
-    repositories {
-        mavenDeployer {
-            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {
-                authentication(userName: bintray_user, password: bintray_api_key)
-            }
-            pom.artifactId = "android-sdk"
-        }
-    }
-}
+//uploadArchives {
+//    dependsOn = [':android-sdk:releaseJavadocJar', ':android-sdk:releaseSourcesJar']
+//    shouldRunAfter = [':android-sdk:clean', ':datafile-handler:uploadArchives', ':event-handler:uploadArchives', ':user-profile:uploadArchives']
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android") {
+//                authentication(userName: bintray_user, password: bintray_api_key)
+//            }
+//            pom.artifactId = "android-sdk"
+//        }
+//    }
+//}
 
 android.libraryVariants.all { variant ->
     task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
diff --git a/build.gradle b/build.gradle
index c76d791dd..d5cc2b951 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,18 +17,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    def bintray_user = System.getenv('BINTRAY_USER')
-    def bintray_api_key = System.getenv('BINTRAY_API_KEY')
-    def version_name = System.getenv('TRAVIS_TAG')
-    if (bintray_user != null && bintray_api_key != null && version_name != null) {
-        rootProject.ext.bintray_user = bintray_user
-        rootProject.ext.bintray_api_key = bintray_api_key
-        rootProject.ext.version_name = version_name
-    } else {
-        rootProject.ext.bintray_user = ''
-        rootProject.ext.bintray_api_key = ''
-        rootProject.ext.version_name= 'debugVersion'
-    }
+//    def bintray_user = System.getenv('BINTRAY_USER')
+//    def bintray_api_key = System.getenv('BINTRAY_API_KEY')
+//    def version_name = System.getenv('TRAVIS_TAG')
+//    if (bintray_user != null && bintray_api_key != null && version_name != null) {
+//        rootProject.ext.bintray_user = bintray_user
+//        rootProject.ext.bintray_api_key = bintray_api_key
+//        rootProject.ext.version_name = version_name
+//    } else {
+//        rootProject.ext.bintray_user = ''
+//        rootProject.ext.bintray_api_key = ''
+//        rootProject.ext.version_name= 'debugVersion'
+//    }
+    rootProject.ext.version_name= '3.1.0-a1'
     repositories {
         jcenter()
         google()
@@ -63,6 +64,7 @@ ext {
     dexmaker_ver = "1.2"
     espresso_ver = "2.2.2"
     gson_ver = "2.8.5"
+
     group_id = "com.optimizely.ab"
     mavPluginVersion = '1.0.3'
     mavProjectName = 'optimizely-android-sdk'
@@ -75,11 +77,11 @@ task clean(type: Delete) {
     delete rootProject.buildDir
 }
 
-task ship() {
-    dependsOn(':android-sdk:uploadArchives', ':shared:uploadArchives',
-            'event-handler:uploadArchives', 'user-profile:uploadArchives',
-            'datafile-handler:uploadArchives')
-}
+//task ship() {
+//    dependsOn(':android-sdk:uploadArchives', ':shared:uploadArchives',
+//            'event-handler:uploadArchives', 'user-profile:uploadArchives',
+//            'datafile-handler:uploadArchives')
+//}
 
 task cleanAllModules () {
     logger.info("Running clean for all modules")
@@ -102,3 +104,7 @@ testAllModulesTravis.dependsOn(':android-sdk:connectedAndroidTest', ':android-sd
         ':user-profile:connectedAndroidTest', ':shared:connectedAndroidTest')
 
 testAllModules.dependsOn('testAllModulesTravis', ':test-app:connectedAndroidTest')
+
+subprojects {
+    tasks.withType(Javadoc).all { enabled = false }
+}
\ No newline at end of file
diff --git a/datafile-handler/build.gradle b/datafile-handler/build.gradle
index a888efaac..1bb5665cb 100644
--- a/datafile-handler/build.gradle
+++ b/datafile-handler/build.gradle
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven'
+//apply plugin: 'maven-publish'
 
 version = version_name
 group = group_id
@@ -73,18 +73,18 @@ dependencies {
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
 }
 
-uploadArchives {
-    dependsOn = [':datafile-handler:releaseJavadocJar', ':datafile-handler:releaseSourcesJar']
-    shouldRunAfter = [':datafile-handler:clean', ':shared:uploadArchives']
-    repositories {
-        mavenDeployer {
-            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-datafile-handler") {
-                authentication(userName: bintray_user, password: bintray_api_key)
-            }
-            pom.artifactId = "android-sdk-datafile-handler"
-        }
-    }
-}
+//uploadArchives {
+//    dependsOn = [':datafile-handler:releaseJavadocJar', ':datafile-handler:releaseSourcesJar']
+//    shouldRunAfter = [':datafile-handler:clean', ':shared:uploadArchives']
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-datafile-handler") {
+//                authentication(userName: bintray_user, password: bintray_api_key)
+//            }
+//            pom.artifactId = "android-sdk-datafile-handler"
+//        }
+//    }
+//}
 
 android.libraryVariants.all { variant ->
     task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
@@ -126,3 +126,4 @@ android.libraryVariants.all { variant ->
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
 
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
\ No newline at end of file
diff --git a/event-handler/build.gradle b/event-handler/build.gradle
index 88b2b86eb..17c2c4586 100644
--- a/event-handler/build.gradle
+++ b/event-handler/build.gradle
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven'
+//apply plugin: 'maven-publish'
 
 version = version_name
 group = group_id
@@ -74,18 +74,18 @@ dependencies {
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
 }
 
-uploadArchives {
-    dependsOn = [':event-handler:releaseJavadocJar', ':event-handler:releaseSourcesJar']
-    shouldRunAfter = [':event-handler:clean', ':shared:uploadArchives']
-    repositories {
-        mavenDeployer {
-            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-event-handler") {
-                authentication(userName: bintray_user, password: bintray_api_key)
-            }
-            pom.artifactId = "android-sdk-event-handler"
-        }
-    }
-}
+//uploadArchives {
+//    dependsOn = [':event-handler:releaseJavadocJar', ':event-handler:releaseSourcesJar']
+//    shouldRunAfter = [':event-handler:clean', ':shared:uploadArchives']
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-event-handler") {
+//                authentication(userName: bintray_user, password: bintray_api_key)
+//            }
+//            pom.artifactId = "android-sdk-event-handler"
+//        }
+//    }
+//}
 
 android.libraryVariants.all { variant ->
     task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
@@ -127,3 +127,4 @@ android.libraryVariants.all { variant ->
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
 
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
\ No newline at end of file
diff --git a/shared/build.gradle b/shared/build.gradle
index b006ab253..748765a1c 100644
--- a/shared/build.gradle
+++ b/shared/build.gradle
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven'
+//apply plugin: 'maven-publish'
 
 version = version_name
 group = group_id
@@ -77,18 +77,18 @@ dependencies {
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
 }
 
-uploadArchives {
-    dependsOn = [':shared:releaseJavadocJar', ':shared:releaseSourcesJar']
-    shouldRunAfter = [':shared:clean']
-    repositories {
-        mavenDeployer {
-            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-shared") {
-                authentication(userName: bintray_user, password: bintray_api_key)
-            }
-            pom.artifactId = "android-sdk-shared"
-        }
-    }
-}
+//uploadArchives {
+//    dependsOn = [':shared:releaseJavadocJar', ':shared:releaseSourcesJar']
+//    shouldRunAfter = [':shared:clean']
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-shared") {
+//                authentication(userName: bintray_user, password: bintray_api_key)
+//            }
+//            pom.artifactId = "android-sdk-shared"
+//        }
+//    }
+//}
 
 android.libraryVariants.all { variant ->
     task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
@@ -130,3 +130,5 @@ android.libraryVariants.all { variant ->
     }
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
+
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
\ No newline at end of file
diff --git a/user-profile/build.gradle b/user-profile/build.gradle
index 8a5f74adf..8f80486c6 100644
--- a/user-profile/build.gradle
+++ b/user-profile/build.gradle
@@ -15,8 +15,8 @@
  ***************************************************************************/
 
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
-apply plugin: 'maven-publish'
+//apply plugin: 'maven'
+//apply plugin: 'maven-publish'
 
 version = version_name
 group = group_id
@@ -73,18 +73,18 @@ dependencies {
     androidTestImplementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
 }
 
-uploadArchives {
-    dependsOn = [':user-profile:releaseJavadocJar', ':user-profile:releaseSourcesJar']
-    shouldRunAfter = [':user-profile:clean', ':shared:uploadArchives']
-    repositories {
-        mavenDeployer {
-            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-user-profile") {
-                authentication(userName: bintray_user, password: bintray_api_key)
-            }
-            pom.artifactId = "android-sdk-user-profile"
-        }
-    }
-}
+//uploadArchives {
+//    dependsOn = [':user-profile:releaseJavadocJar', ':user-profile:releaseSourcesJar']
+//    shouldRunAfter = [':user-profile:clean', ':shared:uploadArchives']
+//    repositories {
+//        mavenDeployer {
+//            repository(url: "https://api.bintray.com/maven/optimizely/optimizely/optimizely-sdk-android-user-profile") {
+//                authentication(userName: bintray_user, password: bintray_api_key)
+//            }
+//            pom.artifactId = "android-sdk-user-profile"
+//        }
+//    }
+//}
 
 android.libraryVariants.all { variant ->
     task("${variant.name}Javadoc", type: Javadoc, dependsOn: "assemble${variant.name.capitalize()}") {
@@ -125,3 +125,5 @@ android.libraryVariants.all { variant ->
     }
     project.artifacts.add("archives", tasks["${variant.name}SourcesJar"]);
 }
+
+apply from: "https://raw.githubusercontent.com/sky-uk/gradle-maven-plugin/${mavPluginVersion}/gradle-mavenizer.gradle"
\ No newline at end of file