diff --git a/cli/prepare.go b/cli/prepare.go
index bbbf94b751..d8cc300ee6 100644
--- a/cli/prepare.go
+++ b/cli/prepare.go
@@ -2,6 +2,7 @@ package cli
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"os"
 
@@ -13,7 +14,6 @@ import (
 	"github.com/kolide/kolide/server/pubsub"
 	"github.com/kolide/kolide/server/service"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 )
 
 func createPrepareCmd(configManager config.Manager) *cobra.Command {
diff --git a/cli/serve.go b/cli/serve.go
index 57022aee2d..3a4981d050 100644
--- a/cli/serve.go
+++ b/cli/serve.go
@@ -1,6 +1,7 @@
 package cli
 
 import (
+	"context"
 	"crypto/tls"
 	"fmt"
 	"net/http"
@@ -25,7 +26,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
 )
 
 type initializer interface {
@@ -223,10 +223,11 @@ the way that the kolide server works.
 				}
 			}()
 			go func() {
-				sig := make(chan os.Signal)
+				sig := make(chan os.Signal, 1)
 				signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
 				<-sig //block on signal
-				ctx, _ := context.WithTimeout(context.Background(), 30*time.Second)
+				ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+				defer cancel()
 				errs <- srv.Shutdown(ctx)
 			}()
 
diff --git a/server/kolide/decorators.go b/server/kolide/decorators.go
index 74041546d0..3d71aeaf78 100644
--- a/server/kolide/decorators.go
+++ b/server/kolide/decorators.go
@@ -1,10 +1,9 @@
 package kolide
 
 import (
+	"context"
 	"errors"
 	"strings"
-
-	"golang.org/x/net/context"
 )
 
 // DecoratorStore methods to manipulate decorator queries.
diff --git a/server/service/logging_decorators.go b/server/service/logging_decorators.go
index 013f687fa5..f091b40ac9 100644
--- a/server/service/logging_decorators.go
+++ b/server/service/logging_decorators.go
@@ -1,10 +1,10 @@
 package service
 
 import (
+	"context"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw loggingMiddleware) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) {
diff --git a/server/service/metrics_decorators.go b/server/service/metrics_decorators.go
index 842ad44f48..b2a96a2d76 100644
--- a/server/service/metrics_decorators.go
+++ b/server/service/metrics_decorators.go
@@ -1,11 +1,11 @@
 package service
 
 import (
+	"context"
 	"fmt"
 	"time"
 
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (mw metricsMiddleware) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) {
diff --git a/server/service/service_decorators.go b/server/service/service_decorators.go
index 62cc045eaa..e865624bb6 100644
--- a/server/service/service_decorators.go
+++ b/server/service/service_decorators.go
@@ -1,8 +1,9 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func (svc service) ListDecorators(ctx context.Context) ([]*kolide.Decorator, error) {
diff --git a/server/service/validation_decorators.go b/server/service/validation_decorators.go
index f77ce8cf59..0d1419725e 100644
--- a/server/service/validation_decorators.go
+++ b/server/service/validation_decorators.go
@@ -1,8 +1,9 @@
 package service
 
 import (
+	"context"
+
 	"github.com/kolide/kolide/server/kolide"
-	"golang.org/x/net/context"
 )
 
 func validateNewDecoratorType(payload kolide.DecoratorPayload, invalid *invalidArgumentError) {
diff --git a/server/service/validation_decorators_test.go b/server/service/validation_decorators_test.go
index 241dcfc283..9d71358b4a 100644
--- a/server/service/validation_decorators_test.go
+++ b/server/service/validation_decorators_test.go
@@ -1,13 +1,13 @@
 package service
 
 import (
+	"context"
 	"testing"
 
 	"github.com/kolide/kolide/server/kolide"
 	"github.com/kolide/kolide/server/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/net/context"
 )
 
 var dtPtr = func(t kolide.DecoratorType) *kolide.DecoratorType { return &t }