diff --git a/tests/jenkins-jobs/README.md b/tests/jenkins-jobs/README.md
index 41d5fcffd8..8f1c18d5e5 100644
--- a/tests/jenkins-jobs/README.md
+++ b/tests/jenkins-jobs/README.md
@@ -31,4 +31,15 @@ This file creates a Jenkins job called `tectonic-installer-pr-trigger` under `tr
 
 Parameters:
 
-* No input parameters are required.
\ No newline at end of file
+* No input parameters are required.
+
+## Tectonic Installer Upstream Terraform Trigger
+
+This file creates a Jenkins job called `upstream-terraform-trigger` under `triggers` folder to run the tests against the `Tectonic Installer` in the `master` branch using the `upstream Terraform`
+This job will run everyday.
+
+To change the default `builder_image` please update the code in the `tectonic_installer_upstream_terraform_trigger.groovy` file and submit a PR.
+
+Parameters:
+
+* `builder_image`: Tectonic-builder docker image with the upstream Terraform
diff --git a/tests/jenkins-jobs/tectonic_installer_upstream_terraform_trigger.groovy b/tests/jenkins-jobs/tectonic_installer_upstream_terraform_trigger.groovy
new file mode 100644
index 0000000000..182af9d1ff
--- /dev/null
+++ b/tests/jenkins-jobs/tectonic_installer_upstream_terraform_trigger.groovy
@@ -0,0 +1,52 @@
+#!/bin/env groovy​
+
+folder("triggers")
+
+job("triggers/upstream-terraform-trigger") {
+  description('Tectonic Installer using Terraform Upstream. Changes here will be reverted automatically.')
+
+  logRotator(10, 10)
+  wrappers {
+    colorizeOutput()
+    timestamps()
+  }
+
+  triggers {
+    cron('@daily')
+  }
+
+  parameters {
+    stringParam('builder_image', 'quay.io/coreos/tectonic-builder:v1.36-upstream-terraform', 'tectonic-builder docker image with upstream Terraform')
+  }
+
+  steps {
+    triggerBuilder {
+      configs {
+        blockableBuildTriggerConfig {
+          projects("tectonic-installer/master")
+          block {
+            buildStepFailureThreshold("FAILURE")
+            unstableThreshold("UNSTABLE")
+            failureThreshold("FAILURE")
+          }
+          configs {
+            currentBuildParameters()
+          }
+        }
+      }
+    }
+  }
+
+  publishers {
+    wsCleanup()
+    slackNotifier {
+      authTokenCredentialId('tectonic-slack-token')
+      customMessage("Tectonic Installer Upstream Terraform Build")
+      includeCustomMessage(true)
+      notifyBackToNormal(true)
+      notifyFailure(true)
+      room('#tectonic-installer-ci')
+      teamDomain('coreos')
+    }
+  }
+}
diff --git a/upstream-terraform-trigger.groovy b/upstream-terraform-trigger.groovy
deleted file mode 100644
index 1c16b20749..0000000000
--- a/upstream-terraform-trigger.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-node {
-    build job: 'tectonic-installer/master',
-    parameters: [
-        string(
-            name: 'builder_image',
-            value: 'quay.io/coreos/tectonic-builder:v1.36-upstream-terraform'
-        )
-    ]
-}