diff --git a/Dockerfile.template b/Dockerfile.template
index 6071d2f..79a972d 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:stretch-run
+FROM balenalib/%%BALENA_MACHINE_NAME%%-debian:bullseye-run
 
 # Install XORG
-RUN install_packages xserver-xorg=1:7.7+19 \
+RUN install_packages xserver-xorg \
   xserver-xorg-input-evdev \
   xinit \
   xfce4 \
@@ -27,4 +27,4 @@ ENV UDEV=1
 # Avoid requesting XFCE4 question on X start
 ENV XFCE_PANEL_MIGRATE_DEFAULT=1
 
-CMD ["bash", "start_x86.sh"]
\ No newline at end of file
+CMD ["bash", "start_x86.sh"]
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..e69de29
diff --git a/repo.yml b/repo.yml
new file mode 100644
index 0000000..a8eaac2
--- /dev/null
+++ b/repo.yml
@@ -0,0 +1 @@
+type: 'generic'