diff --git a/Dockerfile b/Dockerfile
index 9f7073a..b7e4998 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
 
 ARG COMP_RT_RELEASE
 
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/dependencies.d/init-mods
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/run
new file mode 100755
index 0000000..1519123
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/run
@@ -0,0 +1,21 @@
+#!/usr/bin/with-contenv bash
+
+# Determine if setup is needed
+if [ ! -f "/usr/bin/apt" ]; then
+    echo "**** Image is not Ubuntu, skipping opencl-intel install ****"
+    exit 0
+fi
+
+if [ $(uname -m) != "x86_64" ]; then
+    echo "**** Opencl-intel only works on X86_64, skipping ****"
+    exit 0
+fi
+
+if [ -d /opencl-intel ]; then
+    echo "**** Installing/updating opencl-intel debs and adding clinfo to package install list ****"
+    dpkg -i /opencl-intel/*.deb
+    rm -rf /opencl-intel
+    echo "clinfo" >> /mod-repo-packages-to-install.list
+else
+    echo "**** Opencl-intel already installed ****"
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/type
@@ -0,0 +1 @@
+oneshot
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/up
new file mode 100644
index 0000000..8dc3f25
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-jellyfin-opencl-intel-add-package/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-jellyfin-opencl-intel-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-jellyfin-opencl-intel-add-package
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-jellyfin-opencl-intel-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-jellyfin-opencl-intel-add-package
new file mode 100644
index 0000000..e69de29