diff --git a/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java b/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
index dd2d737..5690b75 100644
--- a/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
+++ b/src/main/java/pl/project13/core/cibuild/BambooBuildServerData.java
@@ -43,7 +43,8 @@ public static boolean isActiveServer(Map<String, String> env) {
   @Override
   void loadBuildNumber(@Nonnull Properties properties) {
     String buildNumber = Optional.ofNullable(env.get("bamboo.buildNumber"))
-            .orElseGet(() -> env.getOrDefault("BAMBOO_BUILDNUMBER", ""));
+            .or(() -> Optional.ofNullable(env.get("BAMBOO_BUILDNUMBER")))
+            .orElseGet(() -> env.getOrDefault("bamboo_buildNumber", ""));
 
     maybePut(properties, GitCommitPropertyConstant.BUILD_NUMBER, () -> buildNumber);
   }