diff --git a/dependencies/tool_metadata.yml b/dependencies/tool_metadata.yml
index f340f8a81..240ac8eef 100644
--- a/dependencies/tool_metadata.yml
+++ b/dependencies/tool_metadata.yml
@@ -44,7 +44,7 @@
     make install
 - name: yosys
   repo: https://github.com/YosysHQ/yosys
-  commit: 14d50a176d59a5eac95a57a01f9e933297251d5b
+  commit: d21c464ae4212abc8a413ecd12c3c1bdc04fb100
   build: |
     make clean
     make PREFIX=$PREFIX config-gcc
diff --git a/docker/utils.py b/docker/utils.py
index a40614832..38e2c611a 100644
--- a/docker/utils.py
+++ b/docker/utils.py
@@ -168,6 +168,7 @@ def get_tag_for(os, arch=None):
 
 
 @click.command()
+@click.option("-R", "--registry", default="docker.io")
 @click.option("-r", "--repository", required=True)
 @click.option(
     "-o",
@@ -177,7 +178,7 @@ def get_tag_for(os, arch=None):
     type=click.Choice(SUPPORTED_OPERATING_SYSTEMS),
 )
 @click.argument("tools", nargs=-1)
-def process_dockerfile_tpl(repository, operating_system, tools):
+def process_dockerfile_tpl(registry, repository, operating_system, tools):
     image_tags = [
         (
             subprocess.check_output(
@@ -197,7 +198,8 @@ def process_dockerfile_tpl(repository, operating_system, tools):
     image_names = [f"{repository}:{tag}" for tag in image_tags]
 
     from_lines = [
-        f"FROM {name}-${{ARCH}} as container{i}" for i, name in enumerate(image_names)
+        f"FROM {registry}/{name}-${{ARCH}} as container{i}"
+        for i, name in enumerate(image_names)
     ]
 
     copy_lines = [