--- a/modules/beetmover_scriptworker/manifests/init.pp
+++ b/modules/beetmover_scriptworker/manifests/init.pp
@@ -43,17 +43,17 @@ class beetmover_scriptworker {
                   "six==1.10.0",
                   "slugid==1.0.7",
                   "taskcluster==0.3.4",
                   "virtualenv==15.0.3",
                   "boto3==1.4.1",
                   "botocore==1.4.63",
                   "jmespath==0.9.0",
                   "Jinja2==2.8",
-                  "beetmoverscript==0.1.4",
+                  "beetmoverscript==0.1.5",
                   "MarkupSafe==0.23",
                   "s3transfer==0.1.8",
                   "docutils==0.12",
                   "yarl==0.7.0",
             ];
     }
 
     scriptworker::instance {

--- a/modules/beetmover_scriptworker/templates/script_config.json.erb
+++ b/modules/beetmover_scriptworker/templates/script_config.json.erb
@@ -1,30 +1,26 @@
 {
     "work_dir": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/work",
     "artifact_dir": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/artifacts",
     "aiohttp_max_connections": 20,
+    "checksums_digests": ["sha512", "md5", "sha1", "sha256"],
 
     "schema_file": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/data/beetmover_task_schema.json",
 
     "verbose": <%= scope.lookupvar("beetmover_scriptworker::settings::verbose_logging") %>,
     "dummy": false,
     "disable_certs": false,
 
     "template_files": {
-        "fennec_nightly_unsigned": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly_en_us_multi_unsigned.yml",
-        "fennec_nightly_signed": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly_en_us_multi_signed.yml",
-        "fennec_nightly_repacks_unsigned": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly_repacks_unsigned.yml",
-        "fennec_nightly_repacks_signed": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly_repacks_signed.yml",
-        "firefox_nightly_unsigned": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly_en_us_unsigned.yml",
-        "fennecx86_nightly_unsigned": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennecx86_nightly_en_us_multi_unsigned.yml",
-        "fennecx86_nightly_signed": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennecx86_nightly_en_us_multi_signed.yml",
-        "firefox_nightly_signed": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly_en_us_signed.yml",
-        "firefox_nightly_repacks_unsigned": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly_repacks_unsigned.yml",
-        "firefox_nightly_repacks_signed": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly_repacks_signed.yml"
+        "firefox_nightly": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly.yml",
+        "firefox_nightly_repacks": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/firefox_nightly_repacks.yml",
+        "fennec_nightly": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly.yml",
+        "fennec_nightly_repacks": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennec_nightly_repacks.yml",
+        "fennecx86_nightly": "<%= scope.lookupvar("beetmover_scriptworker::settings::root") %>/lib/python3.5/site-packages/beetmoverscript/templates/fennecx86_nightly.yml",
     },
 
     "s3": {
         "firefox": {
             "bucket": "<%= @env_config["beetmover_aws_s3_firefox_bucket"] %>",
             "credentials": {
                 "id": "<%= @env_config["beetmover_aws_access_key_id"] %>",
                 "key": "<%= @env_config["beetmover_aws_secret_access_key"] %>"