diff --git a/internal/pkg/image_repositories/dockerfile.go b/internal/pkg/image_repositories/dockerfile.go
index 33bab71..097a6b0 100644
--- a/internal/pkg/image_repositories/dockerfile.go
+++ b/internal/pkg/image_repositories/dockerfile.go
@@ -17,6 +17,8 @@
 var dockerfileTemplate string
 
 type Dockerfile struct {
+	Project string
+
 	BindepImage     string
 	BindepImageTag  string
 	BuilderImage    string
@@ -44,6 +46,8 @@
 	}
 
 	return &Dockerfile{
+		Project: ir.Project,
+
 		BindepImage:     "quay.io/vexxhost/bindep-loci",
 		BindepImageTag:  "latest",
 		BuilderImage:    "quay.io/vexxhost/openstack-builder-focal",
diff --git a/internal/pkg/image_repositories/template/Dockerfile b/internal/pkg/image_repositories/template/Dockerfile
index 95d0f0f..29257ae 100644
--- a/internal/pkg/image_repositories/template/Dockerfile
+++ b/internal/pkg/image_repositories/template/Dockerfile
@@ -1,4 +1,4 @@
-# syntax=docker/dockerfile:1.4
+# syntax=docker/dockerfile-upstream:master-labs
 
 FROM {{ .BindepImage }}:{{ .BindepImageTag }} AS bindep
 
@@ -8,3 +8,7 @@
 FROM {{ .RuntimeImage }}:{{ .RuntimeImageTag }} AS runtime
 COPY --from=bindep --link /runtime-dist-packages /runtime-dist-packages
 COPY --from=builder --link /var/lib/openstack /var/lib/openstack
+
+{{- if eq .Project "nova" }}
+ADD https://github.com/novnc/novnc.git#v1.3.0 /usr/share/novnc
+{{- end }}
diff --git a/roles/openstack_helm_nova/defaults/main.yml b/roles/openstack_helm_nova/defaults/main.yml
index 5cc4bb7..eaeb06d 100644
--- a/roles/openstack_helm_nova/defaults/main.yml
+++ b/roles/openstack_helm_nova/defaults/main.yml
@@ -14,7 +14,7 @@
 # .. envvar:: openstack_helm_nova_image_repository [[[
 #
 # Image repository location to be prefixed for all images
-openstack_helm_nova_image_repository: "{{ atmosphere_image_repository | default('us-docker.pkg.dev/vexxhost-infra/openstack') }}"
+openstack_helm_nova_image_repository: "{{ atmosphere_image_repository | default('quay.io/vexxhost') }}"
 
                                                                    # ]]]
 # .. envvar:: openstack_helm_nova_image_tag [[[