diff --git a/.Makefile.swp b/.Makefile.swp
deleted file mode 100644
index cf6193c46a..0000000000
Binary files a/.Makefile.swp and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 1837db54dc..f24947dc55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 .vscode/
 .vendor-new/
+.swp
 
 vendor/
 node_modules/
diff --git a/cmd/entrypoints/serve.go b/cmd/entrypoints/serve.go
index 6322b1935f..6b03274607 100644
--- a/cmd/entrypoints/serve.go
+++ b/cmd/entrypoints/serve.go
@@ -20,6 +20,8 @@ import (
 	"github.com/lyft/flyteadmin/pkg/server"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/credentials"
+	"google.golang.org/grpc/health"
+	"google.golang.org/grpc/health/grpc_health_v1"
 
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/lyft/flyteadmin/pkg/common"
@@ -90,6 +92,11 @@ func newGRPCServer(ctx context.Context, cfg *config.ServerConfig, authContext in
 	grpcServer := grpc.NewServer(serverOpts...)
 	grpc_prometheus.Register(grpcServer)
 	flyteService.RegisterAdminServiceServer(grpcServer, adminservice.NewAdminServer(cfg.KubeConfig, cfg.Master))
+
+	healthServer := health.NewServer()
+	healthServer.SetServingStatus("", grpc_health_v1.HealthCheckResponse_SERVING)
+	grpc_health_v1.RegisterHealthServer(grpcServer, healthServer)
+
 	if cfg.GrpcServerReflection {
 		reflection.Register(grpcServer)
 	}