diff --git a/Dockerfile b/Dockerfile
index 90f61e26e..115cc6191 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ RUN git clone --depth 1 https://github.com/01org/intel-cmt-cat.git
 RUN cd intel-cmt-cat/lib; make install
 RUN cd rdt-discovery; make
 RUN go get github.com/Masterminds/glide
-RUN glide install
+RUN glide install --strip-vendor
 RUN go install \
   -ldflags "-s -w -X main.version=$NFD_VERSION" \
   github.com/kubernetes-incubator/node-feature-discovery
diff --git a/glide.yaml b/glide.yaml
index 187deef48..3a0649597 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -9,11 +9,7 @@ import:
   subpackages:
   - mock
 - package: k8s.io/client-go
-  version: ^2.0.0-alpha.0
-  subpackages:
-  - 1.4/kubernetes
-  - 1.4/pkg/api
-  - 1.4/rest
+  version: v5.0.1
 testImport:
 - package: github.com/smartystreets/goconvey
   version: ^1.6.2
diff --git a/node-feature-discovery-job.json.template b/node-feature-discovery-job.json.template
index bae561eea..8d693dfc2 100644
--- a/node-feature-discovery-job.json.template
+++ b/node-feature-discovery-job.json.template
@@ -1,5 +1,5 @@
 {
-  "apiVersion": "extensions/v1beta1",
+  "apiVersion": "batch/v1",
   "kind": "Job",
   "metadata": {
     "labels": {