diff --git a/setup/setup.py b/setup/setup.py
index c424318..9da65b5 100644
--- a/setup/setup.py
+++ b/setup/setup.py
@@ -54,6 +54,7 @@
     host_base_runner = host_setup_runner.HostBasePkgInstaller()
     host_avd_runner = host_setup_runner.AvdPkgInstaller()
     host_cf_common_runner = host_setup_runner.CuttlefishCommonPkgInstaller()
+    host_mkcert_runner = host_setup_runner.MkcertPkgInstaller()
     host_env_runner = host_setup_runner.CuttlefishHostSetup()
     gcp_runner = gcp_setup_runner.GcpTaskRunner(args.config_file)
     task_queue = []
@@ -62,6 +63,7 @@
         task_queue.append(host_base_runner)
         task_queue.append(host_avd_runner)
         task_queue.append(host_cf_common_runner)
+        task_queue.append(host_mkcert_runner)
         task_queue.append(host_env_runner)
     # We should do these setup tasks if specified or if no args were used.
     if args.host_base or (not args.host and not args.gcp_init):