diff --git a/Makefile b/Makefile
index 8ebdab9..bf9e433 100644
--- a/Makefile
+++ b/Makefile
@@ -64,30 +64,30 @@ NPM_UPDATE:=$(shell command -v yarn > /dev/null 2>&1 && echo 'yarn upgrade --cwd
 VERSION_FILES:=$(addsuffix /src/version.js, $(PLUGIN_SRCS))
 OS_PACKAGE_RELEASE?=built_from_source
 
-BOOTSTRAP:=.yarnrc.yml
-
 default: $(VERSION_FILES) $(OUTPUTS)
 
 all: default
 
-.PHONY: default all install clean help install-local install-remote install houston-common
+.PHONY: default all install clean help install-local install-remote install houston-common bootstrap-yarn
 
-$(BOOTSTRAP):
-	./bootstrap.sh
+bootstrap-yarn: .yarnrc.yml
 
-houston-common: houston-common/Makefile $(BOOTSTRAP)
-	$(MAKE) -C houston-common
+.yarnrc.yml:
+	./bootstrap.sh
 
 houston-common/Makefile:
 	git submodule update --init
 
+houston-common: houston-common/Makefile bootstrap-yarn
+	$(MAKE) -C houston-common
+
 $(VERSION_FILES): ./manifest.json
 	mkdir -p $(dir $@)
 	echo 'export const pluginVersion = "$(shell jq -r '.version' ./manifest.json)-$(shell jq -r '.buildVersion' ./manifest.json)$(OS_PACKAGE_RELEASE)";' > $@
 
 # build outputs
 .SECONDEXPANSION:
-$(OUTPUTS): %/dist/index.html: houston-common $$(shell find '$$*' -type d \( -name node_modules -o -path '$$*/dist' -o -path '*node_modules*'  \) -prune -o -type f -not \( -name .gitignore \) -print)
+$(OUTPUTS): %/dist/index.html: bootstrap-yarn houston-common $$(shell find '$$*' -type d \( -name node_modules -o -path '$$*/dist' -o -path '*node_modules*'  \) -prune -o -type f -not \( -name .gitignore \) -print)
 	@echo -e $(call cyantext,Building $*)
 	yarn --cwd $* install
 ifeq ($(AUTO_UPGRADE_DEPS),1)
diff --git a/bootstrap.sh b/bootstrap.sh
index 9b7203c..79e7bcf 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,12 +7,10 @@ set -x
 
 command -v sponge >/dev/null || { echo "Missing 'sponge'. Please install moreutils." >&2 ; exit 1 ; }
 
-git submodule update --init --recursive
-
 jq 'del(.packageManager)' ./package.json | sponge ./package.json
 
 rm .yarnrc.yml .yarn -rf
 
 yarn set version stable
 
-yarn config set nodeLinker node-modules
\ No newline at end of file
+yarn config set nodeLinker node-modules
diff --git a/packaging/focal/rules b/packaging/focal/rules
index 9658eff..e73eae0 100755
--- a/packaging/focal/rules
+++ b/packaging/focal/rules
@@ -14,7 +14,7 @@
 #export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 %:
-	dh $@ --no-parallel
+	dh $@
 
 
 # dh_make generated override targets