diff --git a/gateway/controllers.go b/gateway/controllers.go
index b0b7a16..418ec3a 100644
--- a/gateway/controllers.go
+++ b/gateway/controllers.go
@@ -1,19 +1,17 @@
 package gateway
 
 import (
-	Config "micrach/config"
-	"net/http"
+	"micrach/config"
 
-	"github.com/gin-gonic/gin"
+	"github.com/gofiber/fiber/v2"
 )
 
-func Ping(c *gin.Context) {
-	headerKey := c.Request.Header.Get("Authorization")
-	if Config.App.Gateway.ApiKey != headerKey {
-		c.AbortWithStatusJSON(http.StatusUnauthorized, gin.H{"error": "Unauthorized"})
-		return
+func Ping(c *fiber.Ctx) error {
+	headerKey := c.GetReqHeaders()["Authorization"]
+	if config.App.Gateway.ApiKey != headerKey {
+		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{"error": "Unauthorized"})
 	}
-	c.JSON(200, gin.H{
+	return c.JSON(fiber.Map{
 		"message": "pong",
 	})
 }
diff --git a/main.go b/main.go
index 53aa985..455963b 100644
--- a/main.go
+++ b/main.go
@@ -17,21 +17,12 @@ import (
 	"micrach/config"
 	"micrach/controllers"
 	"micrach/db"
+	"micrach/gateway"
 	"micrach/repositories"
 	"micrach/templates"
 	"micrach/utils"
 )
 
-// func main() {
-// 	if Config.App.IsRateLimiterEnabled {
-// 		router.Use(middleware)
-// 	}
-// 	if Config.App.Gateway.Url != "" {
-// 		router.GET("/api/ping", Gateway.Ping)
-// 		Gateway.Connect()
-// 	}
-// }
-
 func main() {
 	config.Init()
 	db.Init()
@@ -73,6 +64,11 @@ func main() {
 	app.Post("/:threadID", controllers.UpdateThread)
 	app.Get("/captcha/:captchaID", controllers.GetCaptcha)
 
+	if config.App.Gateway.Url != "" {
+		app.Get("/api/ping", gateway.Ping)
+		gateway.Connect()
+	}
+
 	log.Println("app - online, port -", strconv.Itoa(config.App.Port))
 	log.Println("all systems nominal")
 	err = app.Listen(":" + strconv.Itoa(config.App.Port))