diff --git a/RFS/src/main/java/com/rfs/cms/CmsEntry.java b/RFS/src/main/java/com/rfs/cms/CmsEntry.java
index edbca139a..65937b351 100644
--- a/RFS/src/main/java/com/rfs/cms/CmsEntry.java
+++ b/RFS/src/main/java/com/rfs/cms/CmsEntry.java
@@ -1,5 +1,6 @@
 package com.rfs.cms;
 
+import com.rfs.common.RfsException;
 
 public class CmsEntry {
     public static enum SnapshotStatus {
@@ -29,6 +30,21 @@ public static class Metadata {
         public static final int METADATA_LEASE_MS = 1 * 60 * 1000; // 1 minute, arbitrarily chosen
         public static final int MAX_ATTEMPTS = 3; // arbitrarily chosen
 
+        public static int getLeaseDurationMs(int numAttempts) {
+            if (numAttempts > MAX_ATTEMPTS) {
+                throw new CouldNotFindNextLeaseDuration("numAttempts=" + numAttempts + " is greater than MAX_ATTEMPTS=" + MAX_ATTEMPTS);
+            } else if (numAttempts < 1) {
+                throw new CouldNotFindNextLeaseDuration("numAttempts=" + numAttempts + " is less than 1");
+            }
+            return METADATA_LEASE_MS * numAttempts; // Arbitratily chosen algorithm
+        }
+
+        // TODO: We should be ideally setting the lease expiry using the server's clock, but it's unclear on the best
+        // way to do this.  For now, we'll just use the client's clock.
+        public static String getLeaseExpiry(long currentTime, int numAttempts) {
+            return Long.toString(currentTime + getLeaseDurationMs(numAttempts));
+        }
+
         public final MetadataStatus status;
         public final String leaseExpiry;
         public final Integer numAttempts;
@@ -39,4 +55,10 @@ public Metadata(MetadataStatus status, String leaseExpiry, int numAttempts) {
             this.numAttempts = numAttempts;
         }
     }
+
+    public static class CouldNotFindNextLeaseDuration extends RfsException {
+        public CouldNotFindNextLeaseDuration(String message) {
+            super("Could not find next lease duration.  Reason: " + message);
+        }
+    }
 }
diff --git a/RFS/src/main/java/com/rfs/cms/OpenSearchCmsEntry.java b/RFS/src/main/java/com/rfs/cms/OpenSearchCmsEntry.java
index 0fb5a321d..a06525eb9 100644
--- a/RFS/src/main/java/com/rfs/cms/OpenSearchCmsEntry.java
+++ b/RFS/src/main/java/com/rfs/cms/OpenSearchCmsEntry.java
@@ -1,6 +1,6 @@
 package com.rfs.cms;
 
-import java.util.Date;
+import java.time.Instant;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -58,7 +58,7 @@ public static ObjectNode getInitial() {
 
             // TODO: We should be ideally setting the lease using the server's clock, but it's unclear on the best way
             // to do this.  For now, we'll just use the client's clock.
-            metadataDoc.put(FIELD_LEASE_EXPIRY, new Date().getTime() + CmsEntry.Metadata.METADATA_LEASE_MS);
+            metadataDoc.put(FIELD_LEASE_EXPIRY, CmsEntry.Metadata.getLeaseExpiry(Instant.now().toEpochMilli(), 1));
 
             return metadataDoc;
         }
diff --git a/RFS/src/main/java/com/rfs/worker/MetadataStep.java b/RFS/src/main/java/com/rfs/worker/MetadataStep.java
index 3823c643a..9e2bb3212 100644
--- a/RFS/src/main/java/com/rfs/worker/MetadataStep.java
+++ b/RFS/src/main/java/com/rfs/worker/MetadataStep.java
@@ -155,8 +155,8 @@ public AcquireLease(SharedMembers members, CmsEntry.Metadata existingEntry) {
             this.existingEntry = existingEntry;
         }
 
-        protected Instant getNow() {
-            return Instant.now();
+        protected long getNowMs() {
+            return Instant.now().toEpochMilli();
         }
 
         @Override
@@ -166,7 +166,7 @@ public void run() {
             // TODO: Should be using the server-side clock here
             this.acquiredLease = members.cmsClient.updateMetadataEntry(
                 CmsEntry.MetadataStatus.IN_PROGRESS,
-                String.valueOf(getNow().plusMillis(CmsEntry.Metadata.METADATA_LEASE_MS).toEpochMilli()),
+                CmsEntry.Metadata.getLeaseExpiry(getNowMs(), existingEntry.numAttempts + 1),
                 existingEntry.numAttempts + 1
             );
 
diff --git a/RFS/src/test/java/com/rfs/cms/CmsEntryTest.java b/RFS/src/test/java/com/rfs/cms/CmsEntryTest.java
new file mode 100644
index 000000000..c0c853477
--- /dev/null
+++ b/RFS/src/test/java/com/rfs/cms/CmsEntryTest.java
@@ -0,0 +1,48 @@
+package com.rfs.cms;
+
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+public class CmsEntryTest {
+
+    static Stream<Arguments> provide_Metadata_getLeaseExpiry_HappyPath_args() {
+        // Generate an argument for each possible number of attempts
+        Stream<Arguments> argStream = Stream.of();
+        for (int i = 1; i <= CmsEntry.Metadata.MAX_ATTEMPTS; i++) {
+            argStream = Stream.concat(argStream, Stream.of(Arguments.of(i)));
+        }
+        return argStream;
+    }
+
+    @ParameterizedTest
+    @MethodSource("provide_Metadata_getLeaseExpiry_HappyPath_args")
+    void Metadata_getLeaseExpiry_HappyPath(int numAttempts) {
+        // Run the test
+        String result = CmsEntry.Metadata.getLeaseExpiry(0, numAttempts);
+
+        // Check the results
+        assertEquals(Long.toString(CmsEntry.Metadata.METADATA_LEASE_MS * numAttempts), result);
+    }
+
+    static Stream<Arguments> provide_Metadata_getLeaseExpiry_UnhappyPath_args() {
+        return Stream.of(
+            Arguments.of(0),
+            Arguments.of(CmsEntry.Metadata.MAX_ATTEMPTS + 1)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("provide_Metadata_getLeaseExpiry_UnhappyPath_args")
+    void Metadata_getLeaseExpiry_UnhappyPath(int numAttempts) {
+        // Run the test
+        assertThrows(CmsEntry.CouldNotFindNextLeaseDuration.class, () -> {
+            CmsEntry.Metadata.getLeaseExpiry(0, numAttempts);
+        });
+    }    
+}
diff --git a/RFS/src/test/java/com/rfs/worker/MetadataStepTest.java b/RFS/src/test/java/com/rfs/worker/MetadataStepTest.java
index ded0941a2..e341ca97f 100644
--- a/RFS/src/test/java/com/rfs/worker/MetadataStepTest.java
+++ b/RFS/src/test/java/com/rfs/worker/MetadataStepTest.java
@@ -191,8 +191,8 @@ public TestAcquireLease(SharedMembers members, CmsEntry.Metadata existingEntry)
         }
 
         @Override
-        protected Instant getNow() {
-            return Instant.ofEpochMilli(milliSinceEpoch);
+        protected long getNowMs() {
+            return milliSinceEpoch;
         }
     }
 
@@ -212,7 +212,7 @@ void AcquireLease_AsExpected(boolean acquiredLease, Class<?> nextStepClass) {
         // Set up the test
         CmsEntry.Metadata existingEntry = new CmsEntry.Metadata(
             CmsEntry.MetadataStatus.IN_PROGRESS,
-            "0",
+            CmsEntry.Metadata.getLeaseExpiry(0L, CmsEntry.Metadata.MAX_ATTEMPTS - 1),
             CmsEntry.Metadata.MAX_ATTEMPTS - 1
         );
 
@@ -228,7 +228,7 @@ void AcquireLease_AsExpected(boolean acquiredLease, Class<?> nextStepClass) {
         // Check the results
         Mockito.verify(testMembers.cmsClient, times(1)).updateMetadataEntry(
             CmsEntry.MetadataStatus.IN_PROGRESS,
-            String.valueOf(TestAcquireLease.milliSinceEpoch + CmsEntry.Metadata.METADATA_LEASE_MS),
+            CmsEntry.Metadata.getLeaseExpiry(TestAcquireLease.milliSinceEpoch, CmsEntry.Metadata.MAX_ATTEMPTS),
             CmsEntry.Metadata.MAX_ATTEMPTS
         );
         assertEquals(nextStepClass, nextStep.getClass());