diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..54a1136
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,82 @@
+# OSX leaves these everywhere on SMB shares
+._*
+
+# OSX trash
+.DS_Store
+
+# Python
+*.pyc
+
+# Emacs save files
+*~
+\#*\#
+.\#*
+
+# Vim-related files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+
+### https://raw.github.com/github/gitignore/90f149de451a5433aebd94d02d11b0e28843a1af/Terraform.gitignore
+
+# Local .terraform directories
+**/.terraform*
+
+# .tfstate files
+*.tfstate
+*.tfstate.*
+
+# Local tfvars terraform.tfvars
+**/*.tfvars
+
+# tf lock file
+**/.terraform.lock.hcl
+
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
+
+# Ignore override files as they are usually used to override resources locally and so
+# are not checked in
+override.tf
+override.tf.json
+*_override.tf
+*_override.tf.json
+.idea/
+.vscode/
+# Kitchen files
+**/inspec.lock
+**.gem
+**/.kitchen
+**/.kitchen.local.yml
+**/Gemfile.lock
+# Plan files
+**/tmp_plan
+**/.tmp
+**/tmp
+
+test/fixtures/shared/terraform.tfvars
+
+test/integration/gcloud/config.sh
+test/integration/tmp
+
+credentials.json
+
+helpers/foundation-deployer/foundation-deployer
+helpers/foundation-deployer/.steps.json
+
+# File to populate env vars used by Docker test runs
+.envrc
+
+# Handle files generated on sed command by old (2013-) MacOS versions
+*.tf-e
+
+# Go multi-module workspace sum
+go.work.sum
\ No newline at end of file
diff --git a/ci-scripts/generate-pipeline.sh b/ci-scripts/generate-pipeline.sh
index 2e6a47d..6c0d6f4 100644
--- a/ci-scripts/generate-pipeline.sh
+++ b/ci-scripts/generate-pipeline.sh
@@ -22,8 +22,7 @@ deploy_${name}:
   stage: deploy
   image: registry.bobert.me/anthorob/coder-images:coder-cli
   script:
-    - cd $dir
-    - coder templates push --name "${CI_COMMIT_SHORT_SHA}" --message "Auto-deployed from ${CI_PROJECT_PATH} on commit ${CI_COMMIT_SHORT_SHA}" --yes ${name}
+    - coder templates push -d ${dir} --name "${CI_COMMIT_SHORT_SHA}" --message "Auto-deployed from ${CI_PROJECT_PATH} on commit ${CI_COMMIT_SHORT_SHA}" --yes ${name}
 EOF
 
 done
diff --git a/templates/java/main.tf b/templates/java/main.tf
index 53e1018..5601587 100644
--- a/templates/java/main.tf
+++ b/templates/java/main.tf
@@ -32,7 +32,7 @@ data "coder_parameter" "java_version" {
 }
 
 module "java_workspace" {
-  source = "../../coder-base"
+  source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main"
 
   language = "Java"
   docker_image    = "registry.bobert.me/anthorob/coder-images:java${data.coder_parameter.java_version.value}"
diff --git a/templates/php/main.tf b/templates/php/main.tf
index 30e97a8..2e80037 100644
--- a/templates/php/main.tf
+++ b/templates/php/main.tf
@@ -22,7 +22,7 @@ data "coder_parameter" "php_version" {
 }
 
 module "php_workspace" {
-  source = "../../coder-base"
+  source = "git::https://git.bobert.me/anthorob/coder-templates.git//coder-base?ref=main"
 
   language = "PHP"
   docker_image = "registry.bobert.me/anthorob/coder-images:php${data.coder_parameter.php_version.value}"