diff --git a/Dockerfile b/Dockerfile
index bfafae30..80df1c3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,7 +24,6 @@ RUN printf "def get_versions():\n    return {'version': '$THUNORWEB_VERSION'}\n"
 FROM thunorweb_base AS thunorweb_static_build
 
 COPY _state/deploy-test/_state/webpack-bundles $THUNOR_HOME/_state/webpack-bundles
-COPY _state/deploy-test/_state/thunor-static-build $THUNOR_HOME/_state/thunor-static
 RUN DJANGO_DEBUG=False DJANGO_SECRET_KEY= DJANGO_EMAIL_HOST= DJANGO_EMAIL_PORT= DJANGO_EMAIL_USER= \
     DJANGO_EMAIL_PASSWORD= POSTGRES_PASSWORD= python manage.py collectstatic --no-input
 
diff --git a/thunorbld.py b/thunorbld.py
index 80ec527d..021fa2af 100644
--- a/thunorbld.py
+++ b/thunorbld.py
@@ -5,6 +5,8 @@
 
 
 class ThunorBld(ThunorCmdHelper):
+    _DEFAULT_TAGS = 'alubbock/thunorweb:dev'
+
     def __init__(self):
         super(ThunorBld, self).__init__()
         self.cwd = os.path.abspath(os.path.dirname(__file__))
@@ -134,6 +136,9 @@ def _init_test_files(self):
     def init_test(self):
         """ Minimal init for unit testing/CI purposes """
         self._init_test_files()
+        self.args.use_buildx = False
+        self.args.tags = self._DEFAULT_TAGS
+        self.push = False
         self.thunorweb_build()
 
     def run_tests(self):
@@ -250,7 +255,7 @@ def _parser(self):
                             help='Use docker buildx for cross-platform builds')
         parser_build.add_argument('--push', action='store_true', default=False,
                             help='Push to repo after build')
-        parser_build.add_argument('--tags', default='alubbock/thunorweb:dev',
+        parser_build.add_argument('--tags', default=ThunorBld._DEFAULT_TAGS,
                             help='Tags to use when building container (comma separated)')
         parser_build.set_defaults(func=self.thunorweb_build)