diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
index 231b232a..1738d424 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/HeartbeatProperties.java
@@ -16,15 +16,16 @@
 
 package org.springframework.cloud.consul.discovery;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 import javax.validation.constraints.DecimalMax;
 import javax.validation.constraints.DecimalMin;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
 
 import org.apache.commons.logging.Log;
-import org.joda.time.Period;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.convert.DurationUnit;
 import org.springframework.core.style.ToStringCreator;
 import org.springframework.validation.annotation.Validated;
 
@@ -44,11 +45,8 @@ public class HeartbeatProperties {
 	// [WARN] agent: Check 'service:testConsulApp:xtest:8080' missed TTL, is now critical
 	boolean enabled = false;
 
-	@Min(1)
-	private int ttlValue = 30;
-
-	@NotNull
-	private String ttlUnit = "s";
+	@DurationUnit(ChronoUnit.SECONDS)
+	private Duration ttl = Duration.ofSeconds(30);
 
 	@DecimalMin("0.1")
 	@DecimalMax("0.9")
@@ -56,22 +54,18 @@ public class HeartbeatProperties {
 
 	// TODO: did heartbeatInterval need to be a field?
 
-	protected Period computeHearbeatInterval() {
+	protected Duration computeHearbeatInterval() {
 		// heartbeat rate at ratio * ttl, but no later than ttl -1s and, (under lesser
 		// priority), no sooner than 1s from now
-		double interval = this.ttlValue * this.intervalRatio;
+		double interval = this.ttl.getSeconds() * this.intervalRatio;
 		double max = Math.max(interval, 1);
-		int ttlMinus1 = this.ttlValue - 1;
+		long ttlMinus1 = this.ttl.getSeconds() - 1;
 		double min = Math.min(ttlMinus1, max);
-		Period heartbeatInterval = new Period(Math.round(1000 * min));
+		Duration heartbeatInterval = Duration.ofMillis(Math.round(1000 * min));
 		log.debug("Computed heartbeatInterval: " + heartbeatInterval);
 		return heartbeatInterval;
 	}
 
-	public String getTtl() {
-		return this.ttlValue + this.ttlUnit;
-	}
-
 	public boolean isEnabled() {
 		return this.enabled;
 	}
@@ -80,20 +74,12 @@ public class HeartbeatProperties {
 		this.enabled = enabled;
 	}
 
-	public @Min(1) int getTtlValue() {
-		return this.ttlValue;
+	public Duration getTtl() {
+		return this.ttl;
 	}
 
-	public void setTtlValue(@Min(1) int ttlValue) {
-		this.ttlValue = ttlValue;
-	}
-
-	public @NotNull String getTtlUnit() {
-		return this.ttlUnit;
-	}
-
-	public void setTtlUnit(@NotNull String ttlUnit) {
-		this.ttlUnit = ttlUnit;
+	public void setTtl(Duration ttl) {
+		this.ttl = ttl;
 	}
 
 	public @DecimalMin("0.1") @DecimalMax("0.9") double getIntervalRatio() {
@@ -108,7 +94,7 @@ public class HeartbeatProperties {
 	@Override
 	public String toString() {
 		return new ToStringCreator(this).append("enabled", this.enabled)
-				.append("ttlValue", this.ttlValue).append("ttlUnit", this.ttlUnit)
+				.append("ttl", this.ttl)
 				.append("intervalRatio", this.intervalRatio).toString();
 	}
 
diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java
index 3f3e51f1..dd3bc39f 100644
--- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java
+++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/TtlScheduler.java
@@ -64,7 +64,7 @@ public class TtlScheduler {
 	public void add(String instanceId) {
 		ScheduledFuture task = this.scheduler.scheduleAtFixedRate(
 				new ConsulHeartbeatTask(instanceId), this.configuration
-						.computeHearbeatInterval().toStandardDuration().getMillis());
+						.computeHearbeatInterval().toMillis());
 		ScheduledFuture previousTask = this.serviceHeartbeats.put(instanceId, task);
 		if (previousTask != null) {
 			previousTask.cancel(true);
diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java
index a8bdb3c4..c90f3e57 100644
--- a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java
+++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/HeartbeatPropertiesTests.java
@@ -16,7 +16,9 @@
 
 package org.springframework.cloud.consul.discovery;
 
-import org.joda.time.Period;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
 import org.junit.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -29,20 +31,20 @@ public class HeartbeatPropertiesTests {
 	@Test
 	public void computeHeartbeatIntervalWorks() {
 		HeartbeatProperties properties = new HeartbeatProperties();
-		Period period = properties.computeHearbeatInterval();
+		Duration period = properties.computeHearbeatInterval();
 
 		assertThat(period).isNotNull();
-		assertThat(period.getSeconds()).isEqualTo(20);
+		assertThat(period.get(ChronoUnit.SECONDS)).isEqualTo(20);
 	}
 
 	@Test
 	public void computeShortHeartbeat() {
 		HeartbeatProperties properties = new HeartbeatProperties();
-		properties.setTtlValue(2);
-		Period period = properties.computeHearbeatInterval();
+		properties.setTtl(Duration.ofSeconds(2));
+		Duration period = properties.computeHearbeatInterval();
 
 		assertThat(period).isNotNull();
-		assertThat(period.getSeconds()).isEqualTo(1);
+		assertThat(period.get(ChronoUnit.SECONDS)).isEqualTo(1);
 	}
 
 }