diff --git a/pom.xml b/pom.xml
index 9ee4d1dbe..03ba40728 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,11 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>guru.springframework</groupId>
+            <artifactId>chuck-norris-for-actuator</artifactId>
+            <version>2.4.0</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
diff --git a/src/main/java/guru/springframework/spring5jokesappv2/services/JokeService.java b/src/main/java/guru/springframework/spring5jokesappv2/services/JokeService.java
new file mode 100644
index 000000000..58cac1de6
--- /dev/null
+++ b/src/main/java/guru/springframework/spring5jokesappv2/services/JokeService.java
@@ -0,0 +1,5 @@
+package guru.springframework.spring5jokesappv2.services;
+
+public interface JokeService {
+    String getJoke();
+}
diff --git a/src/main/java/guru/springframework/spring5jokesappv2/services/JokeServiceImpl.java b/src/main/java/guru/springframework/spring5jokesappv2/services/JokeServiceImpl.java
new file mode 100644
index 000000000..4ab965b05
--- /dev/null
+++ b/src/main/java/guru/springframework/spring5jokesappv2/services/JokeServiceImpl.java
@@ -0,0 +1,19 @@
+package guru.springframework.spring5jokesappv2.services;
+
+import guru.springframework.norris.chuck.ChuckNorrisQuotes;
+import org.springframework.stereotype.Service;
+
+@Service
+public class JokeServiceImpl implements JokeService {
+
+    private final ChuckNorrisQuotes chuckNorrisQuotes;
+
+    public JokeServiceImpl() {
+        this.chuckNorrisQuotes = new ChuckNorrisQuotes();
+    }
+
+    @Override
+    public String getJoke() {
+        return chuckNorrisQuotes.getRandomQuote();
+    }
+}