diff --git a/api/controller/services.pb.go b/api/controller/services.pb.go
index c5e7f6b4..75729680 100644
--- a/api/controller/services.pb.go
+++ b/api/controller/services.pb.go
@@ -601,7 +601,7 @@ type ProviderServiceClient interface {
 	Kubectl(ctx context.Context, in *KubectlReq, opts ...grpc.CallOption) (*CmdResponse, error)
 	// Process api
 	ProcessRun(ctx context.Context, in *ProcessRunReq, opts ...grpc.CallOption) (*CmdResponse, error)
-	LogStream(ctx context.Context, in *LogStreamReq, opts ...grpc.CallOption) (*LogStreamResponse, error)
+	LogStream(ctx context.Context, in *LogStreamReq, opts ...grpc.CallOption) (ProviderService_LogStreamClient, error)
 }
 
 type providerServiceClient struct {
@@ -853,13 +853,36 @@ func (c *providerServiceClient) ProcessRun(ctx context.Context, in *ProcessRunRe
 	return out, nil
 }
 
-func (c *providerServiceClient) LogStream(ctx context.Context, in *LogStreamReq, opts ...grpc.CallOption) (*LogStreamResponse, error) {
-	out := new(LogStreamResponse)
-	err := grpc.Invoke(ctx, "/controller.ProviderService/LogStream", in, out, c.cc, opts...)
+func (c *providerServiceClient) LogStream(ctx context.Context, in *LogStreamReq, opts ...grpc.CallOption) (ProviderService_LogStreamClient, error) {
+	stream, err := grpc.NewClientStream(ctx, &_ProviderService_serviceDesc.Streams[1], c.cc, "/controller.ProviderService/LogStream", opts...)
 	if err != nil {
 		return nil, err
 	}
-	return out, nil
+	x := &providerServiceLogStreamClient{stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+type ProviderService_LogStreamClient interface {
+	Recv() (*LogStreamResponse, error)
+	grpc.ClientStream
+}
+
+type providerServiceLogStreamClient struct {
+	grpc.ClientStream
+}
+
+func (x *providerServiceLogStreamClient) Recv() (*LogStreamResponse, error) {
+	m := new(LogStreamResponse)
+	if err := x.ClientStream.RecvMsg(m); err != nil {
+		return nil, err
+	}
+	return m, nil
 }
 
 // Server API for ProviderService service
@@ -895,7 +918,7 @@ type ProviderServiceServer interface {
 	Kubectl(context.Context, *KubectlReq) (*CmdResponse, error)
 	// Process api
 	ProcessRun(context.Context, *ProcessRunReq) (*CmdResponse, error)
-	LogStream(context.Context, *LogStreamReq) (*LogStreamResponse, error)
+	LogStream(*LogStreamReq, ProviderService_LogStreamServer) error
 }
 
 func RegisterProviderServiceServer(s *grpc.Server, srv ProviderServiceServer) {
@@ -1342,22 +1365,25 @@ func _ProviderService_ProcessRun_Handler(srv interface{}, ctx context.Context, d
 	return interceptor(ctx, in, info, handler)
 }
 
-func _ProviderService_LogStream_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(LogStreamReq)
-	if err := dec(in); err != nil {
-		return nil, err
+func _ProviderService_LogStream_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(LogStreamReq)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
 	}
-	if interceptor == nil {
-		return srv.(ProviderServiceServer).LogStream(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: "/controller.ProviderService/LogStream",
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(ProviderServiceServer).LogStream(ctx, req.(*LogStreamReq))
-	}
-	return interceptor(ctx, in, info, handler)
+	return srv.(ProviderServiceServer).LogStream(m, &providerServiceLogStreamServer{stream})
+}
+
+type ProviderService_LogStreamServer interface {
+	Send(*LogStreamResponse) error
+	grpc.ServerStream
+}
+
+type providerServiceLogStreamServer struct {
+	grpc.ServerStream
+}
+
+func (x *providerServiceLogStreamServer) Send(m *LogStreamResponse) error {
+	return x.ServerStream.SendMsg(m)
 }
 
 var _ProviderService_serviceDesc = grpc.ServiceDesc{
@@ -1456,10 +1482,6 @@ var _ProviderService_serviceDesc = grpc.ServiceDesc{
 			MethodName: "ProcessRun",
 			Handler:    _ProviderService_ProcessRun_Handler,
 		},
-		{
-			MethodName: "LogStream",
-			Handler:    _ProviderService_LogStream_Handler,
-		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -1467,6 +1489,11 @@ var _ProviderService_serviceDesc = grpc.ServiceDesc{
 			Handler:       _ProviderService_BuildCreate_Handler,
 			ClientStreams: true,
 		},
+		{
+			StreamName:    "LogStream",
+			Handler:       _ProviderService_LogStream_Handler,
+			ServerStreams: true,
+		},
 	},
 	Metadata: "services.proto",
 }
@@ -1474,92 +1501,92 @@ var _ProviderService_serviceDesc = grpc.ServiceDesc{
 func init() { proto.RegisterFile("services.proto", fileDescriptor0) }
 
 var fileDescriptor0 = []byte{
-	// 1382 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdf, 0x6f, 0x1b, 0xc5,
-	0x13, 0xff, 0xda, 0x71, 0x93, 0x78, 0xec, 0x38, 0xc9, 0x26, 0x75, 0x1c, 0xa7, 0xdf, 0x24, 0x5d,
-	0x84, 0x9a, 0x06, 0xd5, 0x57, 0x8a, 0xc4, 0x8f, 0x20, 0x1e, 0x9c, 0xd4, 0x45, 0x15, 0x11, 0x0d,
-	0x17, 0x2a, 0x21, 0xa0, 0xd0, 0x8b, 0x6f, 0xe3, 0x1c, 0x3e, 0xdf, 0x2e, 0x7b, 0x7b, 0x2e, 0x51,
-	0xd5, 0x17, 0xfe, 0x05, 0xfe, 0x22, 0xde, 0xfa, 0x88, 0x84, 0x78, 0x45, 0xa8, 0xe2, 0x0f, 0x41,
-	0xfb, 0xeb, 0x7c, 0xe7, 0x1f, 0xa1, 0xf4, 0x6d, 0x67, 0x6f, 0xe6, 0x33, 0x9f, 0x9d, 0x99, 0x9d,
-	0x9d, 0x83, 0x5a, 0x4c, 0xf8, 0x30, 0xe8, 0x92, 0xb8, 0xc5, 0x38, 0x15, 0x14, 0x41, 0x97, 0x46,
-	0x82, 0xd3, 0x30, 0x24, 0xbc, 0x79, 0xa3, 0x47, 0x69, 0x2f, 0x24, 0x8e, 0xc7, 0x02, 0xc7, 0x8b,
-	0x22, 0x2a, 0x3c, 0x11, 0xd0, 0xc8, 0x68, 0x36, 0xb7, 0xcc, 0x57, 0x25, 0x9d, 0x25, 0xe7, 0x0e,
-	0x19, 0x30, 0x71, 0x69, 0x3e, 0x6e, 0x8f, 0x7f, 0xf4, 0x13, 0xae, 0xac, 0xcd, 0xf7, 0x3b, 0xbd,
-	0x40, 0x5c, 0x24, 0x67, 0xad, 0x2e, 0x1d, 0x38, 0x3d, 0xda, 0xa3, 0x23, 0x45, 0x29, 0x29, 0x41,
-	0xad, 0x8c, 0xfa, 0xdd, 0x8c, 0xba, 0x1f, 0x44, 0x24, 0xbe, 0x70, 0x7c, 0x4f, 0x78, 0x5d, 0x1a,
-	0x2a, 0x72, 0x03, 0xea, 0x93, 0x30, 0x76, 0xc4, 0x25, 0xb3, 0xe7, 0xc0, 0x1f, 0x43, 0xe5, 0x38,
-	0x88, 0x85, 0x4b, 0x7e, 0x4c, 0x48, 0x2c, 0x50, 0x1d, 0xe6, 0xe9, 0xf9, 0x79, 0x4c, 0x44, 0xa3,
-	0xb0, 0x5b, 0xd8, 0xbb, 0xe6, 0x1a, 0x09, 0xad, 0xc3, 0xb5, 0x30, 0x18, 0x04, 0xa2, 0x51, 0x54,
-	0xdb, 0x5a, 0xc0, 0xbb, 0x00, 0x6d, 0xc6, 0xac, 0x2d, 0x82, 0x52, 0xe4, 0x0d, 0x88, 0xb2, 0x2c,
-	0xbb, 0x6a, 0x8d, 0xcf, 0x61, 0xb9, 0xcd, 0x98, 0xf6, 0x10, 0x33, 0x1a, 0xc5, 0x04, 0xbd, 0x0d,
-	0x25, 0x8f, 0xb1, 0xb8, 0x51, 0xd8, 0x9d, 0xdb, 0xab, 0xdc, 0xab, 0xb4, 0x34, 0xa9, 0x56, 0x9b,
-	0xb1, 0xc3, 0xd2, 0xcb, 0x3f, 0x77, 0xfe, 0xe7, 0xaa, 0xcf, 0xd3, 0x3d, 0x66, 0xf8, 0xcd, 0x65,
-	0xf9, 0xe1, 0xdb, 0x50, 0x69, 0x27, 0xe2, 0xc2, 0x52, 0x69, 0xc2, 0x22, 0xf3, 0xe2, 0xf8, 0x19,
-	0xe5, 0xbe, 0xa1, 0x93, 0xca, 0xf8, 0x04, 0xaa, 0x5a, 0xd5, 0xf0, 0x41, 0x50, 0xba, 0xa0, 0xb1,
-	0xb0, 0xb4, 0xe5, 0x3a, 0x3d, 0x4a, 0x71, 0x74, 0x14, 0xd4, 0x80, 0x05, 0xc6, 0xe9, 0x0f, 0xa4,
-	0xab, 0x7d, 0x97, 0x5d, 0x2b, 0xe2, 0x03, 0x40, 0x47, 0x9c, 0x78, 0x82, 0x1c, 0x26, 0x41, 0xe8,
-	0x5b, 0x0e, 0x2b, 0x30, 0xe7, 0x31, 0x66, 0x60, 0xe5, 0x52, 0xa2, 0xca, 0x6c, 0x28, 0xd4, 0xaa,
-	0xab, 0xd6, 0xf8, 0x2e, 0x54, 0xdb, 0x8c, 0x3d, 0xbc, 0xc2, 0xaa, 0x06, 0xc5, 0xc0, 0x37, 0x4c,
-	0x8a, 0x81, 0x8f, 0x3b, 0xb0, 0xac, 0xfc, 0x1c, 0xd3, 0xde, 0x6b, 0x1b, 0x49, 0x0d, 0x46, 0x63,
-	0x13, 0x34, 0xb9, 0xc4, 0x07, 0xb0, 0x32, 0x82, 0x31, 0xa1, 0x30, 0x5a, 0x85, 0x54, 0x4b, 0x67,
-	0x21, 0x22, 0x71, 0xa3, 0xb8, 0x3b, 0xb7, 0x57, 0x76, 0xb5, 0x80, 0x3f, 0x80, 0xa5, 0x4e, 0x34,
-	0x3c, 0x25, 0xe2, 0x8a, 0xd4, 0xe7, 0x4e, 0x5b, 0x36, 0xa7, 0x7d, 0x00, 0xeb, 0x2e, 0x89, 0x69,
-	0xc2, 0xbb, 0x24, 0x57, 0x13, 0x2d, 0x28, 0x73, 0xb3, 0x6f, 0x0b, 0x63, 0xc5, 0x16, 0x86, 0x35,
-	0x70, 0x47, 0x2a, 0xf8, 0x00, 0x56, 0x35, 0xf9, 0x7c, 0x61, 0xcd, 0x9f, 0xc9, 0x4d, 0x8b, 0xb0,
-	0x64, 0x11, 0x74, 0x5a, 0xcc, 0x47, 0xfc, 0x6b, 0x01, 0xae, 0xeb, 0x74, 0xa5, 0xc8, 0x57, 0x9f,
-	0xa2, 0x1f, 0x44, 0x36, 0x94, 0x6a, 0x8d, 0x3a, 0x30, 0xcf, 0x3c, 0xee, 0x0d, 0x64, 0x3c, 0xa5,
-	0xa3, 0x3b, 0xad, 0x51, 0x33, 0x68, 0x4d, 0x85, 0x6e, 0x9d, 0x28, 0xfd, 0x4e, 0x24, 0xf8, 0xa5,
-	0x6b, 0x8c, 0x9b, 0x1f, 0x41, 0x25, 0xb3, 0x2d, 0x83, 0xdf, 0x27, 0x97, 0x36, 0x89, 0x7d, 0x72,
-	0x29, 0x83, 0x3f, 0xf4, 0xc2, 0xc4, 0x96, 0xa1, 0x16, 0x0e, 0x8a, 0x1f, 0x16, 0xf0, 0xfb, 0x50,
-	0x53, 0x17, 0x2f, 0x75, 0x32, 0xbd, 0xda, 0xc6, 0x6b, 0x58, 0x5e, 0xd8, 0xcf, 0x92, 0x33, 0xd2,
-	0x15, 0xa1, 0xb4, 0x41, 0x50, 0xf2, 0x78, 0x4f, 0x87, 0xab, 0xec, 0xaa, 0x35, 0x0e, 0xa1, 0x72,
-	0x34, 0xf0, 0xd3, 0x98, 0x6e, 0x41, 0x99, 0xfc, 0x14, 0x88, 0xef, 0xbb, 0xd4, 0x27, 0xa6, 0x2e,
-	0x16, 0xe5, 0xc6, 0x11, 0xf5, 0x55, 0xb9, 0x10, 0xce, 0x8d, 0x03, 0xb9, 0x94, 0xd7, 0x33, 0x16,
-	0xfe, 0xa3, 0xc4, 0x5e, 0x11, 0x23, 0x99, 0xfd, 0x0e, 0xe7, 0x8d, 0x52, 0xba, 0xdf, 0xe1, 0x1c,
-	0xf7, 0xa1, 0x7a, 0x4c, 0x7b, 0xa7, 0x82, 0x13, 0x6f, 0x60, 0x18, 0x4d, 0x64, 0xa0, 0x0e, 0xf3,
-	0xe7, 0x34, 0x0c, 0xe9, 0x33, 0xe5, 0x68, 0xd1, 0x35, 0x12, 0x72, 0xe0, 0x5a, 0x1c, 0x44, 0x5d,
-	0xa2, 0x5c, 0x55, 0xee, 0x6d, 0xb6, 0x74, 0x2b, 0x6d, 0xd9, 0x0e, 0xd9, 0xba, 0x6f, 0x5a, 0xa9,
-	0xab, 0xf5, 0xf0, 0x2d, 0x58, 0xcd, 0x38, 0x1b, 0xdd, 0x7e, 0x55, 0xa5, 0x85, 0xcc, 0x9d, 0xfc,
-	0x04, 0x96, 0x4e, 0x38, 0xed, 0x92, 0x38, 0x76, 0x93, 0x68, 0x16, 0xad, 0x06, 0x2c, 0x74, 0xe9,
-	0x60, 0xe0, 0xa9, 0xda, 0x90, 0xf1, 0xb3, 0x22, 0x3e, 0x84, 0x35, 0x97, 0x84, 0xc4, 0x8b, 0xf3,
-	0x35, 0xfe, 0x0e, 0x2c, 0x72, 0xbd, 0x6d, 0x0b, 0x74, 0x79, 0x54, 0xe2, 0x6a, 0xdf, 0x4d, 0x15,
-	0xee, 0xfd, 0xb1, 0x0a, 0xcb, 0x27, 0x9c, 0x0e, 0x03, 0x9f, 0xf0, 0x53, 0xfd, 0xf2, 0xa0, 0xcf,
-	0xa1, 0x24, 0x1b, 0x17, 0xda, 0xc8, 0x96, 0x5b, 0xa6, 0xeb, 0x35, 0x1b, 0x93, 0x1f, 0xb4, 0x6f,
-	0xbc, 0xf6, 0xf3, 0xef, 0x7f, 0xff, 0x52, 0x5c, 0xc2, 0x8b, 0xce, 0xf0, 0x5d, 0xc7, 0x4b, 0xc4,
-	0xc5, 0x41, 0x61, 0x1f, 0x7d, 0x01, 0x0b, 0xa6, 0x37, 0xe7, 0x21, 0x33, 0xef, 0x41, 0x73, 0x2b,
-	0x07, 0x99, 0xef, 0xe4, 0x78, 0x45, 0xa1, 0x02, 0xd2, 0xa8, 0xb2, 0x69, 0x77, 0xa0, 0xdc, 0x66,
-	0x4c, 0x5f, 0x01, 0x54, 0x1f, 0xb3, 0xb5, 0x98, 0xd9, 0x96, 0x3f, 0xc6, 0x8c, 0xb1, 0x58, 0x32,
-	0x7b, 0x00, 0xf3, 0x6d, 0xc6, 0x3e, 0x25, 0xe2, 0xf5, 0x30, 0x36, 0x14, 0xc6, 0x2a, 0x5a, 0xb6,
-	0x18, 0xce, 0x73, 0x99, 0xa2, 0x17, 0xe8, 0x89, 0x79, 0x9f, 0x62, 0xe1, 0xf1, 0xd9, 0x58, 0xf5,
-	0x89, 0xca, 0xe9, 0xc8, 0x17, 0x1a, 0xef, 0x28, 0xd8, 0x4d, 0xb4, 0x31, 0x06, 0xeb, 0x70, 0x03,
-	0xf8, 0xa5, 0x3a, 0xed, 0x7d, 0x12, 0x92, 0x2b, 0x4e, 0x3b, 0x0b, 0xdd, 0x90, 0xde, 0x9f, 0x20,
-	0xed, 0x42, 0x45, 0x35, 0x2c, 0x13, 0xc5, 0xed, 0xc9, 0xe6, 0x92, 0x7d, 0x66, 0x9a, 0xf9, 0x2e,
-	0x87, 0x91, 0x82, 0xad, 0x62, 0x90, 0xb0, 0xba, 0xe3, 0xed, 0x15, 0xd0, 0x7d, 0xa8, 0x1a, 0x23,
-	0x55, 0x5f, 0x28, 0x6f, 0xd4, 0x1c, 0x2f, 0x44, 0xbc, 0xae, 0x50, 0x6a, 0xb8, 0x2a, 0x51, 0x6c,
-	0x51, 0xa2, 0x63, 0x58, 0x54, 0xfa, 0x32, 0x31, 0x8d, 0xb1, 0xe3, 0x3e, 0x9c, 0x45, 0x28, 0x97,
-	0x1c, 0x4d, 0xc8, 0x79, 0x1e, 0xf8, 0x2f, 0xd0, 0x57, 0xe6, 0x9c, 0x26, 0x7e, 0xb3, 0x01, 0x5f,
-	0x2b, 0x82, 0x59, 0xe4, 0x27, 0x50, 0x4e, 0x5f, 0x87, 0x99, 0x79, 0xf9, 0x7f, 0x76, 0x7f, 0xe2,
-	0x31, 0xc1, 0x9b, 0x0a, 0x7c, 0x0d, 0xad, 0x66, 0xc1, 0x75, 0x82, 0x7c, 0x0b, 0x4f, 0x7b, 0x31,
-	0xda, 0x9a, 0x84, 0x49, 0xdf, 0xe5, 0xe6, 0x8d, 0xe9, 0x1f, 0x8d, 0x8b, 0x1b, 0xca, 0x45, 0x1d,
-	0xad, 0x8f, 0xf1, 0x77, 0x42, 0x09, 0x7c, 0x0a, 0xb5, 0x4e, 0x34, 0x0c, 0x38, 0x8d, 0x06, 0x24,
-	0x12, 0x57, 0xdd, 0x85, 0x55, 0x1b, 0xf0, 0x4e, 0x34, 0x3c, 0xa2, 0xd1, 0x79, 0xd0, 0xc3, 0x75,
-	0x05, 0xbd, 0x82, 0x6a, 0x12, 0x9a, 0x44, 0x43, 0x4b, 0xfd, 0x9b, 0x1c, 0xe8, 0x29, 0x11, 0x68,
-	0x33, 0x0b, 0x9a, 0x7b, 0xd4, 0x67, 0xc6, 0xdd, 0x80, 0xe3, 0x71, 0xf0, 0x2e, 0x54, 0x32, 0x7d,
-	0x6f, 0x26, 0xdd, 0x9d, 0xec, 0xfe, 0x94, 0x46, 0x89, 0xb7, 0x14, 0xfe, 0x75, 0xb4, 0x96, 0x2d,
-	0x3e, 0xeb, 0xe4, 0x0c, 0x96, 0x8c, 0xcd, 0x1b, 0xd7, 0x8d, 0xb9, 0xd7, 0xfb, 0x1b, 0x79, 0x7c,
-	0x8f, 0xb1, 0x17, 0xba, 0x7e, 0x9e, 0x42, 0x35, 0x3b, 0xa5, 0xcc, 0xee, 0x8e, 0xbb, 0xf9, 0xa3,
-	0x4c, 0x0e, 0x36, 0xf8, 0xba, 0xf2, 0xb5, 0x8c, 0x96, 0xb4, 0x2f, 0x33, 0xbf, 0xa0, 0xc7, 0x32,
-	0x54, 0x5a, 0xb8, 0x2a, 0xb3, 0x13, 0x33, 0x50, 0xbe, 0x66, 0x52, 0x3c, 0x1b, 0x9c, 0x6f, 0xa1,
-	0x66, 0x35, 0x4d, 0xf7, 0xb8, 0xf9, 0xaf, 0xa3, 0xc9, 0x14, 0x27, 0x86, 0x34, 0x1e, 0x23, 0xfd,
-	0xdd, 0x08, 0xfd, 0x0d, 0x7b, 0x9e, 0x61, 0xbf, 0x3f, 0x9d, 0x3d, 0xc9, 0x86, 0x3d, 0xea, 0xa3,
-	0xe6, 0x04, 0x7a, 0x4a, 0x7c, 0x0a, 0xe9, 0x5b, 0x0a, 0xfb, 0x66, 0x73, 0x67, 0x1a, 0xb6, 0x13,
-	0x06, 0x51, 0x5f, 0xa7, 0x18, 0x05, 0xa3, 0x63, 0x3c, 0x8e, 0xc2, 0xff, 0xee, 0xe8, 0xb6, 0x72,
-	0xf4, 0x56, 0xf3, 0xe6, 0x54, 0x47, 0x49, 0x94, 0x71, 0xf5, 0x08, 0x16, 0xcc, 0xb8, 0x95, 0x0f,
-	0xd5, 0x68, 0x06, 0x6b, 0xe6, 0x6a, 0x2b, 0x33, 0x79, 0xd9, 0x87, 0x11, 0x55, 0xa4, 0x9b, 0xbe,
-	0x41, 0x79, 0x0a, 0x30, 0x9a, 0x4c, 0xf2, 0x77, 0x37, 0x37, 0xb1, 0xcc, 0x86, 0xdd, 0x56, 0xb0,
-	0x0d, 0x54, 0x97, 0xb0, 0x4c, 0xdb, 0xa4, 0xef, 0x5a, 0x12, 0xc9, 0xde, 0x99, 0x0e, 0x49, 0xf9,
-	0xbb, 0x95, 0x1d, 0xd4, 0xf2, 0xdd, 0x73, 0x62, 0xaa, 0xca, 0x37, 0x7d, 0xd9, 0xce, 0x8c, 0x8b,
-	0xc3, 0xc6, 0xcb, 0x57, 0xdb, 0x85, 0xdf, 0x5e, 0x6d, 0x17, 0xfe, 0x7a, 0xb5, 0x5d, 0xf8, 0x3a,
-	0xf3, 0x13, 0x7d, 0x36, 0xaf, 0x6a, 0xe5, 0xbd, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xea, 0xc0,
-	0xea, 0x78, 0x69, 0x0f, 0x00, 0x00,
+	// 1387 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x5d, 0x6f, 0x1b, 0x45,
+	0x17, 0x7e, 0xed, 0xb8, 0x49, 0x7c, 0xec, 0x38, 0xc9, 0x24, 0x75, 0x1c, 0xa7, 0x6f, 0x92, 0xce,
+	0xab, 0x57, 0x4d, 0x83, 0xea, 0x2d, 0x45, 0xe2, 0x23, 0x88, 0x0b, 0x27, 0x75, 0x51, 0x45, 0x44,
+	0xc3, 0x86, 0x4a, 0x08, 0x28, 0xed, 0xc6, 0x3b, 0x71, 0x16, 0xaf, 0x77, 0x86, 0xd9, 0x59, 0x97,
+	0xa8, 0xea, 0x0d, 0x7f, 0x81, 0x5f, 0xc4, 0x5d, 0x2f, 0x91, 0xb8, 0xe0, 0x0e, 0xa1, 0x8a, 0x1f,
+	0x82, 0xe6, 0x6b, 0xbd, 0xeb, 0x8f, 0x50, 0x7a, 0x37, 0x67, 0xf6, 0x9c, 0xe7, 0x3c, 0x73, 0xce,
+	0x99, 0x33, 0x67, 0xa1, 0x16, 0x13, 0x3e, 0x0c, 0xba, 0x24, 0x6e, 0x31, 0x4e, 0x05, 0x45, 0xd0,
+	0xa5, 0x91, 0xe0, 0x34, 0x0c, 0x09, 0x6f, 0xde, 0xe8, 0x51, 0xda, 0x0b, 0x89, 0xe3, 0xb1, 0xc0,
+	0xf1, 0xa2, 0x88, 0x0a, 0x4f, 0x04, 0x34, 0x32, 0x9a, 0xcd, 0x2d, 0xf3, 0x55, 0x49, 0x67, 0xc9,
+	0xb9, 0x43, 0x06, 0x4c, 0x5c, 0x9a, 0x8f, 0xdb, 0xe3, 0x1f, 0xfd, 0x84, 0x2b, 0x6b, 0xf3, 0xfd,
+	0x4e, 0x2f, 0x10, 0x17, 0xc9, 0x59, 0xab, 0x4b, 0x07, 0x4e, 0x8f, 0xf6, 0xe8, 0x48, 0x51, 0x4a,
+	0x4a, 0x50, 0x2b, 0xa3, 0x7e, 0x37, 0xa3, 0xee, 0x07, 0x11, 0x89, 0x2f, 0x1c, 0xdf, 0x13, 0x5e,
+	0x97, 0x86, 0x8a, 0xdc, 0x80, 0xfa, 0x24, 0x8c, 0x1d, 0x71, 0xc9, 0xec, 0x39, 0xf0, 0xc7, 0x50,
+	0x39, 0x0e, 0x62, 0xe1, 0x92, 0x1f, 0x12, 0x12, 0x0b, 0x54, 0x87, 0x79, 0x7a, 0x7e, 0x1e, 0x13,
+	0xd1, 0x28, 0xec, 0x16, 0xf6, 0xae, 0xb9, 0x46, 0x42, 0xeb, 0x70, 0x2d, 0x0c, 0x06, 0x81, 0x68,
+	0x14, 0xd5, 0xb6, 0x16, 0xf0, 0x2e, 0x40, 0x9b, 0x31, 0x6b, 0x8b, 0xa0, 0x14, 0x79, 0x03, 0xa2,
+	0x2c, 0xcb, 0xae, 0x5a, 0xe3, 0x73, 0x58, 0x6e, 0x33, 0xa6, 0x3d, 0xc4, 0x8c, 0x46, 0x31, 0x41,
+	0xff, 0x87, 0x92, 0xc7, 0x58, 0xdc, 0x28, 0xec, 0xce, 0xed, 0x55, 0xee, 0x55, 0x5a, 0x9a, 0x54,
+	0xab, 0xcd, 0xd8, 0x61, 0xe9, 0xd5, 0x1f, 0x3b, 0xff, 0x71, 0xd5, 0xe7, 0xe9, 0x1e, 0x33, 0xfc,
+	0xe6, 0xb2, 0xfc, 0xf0, 0x6d, 0xa8, 0xb4, 0x13, 0x71, 0x61, 0xa9, 0x34, 0x61, 0x91, 0x79, 0x71,
+	0xfc, 0x9c, 0x72, 0xdf, 0xd0, 0x49, 0x65, 0x7c, 0x02, 0x55, 0xad, 0x6a, 0xf8, 0x20, 0x28, 0x5d,
+	0xd0, 0x58, 0x58, 0xda, 0x72, 0x9d, 0x1e, 0xa5, 0x38, 0x3a, 0x0a, 0x6a, 0xc0, 0x02, 0xe3, 0xf4,
+	0x7b, 0xd2, 0xd5, 0xbe, 0xcb, 0xae, 0x15, 0xf1, 0x01, 0xa0, 0x23, 0x4e, 0x3c, 0x41, 0x0e, 0x93,
+	0x20, 0xf4, 0x2d, 0x87, 0x15, 0x98, 0xf3, 0x18, 0x33, 0xb0, 0x72, 0x29, 0x51, 0x65, 0x36, 0x14,
+	0x6a, 0xd5, 0x55, 0x6b, 0x7c, 0x17, 0xaa, 0x6d, 0xc6, 0x1e, 0x5e, 0x61, 0x55, 0x83, 0x62, 0xe0,
+	0x1b, 0x26, 0xc5, 0xc0, 0xc7, 0x1d, 0x58, 0x56, 0x7e, 0x8e, 0x69, 0xef, 0x8d, 0x8d, 0xa4, 0x06,
+	0xa3, 0xb1, 0x09, 0x9a, 0x5c, 0xe2, 0x03, 0x58, 0x19, 0xc1, 0x98, 0x50, 0x18, 0xad, 0x42, 0xaa,
+	0xa5, 0xb3, 0x10, 0x91, 0xb8, 0x51, 0xdc, 0x9d, 0xdb, 0x2b, 0xbb, 0x5a, 0xc0, 0x1f, 0xc0, 0x52,
+	0x27, 0x1a, 0x9e, 0x12, 0x71, 0x45, 0xea, 0x73, 0xa7, 0x2d, 0x9b, 0xd3, 0x3e, 0x80, 0x75, 0x97,
+	0xc4, 0x34, 0xe1, 0x5d, 0x92, 0xab, 0x89, 0x16, 0x94, 0xb9, 0xd9, 0xb7, 0x85, 0xb1, 0x62, 0x0b,
+	0xc3, 0x1a, 0xb8, 0x23, 0x15, 0x7c, 0x00, 0xab, 0x9a, 0x7c, 0xbe, 0xb0, 0xe6, 0xcf, 0xe4, 0xa6,
+	0x45, 0x58, 0xb2, 0x08, 0x3a, 0x2d, 0xe6, 0x23, 0xfe, 0xa5, 0x00, 0xd7, 0x75, 0xba, 0x52, 0xe4,
+	0xab, 0x4f, 0xd1, 0x0f, 0x22, 0x1b, 0x4a, 0xb5, 0x46, 0x1d, 0x98, 0x67, 0x1e, 0xf7, 0x06, 0x32,
+	0x9e, 0xd2, 0xd1, 0x9d, 0xd6, 0xa8, 0x19, 0xb4, 0xa6, 0x42, 0xb7, 0x4e, 0x94, 0x7e, 0x27, 0x12,
+	0xfc, 0xd2, 0x35, 0xc6, 0xcd, 0x8f, 0xa0, 0x92, 0xd9, 0x96, 0xc1, 0xef, 0x93, 0x4b, 0x9b, 0xc4,
+	0x3e, 0xb9, 0x94, 0xc1, 0x1f, 0x7a, 0x61, 0x62, 0xcb, 0x50, 0x0b, 0x07, 0xc5, 0x0f, 0x0b, 0xf8,
+	0x7d, 0xa8, 0xa9, 0x8b, 0x97, 0x3a, 0x99, 0x5e, 0x6d, 0xe3, 0x35, 0x2c, 0x2f, 0xec, 0x67, 0xc9,
+	0x19, 0xe9, 0x8a, 0x50, 0xda, 0x20, 0x28, 0x79, 0xbc, 0xa7, 0xc3, 0x55, 0x76, 0xd5, 0x1a, 0x87,
+	0x50, 0x39, 0x1a, 0xf8, 0x69, 0x4c, 0xb7, 0xa0, 0x4c, 0x7e, 0x0c, 0xc4, 0xd3, 0x2e, 0xf5, 0x89,
+	0xa9, 0x8b, 0x45, 0xb9, 0x71, 0x44, 0x7d, 0x55, 0x2e, 0x84, 0x73, 0xe3, 0x40, 0x2e, 0xe5, 0xf5,
+	0x8c, 0x85, 0xff, 0x28, 0xb1, 0x57, 0xc4, 0x48, 0x66, 0xbf, 0xc3, 0x79, 0xa3, 0x94, 0xee, 0x77,
+	0x38, 0xc7, 0x7d, 0xa8, 0x1e, 0xd3, 0xde, 0xa9, 0xe0, 0xc4, 0x1b, 0x18, 0x46, 0x13, 0x19, 0xa8,
+	0xc3, 0xfc, 0x39, 0x0d, 0x43, 0xfa, 0x5c, 0x39, 0x5a, 0x74, 0x8d, 0x84, 0x1c, 0xb8, 0x16, 0x07,
+	0x51, 0x97, 0x28, 0x57, 0x95, 0x7b, 0x9b, 0x2d, 0xdd, 0x4a, 0x5b, 0xb6, 0x43, 0xb6, 0xee, 0x9b,
+	0x56, 0xea, 0x6a, 0x3d, 0x7c, 0x0b, 0x56, 0x33, 0xce, 0x46, 0xb7, 0x5f, 0x55, 0x69, 0x21, 0x73,
+	0x27, 0x3f, 0x81, 0xa5, 0x13, 0x4e, 0xbb, 0x24, 0x8e, 0xdd, 0x24, 0x9a, 0x45, 0xab, 0x01, 0x0b,
+	0x5d, 0x3a, 0x18, 0x78, 0xaa, 0x36, 0x64, 0xfc, 0xac, 0x88, 0x0f, 0x61, 0xcd, 0x25, 0x21, 0xf1,
+	0xe2, 0x7c, 0x8d, 0xbf, 0x03, 0x8b, 0x5c, 0x6f, 0xdb, 0x02, 0x5d, 0x1e, 0x95, 0xb8, 0xda, 0x77,
+	0x53, 0x85, 0x7b, 0xbf, 0xaf, 0xc2, 0xf2, 0x09, 0xa7, 0xc3, 0xc0, 0x27, 0xfc, 0x54, 0xbf, 0x3c,
+	0xe8, 0x73, 0x28, 0xc9, 0xc6, 0x85, 0x36, 0xb2, 0xe5, 0x96, 0xe9, 0x7a, 0xcd, 0xc6, 0xe4, 0x07,
+	0xed, 0x1b, 0xaf, 0xfd, 0xf4, 0xdb, 0x5f, 0x3f, 0x17, 0x97, 0xf0, 0xa2, 0x33, 0x7c, 0xd7, 0xf1,
+	0x12, 0x71, 0x71, 0x50, 0xd8, 0x47, 0x5f, 0xc0, 0x82, 0xe9, 0xcd, 0x79, 0xc8, 0xcc, 0x7b, 0xd0,
+	0xdc, 0xca, 0x41, 0xe6, 0x3b, 0x39, 0x5e, 0x51, 0xa8, 0x80, 0x34, 0xaa, 0x6c, 0xda, 0x1d, 0x28,
+	0xb7, 0x19, 0xd3, 0x57, 0x00, 0xd5, 0xc7, 0x6c, 0x2d, 0x66, 0xb6, 0xe5, 0x8f, 0x31, 0x63, 0x2c,
+	0x96, 0xcc, 0x1e, 0xc0, 0x7c, 0x9b, 0xb1, 0x4f, 0x89, 0x78, 0x33, 0x8c, 0x0d, 0x85, 0xb1, 0x8a,
+	0x96, 0x2d, 0x86, 0xf3, 0x42, 0xa6, 0xe8, 0x25, 0x7a, 0x62, 0xde, 0xa7, 0x58, 0x78, 0x7c, 0x36,
+	0x56, 0x7d, 0xa2, 0x72, 0x3a, 0xf2, 0x85, 0xc6, 0x3b, 0x0a, 0x76, 0x13, 0x6d, 0x8c, 0xc1, 0x3a,
+	0xdc, 0x00, 0x7e, 0xa9, 0x4e, 0x7b, 0x9f, 0x84, 0xe4, 0x8a, 0xd3, 0xce, 0x42, 0x37, 0xa4, 0xf7,
+	0x27, 0x48, 0xbb, 0x50, 0x51, 0x0d, 0xcb, 0x44, 0x71, 0x7b, 0xb2, 0xb9, 0x64, 0x9f, 0x99, 0x66,
+	0xbe, 0xcb, 0x61, 0xa4, 0x60, 0xab, 0x18, 0x24, 0xac, 0xee, 0x78, 0x7b, 0x05, 0x74, 0x1f, 0xaa,
+	0xc6, 0x48, 0xd5, 0x17, 0xca, 0x1b, 0x35, 0xc7, 0x0b, 0x11, 0xaf, 0x2b, 0x94, 0x1a, 0xae, 0x4a,
+	0x14, 0x5b, 0x94, 0xe8, 0x18, 0x16, 0x95, 0xbe, 0x4c, 0x4c, 0x63, 0xec, 0xb8, 0x0f, 0x67, 0x11,
+	0xca, 0x25, 0x47, 0x13, 0x72, 0x5e, 0x04, 0xfe, 0x4b, 0xf4, 0x95, 0x39, 0xa7, 0x89, 0xdf, 0x6c,
+	0xc0, 0x37, 0x8a, 0x60, 0x16, 0xf9, 0x09, 0x94, 0xd3, 0xd7, 0x61, 0x66, 0x5e, 0xfe, 0x9b, 0xdd,
+	0x9f, 0x78, 0x4c, 0xf0, 0xa6, 0x02, 0x5f, 0x43, 0xab, 0x59, 0x70, 0x9d, 0x20, 0xdf, 0xc2, 0xd3,
+	0x5e, 0x8c, 0xb6, 0x26, 0x61, 0xd2, 0x77, 0xb9, 0x79, 0x63, 0xfa, 0x47, 0xe3, 0xe2, 0x86, 0x72,
+	0x51, 0x47, 0xeb, 0x63, 0xfc, 0x9d, 0x50, 0x02, 0x9f, 0x42, 0xad, 0x13, 0x0d, 0x03, 0x4e, 0xa3,
+	0x01, 0x89, 0xc4, 0x55, 0x77, 0x61, 0xd5, 0x06, 0xbc, 0x13, 0x0d, 0x8f, 0x68, 0x74, 0x1e, 0xf4,
+	0x70, 0x5d, 0x41, 0xaf, 0xa0, 0x9a, 0x84, 0x26, 0xd1, 0xd0, 0x52, 0xff, 0x26, 0x07, 0x7a, 0x4a,
+	0x04, 0xda, 0xcc, 0x82, 0xe6, 0x1e, 0xf5, 0x99, 0x71, 0x37, 0xe0, 0x78, 0x1c, 0xbc, 0x0b, 0x95,
+	0x4c, 0xdf, 0x9b, 0x49, 0x77, 0x27, 0xbb, 0x3f, 0xa5, 0x51, 0xe2, 0x2d, 0x85, 0x7f, 0x1d, 0xad,
+	0x65, 0x8b, 0xcf, 0x3a, 0x39, 0x83, 0x25, 0x63, 0xf3, 0xd6, 0x75, 0x63, 0xee, 0xf5, 0xfe, 0x46,
+	0x1e, 0xdf, 0x63, 0xec, 0xa5, 0xae, 0x9f, 0x67, 0x50, 0xcd, 0x4e, 0x29, 0xb3, 0xbb, 0xe3, 0x6e,
+	0xfe, 0x28, 0x93, 0x83, 0x0d, 0xbe, 0xae, 0x7c, 0x2d, 0xa3, 0x25, 0xed, 0xcb, 0xcc, 0x2f, 0xe8,
+	0xb1, 0x0c, 0x95, 0x16, 0xae, 0xca, 0xec, 0xc4, 0x0c, 0x94, 0xaf, 0x99, 0x14, 0xcf, 0x06, 0xe7,
+	0x5b, 0xa8, 0x59, 0x4d, 0xd3, 0x3d, 0x6e, 0xfe, 0xe3, 0x68, 0x32, 0xc5, 0x89, 0x21, 0x8d, 0xc7,
+	0x48, 0x7f, 0x37, 0x42, 0x7f, 0xcb, 0x9e, 0x67, 0xd8, 0xef, 0x4f, 0x67, 0x4f, 0xb2, 0x61, 0x8f,
+	0xfa, 0xa8, 0x39, 0x81, 0x9e, 0x12, 0x9f, 0x42, 0xfa, 0x96, 0xc2, 0xbe, 0xd9, 0xdc, 0x99, 0x86,
+	0xed, 0x84, 0x41, 0xd4, 0xd7, 0x29, 0x46, 0xc1, 0xe8, 0x18, 0x8f, 0xa3, 0xf0, 0xdf, 0x3b, 0xba,
+	0xad, 0x1c, 0xfd, 0xaf, 0x79, 0x73, 0xaa, 0xa3, 0x24, 0xca, 0xb8, 0x7a, 0x04, 0x0b, 0x66, 0xdc,
+	0xca, 0x87, 0x6a, 0x34, 0x83, 0x35, 0x73, 0xb5, 0x95, 0x99, 0xbc, 0xec, 0xc3, 0x88, 0x2a, 0xd2,
+	0x4d, 0xdf, 0xa0, 0x3c, 0x03, 0x18, 0x4d, 0x26, 0xf9, 0xbb, 0x9b, 0x9b, 0x58, 0x66, 0xc3, 0x6e,
+	0x2b, 0xd8, 0x06, 0xaa, 0x4b, 0x58, 0xa6, 0x6d, 0xd2, 0x77, 0x2d, 0x89, 0xd0, 0x53, 0x28, 0xa7,
+	0x43, 0x52, 0xfe, 0x6e, 0x65, 0x07, 0xb5, 0x7c, 0xf7, 0x9c, 0x98, 0xaa, 0xf2, 0x4d, 0x5f, 0xb6,
+	0x33, 0xe3, 0xe2, 0x6e, 0xe1, 0xb0, 0xf1, 0xea, 0xf5, 0x76, 0xe1, 0xd7, 0xd7, 0xdb, 0x85, 0x3f,
+	0x5f, 0x6f, 0x17, 0xbe, 0xce, 0xfc, 0x46, 0x9f, 0xcd, 0xab, 0x6a, 0x79, 0xef, 0xef, 0x00, 0x00,
+	0x00, 0xff, 0xff, 0x8b, 0x82, 0x28, 0x46, 0x6b, 0x0f, 0x00, 0x00,
 }
diff --git a/api/controller/services.pb.gw.go b/api/controller/services.pb.gw.go
index c27ab549..26426245 100644
--- a/api/controller/services.pb.gw.go
+++ b/api/controller/services.pb.gw.go
@@ -689,7 +689,7 @@ var (
 	filter_ProviderService_LogStream_0 = &utilities.DoubleArray{Encoding: map[string]int{"name": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}}
 )
 
-func request_ProviderService_LogStream_0(ctx context.Context, marshaler runtime.Marshaler, client ProviderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
+func request_ProviderService_LogStream_0(ctx context.Context, marshaler runtime.Marshaler, client ProviderServiceClient, req *http.Request, pathParams map[string]string) (ProviderService_LogStreamClient, runtime.ServerMetadata, error) {
 	var protoReq LogStreamReq
 	var metadata runtime.ServerMetadata
 
@@ -715,8 +715,16 @@ func request_ProviderService_LogStream_0(ctx context.Context, marshaler runtime.
 		return nil, metadata, grpc.Errorf(codes.InvalidArgument, "%v", err)
 	}
 
-	msg, err := client.LogStream(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
-	return msg, metadata, err
+	stream, err := client.LogStream(ctx, &protoReq)
+	if err != nil {
+		return nil, metadata, err
+	}
+	header, err := stream.Header()
+	if err != nil {
+		return nil, metadata, err
+	}
+	metadata.HeaderMD = header
+	return stream, metadata, nil
 
 }
 
@@ -1446,7 +1454,7 @@ func RegisterProviderServiceHandler(ctx context.Context, mux *runtime.ServeMux,
 			return
 		}
 
-		forward_ProviderService_LogStream_0(ctx, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...)
+		forward_ProviderService_LogStream_0(ctx, outboundMarshaler, w, req, func() (proto.Message, error) { return resp.Recv() }, mux.GetForwardResponseOptions()...)
 
 	})
 
@@ -1554,5 +1562,5 @@ var (
 
 	forward_ProviderService_ProcessRun_0 = runtime.ForwardResponseMessage
 
-	forward_ProviderService_LogStream_0 = runtime.ForwardResponseMessage
+	forward_ProviderService_LogStream_0 = runtime.ForwardResponseStream
 )
diff --git a/api/controller/services.proto b/api/controller/services.proto
index c50a84fb..6f7bea0a 100644
--- a/api/controller/services.proto
+++ b/api/controller/services.proto
@@ -265,7 +265,7 @@ service ProviderService {
     };
   }
 
-  rpc LogStream(LogStreamReq) returns (LogStreamResponse) {
+  rpc LogStream(LogStreamReq) returns (stream LogStreamResponse) {
     option (google.api.http) = {
       get: "/v1/logs/{name}"
     };
diff --git a/api/controller/services.swagger.json b/api/controller/services.swagger.json
index e5e05ebf..5876502d 100644
--- a/api/controller/services.swagger.json
+++ b/api/controller/services.swagger.json
@@ -340,7 +340,7 @@
         "operationId": "LogStream",
         "responses": {
           "200": {
-            "description": "",
+            "description": "(streaming responses)",
             "schema": {
               "$ref": "#/definitions/controllerLogStreamResponse"
             }
diff --git a/api/server.go b/api/server.go
index 25034953..0ba84d13 100644
--- a/api/server.go
+++ b/api/server.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"bytes"
 	"cloud.google.com/go/compute/metadata"
 	"fmt"
 	pbs "github.com/dinesh/datacol/api/controller"
@@ -298,21 +297,35 @@ func (s *Server) ResourceUnlink(ctx context.Context, req *pbs.AppResourceReq) (*
 	return ret, nil
 }
 
-func (s *Server) LogStream(ctx context.Context, req *pbs.LogStreamReq) (*pbs.LogStreamResponse, error) {
-	buf := new(bytes.Buffer)
+func (s *Server) LogStream(req *pbs.LogStreamReq, stream pbs.ProviderService_LogStreamServer) error {
 	since, err := ptypes.Duration(req.Since)
 	if err != nil {
-		return nil, err
+		return err
 	}
 
-	if err := s.Provider.LogStream(req.Name, buf, pb.LogStreamOptions{
+	reader, close, err := s.Provider.LogStream(req.Name, pb.LogStreamOptions{
 		Follow: req.Follow,
 		Since:  since,
-	}); err != nil {
-		return nil, err
+	})
+
+	if err != nil {
+		return err
 	}
+	defer close()
+
+	for {
+		line, err := reader.ReadBytes('\n')
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
 
-	return &pbs.LogStreamResponse{Data: buf.Bytes()}, nil
+		if err := stream.Send(&pbs.LogStreamResponse{Data: line}); err != nil {
+			return err
+		}
+	}
 }
 
 func (s *Server) unaryInterceptor(
diff --git a/client/apps.go b/client/apps.go
index 04d49848..9ebed8a0 100644
--- a/client/apps.go
+++ b/client/apps.go
@@ -1,7 +1,6 @@
 package client
 
 import (
-	"bytes"
 	pbs "github.com/dinesh/datacol/api/controller"
 	pb "github.com/dinesh/datacol/api/models"
 	"github.com/golang/protobuf/ptypes"
@@ -36,7 +35,7 @@ func (c *Client) RestartApp(name string) error {
 }
 
 func (c *Client) StreamAppLogs(name string, follow bool, since time.Duration, out io.Writer) error {
-	ret, err := c.ProviderServiceClient.LogStream(ctx, &pbs.LogStreamReq{
+	stream, err := c.ProviderServiceClient.LogStream(ctx, &pbs.LogStreamReq{
 		Name:   name,
 		Since:  ptypes.DurationProto(since),
 		Follow: follow,
@@ -45,11 +44,20 @@ func (c *Client) StreamAppLogs(name string, follow bool, since time.Duration, ou
 		return err
 	}
 
-	if _, err = io.Copy(out, bytes.NewBuffer(ret.Data)); err != nil {
-		return err
-	}
+	defer stream.CloseSend()
 
-	return nil
+	for {
+		ret, err := stream.Recv()
+		if err != nil {
+			if err == io.EOF {
+				return nil
+			}
+			return err
+		}
+		if _, err := out.Write(ret.Data); err != nil {
+			return err
+		}
+	}
 }
 
 func (c *Client) RunProcess(name string, args []string) (*pbs.CmdResponse, error) {
diff --git a/cloud/google/provider.go b/cloud/google/provider.go
index 4a8dfdc3..242d0968 100644
--- a/cloud/google/provider.go
+++ b/cloud/google/provider.go
@@ -1,6 +1,7 @@
 package google
 
 import (
+	"bufio"
 	"cloud.google.com/go/datastore"
 	"context"
 	"fmt"
@@ -98,16 +99,16 @@ func runningPods(ns, app string, c *kubernetes.Clientset) (string, error) {
 	return podNames[0], nil
 }
 
-func (g *GCPCloud) LogStream(app string, out io.Writer, opts pb.LogStreamOptions) error {
+func (g *GCPCloud) LogStream(app string, opts pb.LogStreamOptions) (*bufio.Reader, func() error, error) {
 	ns := g.DeploymentName
 	c, err := getKubeClientset(ns)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	pod, err := runningPods(ns, app, c)
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
 	log.Debugf("Getting logs from pod %s", pod)
@@ -127,12 +128,10 @@ func (g *GCPCloud) LogStream(app string, out io.Writer, opts pb.LogStreamOptions
 
 	rc, err := req.Stream()
 	if err != nil {
-		return err
+		return nil, nil, err
 	}
 
-	defer rc.Close()
-	_, err = io.Copy(out, rc)
-	return err
+	return bufio.NewReader(rc), rc.Close, nil
 }
 
 func (g *GCPCloud) storage() *storage.Service {
diff --git a/cloud/provider.go b/cloud/provider.go
index a988de20..f2012de2 100644
--- a/cloud/provider.go
+++ b/cloud/provider.go
@@ -1,6 +1,7 @@
 package cloud
 
 import (
+	"bufio"
 	pb "github.com/dinesh/datacol/api/models"
 	"io"
 )
@@ -25,7 +26,7 @@ type Provider interface {
 	ReleaseList(string, int) (pb.Releases, error)
 	ReleaseDelete(string, string) error
 
-	LogStream(app string, w io.Writer, opts pb.LogStreamOptions) error
+	LogStream(app string, opts pb.LogStreamOptions) (*bufio.Reader, func() error, error)
 
 	ResourceList() (pb.Resources, error)
 	ResourceCreate(name, kind string, params map[string]string) (*pb.Resource, error)
diff --git a/cmd/logs.go b/cmd/logs.go
index c3d1b9a9..0849a120 100644
--- a/cmd/logs.go
+++ b/cmd/logs.go
@@ -14,7 +14,8 @@ func init() {
 		Action: cmdAppLogStream,
 		Flags: []cli.Flag{
 			&cli.BoolFlag{
-				Name:  "follow, f",
+				Name:  "follow",
+				Aliases: []string{"f"},
 				Usage: "keep streaming new log output (default)",
 			},
 			&cli.DurationFlag{