diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 23a04d0..cfa5c14 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -11,6 +11,18 @@ steps:
           image: koalaman/shellcheck-alpine
           default-secret-name: buildkite-k8s-plugin
           use-agent-node-affinity: true
+  - name: shellcheck self-test
+    agents:
+      queue: monorepo-ci
+      os: linux
+    command:
+      - echo "Running shellcheck"
+      - shellcheck hooks/*
+    plugins:
+      - EmbarkStudios/k8s#${BUILDKITE_COMMIT}:
+          image: koalaman/shellcheck-alpine
+          default-secret-name: buildkite-k8s-plugin
+          use-agent-node-affinity: true
   - wait
   - name: Build and publish k8s-buildkite-agent container image
     branches: 'master'
diff --git a/lib/job.jsonnet b/lib/job.jsonnet
index c45216b..7235a41 100644
--- a/lib/job.jsonnet
+++ b/lib/job.jsonnet
@@ -90,7 +90,7 @@ function(jobName, agentEnv={}, stepEnvFile='', patchFunc=identity) patchFunc({
       if std.startsWith(f, 'BUILDKITE_PLUGIN_K8S_ENVIRONMENT_')
          && !std.startsWith(f, 'BUILDKITE_PLUGIN_K8S_ENVIRONMENT_FROM_SECRET')
     ] + [
-      {'BUILDKITE_PLUGIN_K8S_IS_JOB': 'true'},
+      {name: 'BUILDKITE_PLUGIN_K8S_IS_JOB', value: 'true'},
     ],
 
   local secretEnv =