diff --git a/java/main.tf b/java/main.tf
deleted file mode 100644
index ac8e4d8..0000000
--- a/java/main.tf
+++ /dev/null
@@ -1,282 +0,0 @@
-terraform {
-  required_providers {
-    coder = {
-      source = "coder/coder"
-    }
-    docker = {
-      source = "kreuzwerker/docker"
-    }
-  }
-}
-
-locals {
-  username = data.coder_workspace_owner.me.name
-}
-
-variable "docker_socket" {
-  default     = ""
-  description = "(Optional) Docker socket URI"
-  type        = string
-}
-
-provider "docker" {
-  # Defaulting to null if the variable is an empty string lets us have an optional variable without having to set our own default
-  host = var.docker_socket != "" ? var.docker_socket : null
-}
-
-data "coder_provisioner" "me" {}
-data "coder_workspace" "me" {}
-data "coder_workspace_owner" "me" {}
-
-data "coder_parameter" "java_version" {
-  name        = "Java Version"
-  description = "Select the JDK version for your workspace."
-  type        = "string"
-  default     = "21"
-
-  option {
-    name  = "Java 8"
-    value = "8"
-  }
-
-  option {
-    name  = "Java 17"
-    value = "17"
-  }
-
-  option {
-    name  = "Java 21"
-    value = "21"
-  }
-}
-
-data "coder_parameter" "repo_url" {
-  name        = "Repository URL"
-  description = "Git repository to clone when workspace is created (public repo only)"
-  type        = "string"
-  default     = ""
-}
-
-resource "coder_agent" "main" {
-  arch           = data.coder_provisioner.me.arch
-  os             = "linux"
-  startup_script = <<-EOT
-    set -e
-
-    # Prepare user home with default files on first start.
-    if [ ! -f ~/.init_done ]; then
-      cp -rT /etc/skel ~
-      touch ~/.init_done
-    fi
-
-    # Add any commands that should be executed at workspace startup (e.g install requirements, start a program, etc) here
-    # Clone repo if URL is set
-    if [ -n "${data.coder_parameter.repo_url.value}" ]; then
-      if [ -d ~/repo ] && [ "$(ls -A ~/repo)" ]; then
-        echo "⚠️ Skipping clone: ~/repo already exists and is not empty."
-      else
-        echo "==> Cloning repository from: ${data.coder_parameter.repo_url.value}"
-        git clone --verbose "${data.coder_parameter.repo_url.value}" ~/repo \
-          && echo "✅ Clone successful." \
-          || echo "❌ Failed to clone repo. Please check the URL or access permissions."
-      fi
-    fi
-  EOT
-
-  # These environment variables allow you to make Git commits right away after creating a
-  # workspace. Note that they take precedence over configuration defined in ~/.gitconfig!
-  # You can remove this block if you'd prefer to configure Git manually or using
-  # dotfiles. (see docs/dotfiles.md)
-  env = {
-    GIT_AUTHOR_NAME     = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
-    GIT_AUTHOR_EMAIL    = "${data.coder_workspace_owner.me.email}"
-    GIT_COMMITTER_NAME  = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
-    GIT_COMMITTER_EMAIL = "${data.coder_workspace_owner.me.email}"
-  }
-
-  # The following metadata blocks are optional. They are used to display
-  # information about your workspace in the dashboard. You can remove them
-  # if you don't want to display any information.
-  # For basic resources, you can use the `coder stat` command.
-  # If you need more control, you can write your own script.
-  metadata {
-    display_name = "CPU Usage"
-    key          = "0_cpu_usage"
-    script       = "coder stat cpu"
-    interval     = 10
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "RAM Usage"
-    key          = "1_ram_usage"
-    script       = "coder stat mem"
-    interval     = 10
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "Home Disk"
-    key          = "3_home_disk"
-    script       = "coder stat disk --path $${HOME}"
-    interval     = 60
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "CPU Usage (Host)"
-    key          = "4_cpu_usage_host"
-    script       = "coder stat cpu --host"
-    interval     = 10
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "Memory Usage (Host)"
-    key          = "5_mem_usage_host"
-    script       = "coder stat mem --host"
-    interval     = 10
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "Load Average (Host)"
-    key          = "6_load_host"
-    # get load avg scaled by number of cores
-    script   = <<EOT
-      echo "`cat /proc/loadavg | awk '{ print $1 }'` `nproc`" | awk '{ printf "%0.2f", $1/$2 }'
-    EOT
-    interval = 60
-    timeout  = 1
-  }
-
-  metadata {
-    display_name = "Swap Usage (Host)"
-    key          = "7_swap_host"
-    script       = <<EOT
-      free -b | awk '/^Swap/ { printf("%.1f/%.1f", $3/1024.0/1024.0/1024.0, $2/1024.0/1024.0/1024.0) }'
-    EOT
-    interval     = 10
-    timeout      = 1
-  }
-
-  metadata {
-    display_name = "Java Version"
-    key          = "java_version"
-    script       = "echo ${data.coder_parameter.java_version.value}"
-    interval     = 60
-    timeout      = 1
-  }
-}
-
-# See https://registry.coder.com/modules/code-server
-module "code-server" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/code-server/coder"
-
-  # This ensures that the latest version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
-  version = ">= 1.0.0"
-
-  agent_id = coder_agent.main.id
-  order    = 1
-  extensions = [
-    "vscjava.vscode-java-pack",
-    "redhat.java",
-    "vscjava.vscode-java-debug",
-    "vscjava.vscode-java-dependency",
-    "vscjava.vscode-maven"
-  ]
-  settings = {
-    "java.home" = "/usr/lib/jvm/java-${data.coder_parameter.java_version.value}-openjdk-amd64/bin/java"
-  }
-}
-
-# See https://registry.coder.com/modules/jetbrains-gateway
-module "jetbrains_gateway" {
-  count  = data.coder_workspace.me.start_count
-  source = "registry.coder.com/modules/jetbrains-gateway/coder"
-
-  # JetBrains IDEs to make available for the user to select
-  # jetbrains_ides = ["IU", "PS", "WS", "PY", "CL", "GO", "RM", "RD", "RR"]
-  jetbrains_ides = ["IU"]
-  default        = "IU"
-
-  # Default folder to open when starting a JetBrains IDE
-  folder = "/home/coder"
-
-  # This ensures that the latest version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
-  version = ">= 1.0.0"
-
-  latest = true
-
-  agent_id   = coder_agent.main.id
-  agent_name = "main"
-  order      = 2
-}
-
-resource "docker_volume" "home_volume" {
-  name = "coder-${data.coder_workspace.me.id}-home"
-  # Protect the volume from being deleted due to changes in attributes.
-  lifecycle {
-    ignore_changes = all
-  }
-  # Add labels in Docker to keep track of orphan resources.
-  labels {
-    label = "coder.owner"
-    value = data.coder_workspace_owner.me.name
-  }
-  labels {
-    label = "coder.owner_id"
-    value = data.coder_workspace_owner.me.id
-  }
-  labels {
-    label = "coder.workspace_id"
-    value = data.coder_workspace.me.id
-  }
-  # This field becomes outdated if the workspace is renamed but can
-  # be useful for debugging or cleaning out dangling volumes.
-  labels {
-    label = "coder.workspace_name_at_creation"
-    value = data.coder_workspace.me.name
-  }
-}
-
-resource "docker_container" "workspace" {
-  count = data.coder_workspace.me.start_count
-  #image = "registry.bobert.me/anthorob/coder-javadev:latest"
-  image = "registry.bobert.me/anthorob/coder-javadev:java${data.coder_parameter.java_version.value}"
-  # Uses lower() to avoid Docker restriction on container names.
-  name = "coder-${data.coder_workspace_owner.me.name}-${lower(data.coder_workspace.me.name)}"
-  # Hostname makes the shell more user friendly: coder@my-workspace:~$
-  hostname = data.coder_workspace.me.name
-  # Use the docker gateway if the access URL is 127.0.0.1
-  entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")]
-  env        = ["CODER_AGENT_TOKEN=${coder_agent.main.token}"]
-  host {
-    host = "host.docker.internal"
-    ip   = "host-gateway"
-  }
-  volumes {
-    container_path = "/home/coder"
-    volume_name    = docker_volume.home_volume.name
-    read_only      = false
-  }
-
-  # Add labels in Docker to keep track of orphan resources.
-  labels {
-    label = "coder.owner"
-    value = data.coder_workspace_owner.me.name
-  }
-  labels {
-    label = "coder.owner_id"
-    value = data.coder_workspace_owner.me.id
-  }
-  labels {
-    label = "coder.workspace_id"
-    value = data.coder_workspace.me.id
-  }
-  labels {
-    label = "coder.workspace_name"
-    value = data.coder_workspace.me.name
-  }
-}
diff --git a/templates/java/main.tf b/templates/java/main.tf
new file mode 100644
index 0000000..896aaad
--- /dev/null
+++ b/templates/java/main.tf
@@ -0,0 +1,57 @@
+data "coder_parameter" "java_version" {
+  name        = "Java Version"
+  description = "Select the JDK version for your workspace."
+  type        = "string"
+  default     = "21"
+
+  option {
+    name  = "Java 8"
+    value = "8"
+  }
+
+  option {
+    name  = "Java 17"
+    value = "17"
+  }
+
+  option {
+    name  = "Java 21"
+    value = "21"
+  }
+}
+
+module "java_workspace" {
+  source = "../../coder-base"
+
+  language = "Java"
+  docker_image    = "registry.bobert.me/anthorob/coder-images:java${data.coder_parameter.java_version.value}"
+
+  language_metadata = [
+    {
+      display_name = "Java Version"
+      key          = "java_version"
+      script       = "echo ${data.coder_parameter.java_version.value}"
+      interval     = 60
+      timeout      = 1
+    }
+  ]
+
+  language_startup_script = <<-EOT
+    echo $(java -version)
+  EOT
+
+  vscode_extensions = [
+    "vscjava.vscode-java-pack",
+    "redhat.java",
+    "vscjava.vscode-java-debug",
+    "vscjava.vscode-java-dependency",
+    "vscjava.vscode-maven"
+  ]
+
+  vscode_settings = {
+    "java.home" = "/usr/lib/jvm/java-21-openjdk-amd64/bin/java"
+  }
+
+  jetbrains_ides    = ["IU"]
+  jetbrains_default = "IU"
+}
diff --git a/templates/php/main.tf b/templates/php/main.tf
new file mode 100644
index 0000000..fffa0e3
--- /dev/null
+++ b/templates/php/main.tf
@@ -0,0 +1,45 @@
+data "coder_parameter" "php_version" {
+  name        = "PHP Version"
+  description = "Select the PHP version for your workspace."
+  type        = "string"
+  default     = "82"
+
+  option {
+    name  = "PHP 8.2"
+    value = "82"
+  }
+}
+
+module "php_workspace" {
+  source = "../../coder-base"
+
+  language = "PHP"
+  docker_image = "registry.bobert.me/anthorob/coder-images:php${data.coder_parameter.java_version.value}"
+
+  language_metadata = [
+    {
+      display_name = "PHP Version"
+      key          = "php_version"
+      script       = "php -v | head -n 1"
+      interval     = 60
+      timeout      = 1
+    }
+  ]
+
+  language_startup_script = <<-EOT
+    echo $(php -v)
+  EOT
+
+  vscode_extensions = [
+    "bmewburn.vscode-intelephense-client",
+    "felixfbecker.php-debug",
+    "mehedidracula.php-namespace-resolver"
+  ]
+
+  vscode_settings = {
+    "php.validate.executablePath" = "/usr/bin/php"
+  }
+
+  jetbrains_ides    = ["PS"]
+  jetbrains_default = "PS"
+}