diff --git a/server/cmd/ptrun-server/main.go b/server/cmd/ptrun-server/main.go
index f3c1186..c323b29 100644
--- a/server/cmd/ptrun-server/main.go
+++ b/server/cmd/ptrun-server/main.go
@@ -8,11 +8,11 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/ptr-geeks/ptrun/server/internal/consts"
+	"github.com/ptr-geeks/ptrun/server/internal/ws"
 	"go.uber.org/zap"
 	"goji.io"
 	"goji.io/pat"
-
-	"github.com/ptr-geeks/ptrun/server/internal/ws"
 )
 
 var (
@@ -46,12 +46,11 @@ func main() {
 	})
 
 	srv := &http.Server{
-		Handler: mux,
-		Addr:    "0.0.0.0:8080",
-		// These should probably be moved under internal/const
-		WriteTimeout: 15 * time.Second,
-		ReadTimeout:  15 * time.Second,
-		IdleTimeout:  15 * time.Second,
+		Handler:      mux,
+		Addr:         "0.0.0.0:8080",
+		WriteTimeout: consts.HttpWriteTimeout,
+		ReadTimeout:  consts.HttpReadTimeout,
+		IdleTimeout:  consts.HttpIdleTimeout,
 	}
 
 	done := make(chan os.Signal, 1)
diff --git a/server/internal/consts/consts.go b/server/internal/consts/consts.go
index a3099ac..baf5fdd 100644
--- a/server/internal/consts/consts.go
+++ b/server/internal/consts/consts.go
@@ -1,5 +1,12 @@
 package consts
 
+import (
+	"time"
+)
+
 const (
-	ChanBufferSize = 200
+	ChanBufferSize   = 200
+	HttpWriteTimeout = 15 * time.Second
+	HttpReadTimeout  = 15 * time.Second
+	HttpIdleTimeout  = 15 * time.Second
 )
diff --git a/server/internal/ws/client.go b/server/internal/ws/client.go
index 8536313..e6a6ce3 100644
--- a/server/internal/ws/client.go
+++ b/server/internal/ws/client.go
@@ -15,7 +15,7 @@ import (
 )
 
 const (
-	writeTimeout = 10 * time.Second
+	WebSocketwriteTimeout = 10 * time.Second
 )
 
 type clientImpl struct {
@@ -111,7 +111,7 @@ func (c *clientImpl) SendPump() {
 
 	for message := range c.send {
 		// So we don't wait for too long before we send
-		c.conn.SetWriteDeadline(time.Now().Add(writeTimeout))
+		c.conn.SetWriteDeadline(time.Now().Add(WebSocketwriteTimeout))
 
 		writer, err := c.conn.NextWriter(websocket.BinaryMessage)
 		if err != nil {