diff --git a/internal/health.go b/internal/health.go
index 351ae73..c4b971e 100644
--- a/internal/health.go
+++ b/internal/health.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"sync"
+	"time"
 
 	"github.com/gorilla/mux"
 	log "github.com/sirupsen/logrus"
@@ -36,7 +37,16 @@ func (hs *HealthServer) Start() {
 	r := mux.NewRouter()
 	r.Use(mux.CORSMethodMiddleware(r))
 	r.HandleFunc("/health", hs.sendHealth).Methods(http.MethodGet)
-	err := http.ListenAndServe("0.0.0.0:8080", r)
+	
+	server := &http.Server{
+		Addr:         "0.0.0.0:8080",
+		Handler:      r,
+		ReadTimeout:  15 * time.Second,
+		WriteTimeout: 15 * time.Second,
+		IdleTimeout:  60 * time.Second,
+	}
+	
+	err := server.ListenAndServe()
 	if err != nil {
 		log.WithFields(log.Fields{
 			"Caller": "HealthServer.Start",