diff --git a/Jenkinsfile b/Jenkinsfile
index b0922ce..2edce06 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
 library(
-        identifier: 'jenkins-lib-common@v2.8.8',
+        identifier: 'jenkins-lib-common@breaking-change/maven-stage',
         retriever: modernSCM([
                 $class: 'GitSCMSource',
                 credentialsId: 'jenkins-integration-with-github-account',
@@ -41,11 +41,7 @@ pipeline {
         stage('Maven') {
             steps {
                 script {
-                    mavenStage(
-                        profile: '',
-                        deployArtifacts: env.TAG_NAME ? true : false,
-                        extraDeployArgs: '-Dchangelist='
-                    )
+                    mavenStage()
                 }
             }
         }
diff --git a/pom.xml b/pom.xml
index aa1f4d8..f2331ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,12 @@
 
   <groupId>org.openzal</groupId>
   <artifactId>zal</artifactId>
-  <version>${revision}${changelist}</version>
+  <version>${revision}${sha1}${changelist}</version>
   <packaging>jar</packaging>
 
   <properties>
     <revision>4.33.0</revision>
+    <sha1></sha1>
     <changelist>-SNAPSHOT</changelist>
     <carbonio.version>4.29.0</carbonio.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -777,4 +778,29 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>release</id>
+      <activation>
+        <property>
+          <name>env.TAG_NAME</name>
+        </property>
+      </activation>
+      <properties>
+        <changelist></changelist>
+      </properties>
+    </profile>
+    <profile>
+      <id>snapshot</id>
+      <activation>
+        <property>
+          <name>!env.TAG_NAME</name>
+        </property>
+      </activation>
+      <properties>
+        <sha1>.${env.GIT_COMMIT}</sha1>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>
diff --git a/src/main/java/org/openzal/zal/MailboxManagerImp.java b/src/main/java/org/openzal/zal/MailboxManagerImp.java
index b05f9d2..7170591 100644
--- a/src/main/java/org/openzal/zal/MailboxManagerImp.java
+++ b/src/main/java/org/openzal/zal/MailboxManagerImp.java
@@ -21,6 +21,7 @@
 package org.openzal.zal;
 
 
+import com.zimbra.common.localconfig.LC;
 import com.zimbra.common.service.ServiceException;
 import com.zimbra.cs.db.DbMailbox;
 import com.zimbra.cs.db.DbPool;
@@ -119,7 +120,7 @@ public Set<Integer> getMailboxGroupSet()
 
     for( int n=0; n < ids.length; ++n )
     {
-      set.add( (ids[n]-1) % 100 + 1 );
+      set.add( (ids[n]-1) % LC.zimbra_mailbox_groups.intValue() + 1 );
     }
 
     return set;
diff --git a/src/test/java/org/openzal/zal/db/HSQLZimbraDatabase.java b/src/test/java/org/openzal/zal/db/HSQLZimbraDatabase.java
index 8f0a33c..4c6dde5 100644
--- a/src/test/java/org/openzal/zal/db/HSQLZimbraDatabase.java
+++ b/src/test/java/org/openzal/zal/db/HSQLZimbraDatabase.java
@@ -4,6 +4,7 @@
  * Zimbra Collaboration Suite Server
  */
 
+import com.zimbra.common.localconfig.LC;
 import com.zimbra.common.service.ServiceException;
 import com.zimbra.cs.db.DbMailbox;
 import com.zimbra.cs.db.DbPool;
@@ -90,7 +91,7 @@ private static void clearDatabase(String clearSqlScript) throws Exception
 
   private static void executeForAllGroups(com.zimbra.cs.db.DbPool.DbConnection conn, String classpathFile) throws Exception
   {
-    for( int i=1; i <= 100; ++i ) executeFromClasspath(conn, classpathFile, i);
+    for( int i=1; i <= LC.zimbra_mailbox_groups.intValue(); ++i ) executeFromClasspath(conn, classpathFile, i);
   }
 
   interface TempFileRunner {