diff --git a/README.md b/README.md
index 89f1d85..dcb8d61 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# AWSCLI - Docker mod for code-server
+# AWSCLI - Docker mod for code-server/openvscode-server
 
-This mod adds AWSCLI to code-server, to be installed/updated during container start.
+This mod adds AWSCLI 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-awscli`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-awscli`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-awscli|linuxserver/mods:code-server-mod2`
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-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-awscli-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/run
new file mode 100755
index 0000000..6e0136e
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/run
@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+echo "*** AWSCLI Installer ***"
+echo "Checking if awscli is installed"
+
+if ! aws -v COMMAND &> /dev/null; then 
+    echo "**** awscli not installed, adding to packages to be installed ****" 
+    echo "awscli" >> /mod-pip-packages-to-install.list
+    if ! pip3 -v COMMAND &> /dev/null; then
+        echo "*** Pip not installed, adding to packages to be installed ****" 
+        echo "python3 python3-pip" >> /mod-repo-packages-to-install.list
+    fi
+else
+    echo "awscli already installed, skipping!"
+fi
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-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-awscli-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/up
new file mode 100644
index 0000000..d5a07a4
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-add-package/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-awscli-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-awscli-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-awscli-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-awscli-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-awscli-add-package
new file mode 100644
index 0000000..e69de29