diff --git a/taskcluster/ci/packages/kind.yml b/taskcluster/ci/packages/kind.yml
index ee2fbeb685fd..cb1e82e5d5e5 100644
--- a/taskcluster/ci/packages/kind.yml
+++ b/taskcluster/ci/packages/kind.yml
@@ -18,6 +18,9 @@ job-defaults:
   worker:
     max-run-time: 1800
   run-on-projects: []
+  run:
+    dist: wheezy
+    snapshot: 20171210T214726Z
 
 jobs:
   deb7-python:
diff --git a/taskcluster/taskgraph/transforms/job/debian_package.py b/taskcluster/taskgraph/transforms/job/debian_package.py
index 39827570a71f..ce608a456464 100644
--- a/taskcluster/taskgraph/transforms/job/debian_package.py
+++ b/taskcluster/taskgraph/transforms/job/debian_package.py
@@ -31,12 +31,12 @@ source_definition = {
 run_schema = Schema({
     Required('using'): 'debian-package',
     # Debian distribution
-    Optional('dist'): basestring,
+    Required('dist'): basestring,
 
     # Date of the snapshot (from snapshot.debian.org) to use, in the format
     # YYYYMMDDTHHMMSSZ. The same date is used for the base docker-image name
     # (only the YYYYMMDD part).
-    Optional('snapshot'): basestring,
+    Required('snapshot'): basestring,
 
     # URL/SHA256 of a source file to build, which can either be a source
     # control (.dsc), or a tarball.
@@ -53,8 +53,6 @@ run_schema = Schema({
 @run_job_using("docker-worker", "debian-package", schema=run_schema)
 def docker_worker_debian_package(config, job, taskdesc):
     run = job['run']
-    run.setdefault('dist', 'wheezy')
-    run.setdefault('snapshot', '20171210T214726Z')
 
     worker = taskdesc['worker']
     worker['artifacts'] = []