diff --git a/server/server.go b/server/server.go
index 52157fc..0c92a0c 100644
--- a/server/server.go
+++ b/server/server.go
@@ -5,8 +5,10 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"time"
 
 	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/houston/client"
 	"repositories.action2quare.com/ayo/houston/shared"
 	"repositories.action2quare.com/ayo/houston/shared/protos"
 
@@ -23,6 +25,7 @@ type HoustonServer interface {
 type serverConfig struct {
 	GrpcPort    int    `json:"grpc_port"`
 	StorageRoot string `json:"storage_path"`
+	RunAsClient bool   `json:"run_as_client"`
 }
 
 type DeployRequest struct {
@@ -173,6 +176,18 @@ func (hs *houstonServer) Start() error {
 		return err
 	}
 
+	if loadServerConfig().RunAsClient {
+		go func() {
+			time.Sleep(time.Second)
+			hc, err := client.NewClient()
+			if err != nil {
+				logger.Fatal(err)
+				return
+			}
+			hc.Start()
+		}()
+	}
+
 	if err := hs.rpcServer.Serve(lis); err != nil {
 		return err
 	}