diff --git a/README.md b/README.md
index c80ffc1..fc73311 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# Terraform - Docker mod for code-server
+# Terraform - Docker mod for code-server/openvscode-server
 
-This mod adds the Terraform binary and extension to code-server, to be installed/updated during container start.
+This mod adds the Terraform binary and extension 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-terraform`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-terraform`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-terraform|linuxserver/mods:code-server-zsh`
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-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-terraform-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/run
new file mode 100755
index 0000000..97abf83
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/run
@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+if ! dpkg -l | grep gnupg > /dev/null; then
+    apt-get update && apt-get install -y gnupg
+fi
+
+if [ ! -f "/etc/apt/sources.list.d/hashicorp.list" ]; then
+    echo "**** Adding terraform packages to install list ****"
+    curl -s https://apt.releases.hashicorp.com/gpg | apt-key add -
+    source /etc/lsb-release
+    echo "deb https://apt.releases.hashicorp.com ${DISTRIB_CODENAME} main" > /etc/apt/sources.list.d/hashicorp.list
+    echo "terraform" >> /mod-repo-packages-to-install.list
+else
+    echo "**** Terraform packages already installed, skipping ****"
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-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-terraform-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/up
new file mode 100644
index 0000000..9dd5b71
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-add-package/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/dependencies.d/init-mods-package-install
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run
new file mode 100755
index 0000000..967c349
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+install-extension hashicorp.terraform
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/type
new file mode 100644
index 0000000..3d92b15
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/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-terraform-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/up
new file mode 100644
index 0000000..5749c76
--- /dev/null
+++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-terraform-install/run
\ No newline at end of file
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-code-server-terraform-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-code-server-terraform-install
new file mode 100644
index 0000000..e69de29
diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-terraform-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-terraform-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-terraform-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-terraform-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-terraform-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-terraform-install
new file mode 100644
index 0000000..e69de29