diff --git a/ilp-rest-service/Dockerfile b/ilp-rest-service/Dockerfile
index 9659fbe..961b60b 100644
--- a/ilp-rest-service/Dockerfile
+++ b/ilp-rest-service/Dockerfile
@@ -2,7 +2,21 @@ FROM maven:3.9.9-amazoncorretto-21-debian AS build
 
 WORKDIR /app
 
-COPY ./build/libs/ilp-coursework-0.0.1-SNAPSHOT.jar app.jar
+COPY gradlew .
+COPY gradle gradle
+COPY build.gradle .
+COPY settings.gradle .
+
+RUN chmod +x gradlew
+
+COPY src src
+RUN ./gradlew build -x test --no-daemon
+
+FROM amazoncorretto:21-alpine
+
+WORKDIR /app
+
+COPY --from=builder /app/build/libs/*.jar app.jar
 
 EXPOSE 8080
 
diff --git a/ilp-rest-service/src/main/java/io/github/js0ny/ilp_coursework/service/PathFinderService.java b/ilp-rest-service/src/main/java/io/github/js0ny/ilp_coursework/service/PathFinderService.java
index 464b21a..ab6ef15 100644
--- a/ilp-rest-service/src/main/java/io/github/js0ny/ilp_coursework/service/PathFinderService.java
+++ b/ilp-rest-service/src/main/java/io/github/js0ny/ilp_coursework/service/PathFinderService.java
@@ -63,7 +63,7 @@ public class PathFinderService {
     private final Map<Integer, LngLat> servicePointLocations;
     private final List<Region> restrictedRegions;
 
-    @Autowired
+    @Autowired(required = false)
     private TelemetryService telemetryService;
 
     /**
@@ -182,7 +182,9 @@ public class PathFinderService {
 
         var resp = new DeliveryPathResponse(totalCost, totalMoves, paths.toArray(new DronePath[0]));
 
-        telemetryService.sendEventAsyncByPathResponse(resp, deliveryTimestamps);
+        if (telemetryService != null) {
+            telemetryService.sendEventAsyncByPathResponse(resp, deliveryTimestamps);
+        }
 
         return resp;
     }