diff --git a/build.assets/Dockerfile b/build.assets/Dockerfile
index 8e0433e48c571..478876b5510cd 100644
--- a/build.assets/Dockerfile
+++ b/build.assets/Dockerfile
@@ -50,7 +50,7 @@ RUN (curl -L https://github.com/coreos/etcd/releases/download/v3.0.16/etcd-v3.0.
      apt-get install -y net-tools tree)
 
 # Install Golang:
-RUN mkdir -p /opt && cd /opt && curl https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz | tar xz;\
+RUN mkdir -p /opt && cd /opt && curl https://storage.googleapis.com/golang/go1.9.2.linux-amd64.tar.gz | tar xz;\
     mkdir -p /gopath/src/github.com/gravitational/teleport;\
     chmod a+w /gopath;\
     chmod a+w /var/lib;\
diff --git a/lib/srv/regular/sshserver.go b/lib/srv/regular/sshserver.go
index ab2f495de697b..0204addd24a57 100644
--- a/lib/srv/regular/sshserver.go
+++ b/lib/srv/regular/sshserver.go
@@ -147,7 +147,7 @@ func (s *Server) Close() error {
 
 // Start starts server
 func (s *Server) Start() error {
-	if len(s.cmdLabels) > 0 {
+	if len(s.getCommandLabels()) > 0 {
 		s.updateLabels()
 	}
 	go s.heartbeatPresence()
@@ -447,7 +447,7 @@ func (s *Server) heartbeatPresence() {
 }
 
 func (s *Server) updateLabels() {
-	for name, label := range s.cmdLabels {
+	for name, label := range s.getCommandLabels() {
 		go s.periodicUpdateLabel(name, label.Clone())
 	}
 }