diff --git a/build.gradle b/build.gradle
index 9da4091d..42e67fb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ def details = versionDetails()
 def isPlainTag = details.getCommitDistance() == 0
 def noCommitHash = providers.gradleProperty("noCommitHash").isPresent()
 if (!isPlainTag && !noCommitHash) {
-    version += "-" + details.gitHash
+    version += "-nightly-" + details.gitHash
 }
 
 // If we have uncommitted changes, say so.
diff --git a/src/main/java/ganymedes01/etfuturum/EtFuturum.java b/src/main/java/ganymedes01/etfuturum/EtFuturum.java
index c5ec5115..4969bdf1 100644
--- a/src/main/java/ganymedes01/etfuturum/EtFuturum.java
+++ b/src/main/java/ganymedes01/etfuturum/EtFuturum.java
@@ -229,7 +229,6 @@ public void preInit(FMLPreInitializationEvent event) {
 		networkWrapper.registerMessage(AttackYawHandler.class, AttackYawMessage.class, 7, Side.CLIENT);
 
 		String buildVer = event.getModMetadata().version;
-		Reference.SNAPSHOT_BUILD = buildVer.toLowerCase().contains("snapshot") || buildVer.contains("alpha") || buildVer.toLowerCase().contains("beta") || buildVer.toLowerCase().contains("rc");
 		if (!Reference.SNAPSHOT_BUILD && !Reference.DEV_ENVIRONMENT) {
 			MCLibModules.updateCheckAPI.submitModTask(Reference.MOD_ID, Reference.VERSION_URL);
 		}
diff --git a/src/main/java/ganymedes01/etfuturum/lib/Reference.java b/src/main/java/ganymedes01/etfuturum/lib/Reference.java
index d18cd4a4..5c1a15e7 100644
--- a/src/main/java/ganymedes01/etfuturum/lib/Reference.java
+++ b/src/main/java/ganymedes01/etfuturum/lib/Reference.java
@@ -23,5 +23,5 @@ public class Reference {
 	public static final String ENTITY_TEXTURE_PATH = ITEM_BLOCK_TEXTURE_PATH + "textures/entities/";
 
 	public static boolean launchConfigWarning;
-	public static boolean SNAPSHOT_BUILD = false;
+	public static boolean SNAPSHOT_BUILD = Tags.VERSION.toLowerCase().contains("snapshot") || Tags.VERSION.toLowerCase().contains("nightly") || Tags.VERSION.toLowerCase().contains("alpha") || Tags.VERSION.toLowerCase().contains("beta") || Tags.VERSION.toLowerCase().contains("rc");
 }