diff --git a/.gitlab/build.gitlab-ci.yml b/.gitlab/build.gitlab-ci.yml
index 35d56e0..d34188e 100644
--- a/.gitlab/build.gitlab-ci.yml
+++ b/.gitlab/build.gitlab-ci.yml
@@ -15,7 +15,7 @@ build_release:
       --build-arg GOLANG_VERSION=$GOLANG_VERSION
       --build-arg NODE_VERSION=$NODE_VERSION
       --build-arg ALPINE_VERSION=$ALPINE_VERSION
-      --build-arg VERSION=$CI_COMMIT_TAG
+      --build-arg APP_VERSION=$CI_COMMIT_TAG
       --build-arg BUILD_TIME=$CI_JOB_STARTED_AT
       --tag $CURRENT_IMAGE
       --tag $LATEST_IMAGE
diff --git a/internal/router/router.go b/internal/router/router.go
index 2ca4409..c96579f 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -45,6 +45,10 @@ func SetupRoutes(e *echo.Echo, ctrl *controller.Controller, env *env.Config) {
 	e.Static("/css", "web/css")
 	e.Static("/js", "web/js")
 
+	e.GET("/", func(c echo.Context) error {
+		return c.Render(http.StatusOK, "index.html", nil)
+	})
+
 	api := e.Group("/api")
 	{
 		tableGroup := api.Group("/tables")
@@ -90,6 +94,13 @@ func SetupRoutes(e *echo.Echo, ctrl *controller.Controller, env *env.Config) {
 			})
 		}
 
+		e.GET("/robots.txt", func(ctx echo.Context) error {
+			return ctx.String(http.StatusOK, "User-agent: *\nDisallow: /")
+		})
+		e.RouteNotFound("*", func(ctx echo.Context) error {
+			return ctx.Redirect(http.StatusTemporaryRedirect, "/")
+		})
+
 		if env.SwaggerHost != "" {
 			docs.SwaggerInfo.Title = "Café Plätschwiesle"
 			docs.SwaggerInfo.Description = "This is the backend of Café Plätschwiesle"
@@ -101,12 +112,5 @@ func SetupRoutes(e *echo.Echo, ctrl *controller.Controller, env *env.Config) {
 			api.GET("/swagger/*", echoSwagger.WrapHandler)
 			zap.L().Info("swagger running", zap.String("url", env.SwaggerHost+"/api/swagger/index.html"))
 		}
-
-		e.GET("/robots.txt", func(ctx echo.Context) error {
-			return ctx.String(http.StatusOK, "User-agent: *\nDisallow: /")
-		})
-		e.RouteNotFound("*", func(c echo.Context) error {
-			return c.Render(http.StatusOK, "index.html", nil)
-		})
 	}
 }