diff --git a/README.md b/README.md
index f4677f4..4743fb6 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# PHP8 - Docker mod for code-server
+# PHP8 - Docker mod for code-server/openvscode-server
 
-This mod adds php8.0 and composer to code-server, to be installed/updated during container start.
+This mod adds php8.0 and composer to code-server/openvscode-server, to be installed/updated during container start.
 
-In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-php8`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-php8`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-php8|linuxserver/mods:code-server-mod2`
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-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-code-server-php8-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run
new file mode 100755
index 0000000..a9b0390
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run
@@ -0,0 +1,22 @@
+#!/usr/bin/with-contenv bash
+
+source /etc/lsb-release
+if [ "${DISTRIB_CODENAME}" = "bionic" ] || [ "${DISTRIB_CODENAME}" = "focal" ]; then
+    if ! dpkg -l | grep gnupg > /dev/null; then
+        apt-get update && apt-get install -y --no-install-recommends gnupg
+    fi
+    if [ ! -f "/etc/apt/sources.list.d/php8source.list" ]; then
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 14aa40ec0831756756d7f66c4f4ea0aae5267a6c
+        echo "deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu ${DISTRIB_CODENAME} main" \
+            > /etc/apt/sources.list.d/php8source.list
+        echo "**** Adding php8.1 and composer to package install list ****"
+        echo "\
+            php8.1 \
+            composer" >> /mod-repo-packages-to-install.list
+    fi
+elif ! dpkg -l | grep php > /dev/null || ! dpkg -l | grep composer > /dev/null; then
+    echo "**** Adding php and composer to package install list ****"
+    echo "\
+        php \
+        composer" >> /mod-repo-packages-to-install.list
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-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-code-server-php8-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/up
new file mode 100644
index 0000000..ac00903
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-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-code-server-php8-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-php8-add-package
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-php8-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-php8-add-package
new file mode 100644
index 0000000..e69de29