diff --git a/android/sample/build.gradle b/android/sample/build.gradle
index 93623e016..1eef227ad 100644
--- a/android/sample/build.gradle
+++ b/android/sample/build.gradle
@@ -1,7 +1,6 @@
 apply plugin: 'com.android.application'
 
 android {
-
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     defaultConfig {
diff --git a/build.gradle b/build.gradle
index 7a75cc0dc..6e40984db 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,12 +15,19 @@ plugins {
     id 'de.undercouch.download' version '3.4.3'
 }
 
+ext.isSnapshot = { VERSION_NAME.endsWith('-SNAPSHOT') }
+ext.isRelease = { ['uploadArchives', 'bintrayUpload'].any { gradle.startParameter.taskNames.contains(it) } }
+
 subprojects {
     repositories {
         google()
         mavenLocal()
         mavenCentral()
         jcenter()
+
+        if (isSnapshot()) {
+            maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        }
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
index f4b634ead..61b23f119 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # POM publishing constants
-VERSION_NAME=0.6.17
+VERSION_NAME=0.6.18-SNAPSHOT
 GROUP=com.facebook.flipper
 POM_URL=https://github.com/facebook/flipper
 POM_SCM_URL=https://github.com/facebook/flipper.git
@@ -12,7 +12,7 @@ POM_DEVELOPER_ID=facebook
 POM_DEVELOPER_NAME=facebook
 
 # Shared version numbers
-LITHO_VERSION=0.18.0
+LITHO_VERSION=0.18.1-SNAPSHOT
 
 # Deps for publishing
 GRADLE_BINTRAY_PLUGIN_VERSION=1.8.0