diff --git a/magefile.go b/magefile.go
index 70a481b77..ee9fdce2e 100644
--- a/magefile.go
+++ b/magefile.go
@@ -136,9 +136,9 @@ func Build() error {
 }
 
 // builds docker image for LiveKit server
-func BuildDocker() error {
+func Docker() error {
 	mg.Deps(Proto, generateWire)
-	cmd := exec.Command("docker", "build", ".", "-t", "livekit/livekit:v"+version.Version)
+	cmd := exec.Command("docker", "build", ".", "-t", "livekit/livekit-server:v"+version.Version)
 	connectStd(cmd)
 	if err := cmd.Run(); err != nil {
 		return err
diff --git a/pkg/auth/accesstoken.go b/pkg/auth/accesstoken.go
index 616693dfd..22d99a7ef 100644
--- a/pkg/auth/accesstoken.go
+++ b/pkg/auth/accesstoken.go
@@ -8,7 +8,7 @@ import (
 )
 
 const (
-	defaultValidDuration = 10 * time.Minute
+	defaultValidDuration = 6 * time.Hour
 )
 
 // Signer that produces token signed with API key and secret
diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go
index 23af27b4b..fa92c5959 100644
--- a/pkg/service/rtcservice.go
+++ b/pkg/service/rtcservice.go
@@ -66,6 +66,8 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	// TODO: assign room to a node if for some reasons node isn't available
+
 	// upgrade only once the basics are good to go
 	conn, err := s.upgrader.Upgrade(w, r, nil)
 	if err != nil {