diff --git a/Dockerfile.sam b/Dockerfile.messaging
similarity index 89%
rename from Dockerfile.sam
rename to Dockerfile.messaging
index 293551971..20316d2b6 100644
--- a/Dockerfile.sam
+++ b/Dockerfile.messaging
@@ -11,7 +11,7 @@ RUN apk update && apk upgrade && apk add --no-cache git
 RUN mkdir /build; \
     go build \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
-        -o /build/sam cmd/sam/*.go
+        -o /build/messaging cmd/messaging/*.go
 
 ## target image
 FROM alpine:3.7
@@ -24,4 +24,4 @@ COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certifi
 
 EXPOSE 80
 
-ENTRYPOINT /crust/sam
+ENTRYPOINT /crust/messaging
diff --git a/Dockerfile.system b/Dockerfile.system
index 98387388a..3cdefa8c5 100644
--- a/Dockerfile.system
+++ b/Dockerfile.system
@@ -11,7 +11,10 @@ RUN apk update && apk upgrade && apk add --no-cache git
 RUN mkdir /build; \
     go build \
         -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
-        -o /build/system cmd/system/*.go
+        -o /build/system cmd/system/*.go; \
+    go build \
+        -ldflags "-X github.com/crusttech/crust/internal/version.BuildTime="`date +%FT%T%z`" -X github.com/crusttech/crust/internal/version.Version="`git describe --always --tags` \
+        -o /build/cli cmd/system-cli/*.go
 
 ## target image
 FROM alpine:3.7
diff --git a/Makefile b/Makefile
index 756071aa1..8c9a34146 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ GO        = go
 GOGET     = $(GO) get -u
 
 BASEPKGS = rbac system crm sam
-IMAGES   = system crm sam
+IMAGES   = system crm messaging
 
 ########################################################################################################################
 # Tool bins
diff --git a/cmd/sam/dump.go b/cmd/messaging/dump.go
similarity index 100%
rename from cmd/sam/dump.go
rename to cmd/messaging/dump.go
diff --git a/cmd/sam/flags.go b/cmd/messaging/flags.go
similarity index 100%
rename from cmd/sam/flags.go
rename to cmd/messaging/flags.go
diff --git a/cmd/sam/main.go b/cmd/messaging/main.go
similarity index 89%
rename from cmd/sam/main.go
rename to cmd/messaging/main.go
index f61bb1beb..c65b8a1fb 100644
--- a/cmd/sam/main.go
+++ b/cmd/messaging/main.go
@@ -11,7 +11,7 @@ import (
 )
 
 func main() {
-	flags("sam", service.Flags, auth.Flags, rbac.Flags)
+	flags("messaging", service.Flags, auth.Flags, rbac.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)