diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000..17c2c545
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,88 @@
+name: 🐞 Bug
+description: Report a bug or an issue you've found within the dbt package
+title: "[Bug]
"
+labels: ["bug", "triage"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for using the Fivetran dbt package and for taking the time to fill out this bug report. Your contributions help improve this package for the entire community of users!
+ - type: checkboxes
+ attributes:
+ label: Is there an existing issue for this?
+ description: Please search to see if an issue already exists for the bug you encountered.
+ options:
+ - label: I have searched the existing issues
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe the issue
+ description: A concise description of the problem you're experiencing. Also, please provide the steps to reproduce the issue if applicable.
+ validations:
+ required: true
+ - type: textarea
+ id: logs
+ attributes:
+ label: Relevant error log or model output
+ description: |
+ If applicable, provide the relevant error log or describe the problematic model output.
+ render: shell
+ validations:
+ required: false
+ - type: textarea
+ attributes:
+ label: Expected behavior
+ description: A concise description of what you expected to happen.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: dbt Project configurations
+ description: Please provide the variables and any other project specific configurations from your `dbt_project.yml`.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Package versions
+ description: Please provide the contents of your `packages.yml`.
+ validations:
+ required: true
+ - type: dropdown
+ id: database
+ attributes:
+ label: What database are you using dbt with?
+ multiple: true
+ options:
+ - postgres
+ - redshift
+ - snowflake
+ - bigquery
+ - databricks
+ - other (mention it in "Additional Context")
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: dbt Version
+ description: Run `dbt --version` in your CLI or dbt cloud environment and copy the contents. Additionally, if you are using Fivetran dbt Transformations, provide the contents of the `dbtVersion` configuration in your `deployment.yml`.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Additional Context
+ description: |
+ Links? References? Anything that will give us more context about the issue you are encountering!
+
+ Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
+ validations:
+ required: false
+ - type: checkboxes
+ id: pr
+ attributes:
+ label: Are you willing to open a PR to help address this issue?
+ description: Our team will assess this issue and let you know if we will add it to a future sprint. However, if you would like to expedite the solution, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
+ options:
+ - label: Yes.
+ - label: Yes, but I will need assistance and will schedule time during our [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance
+ - label: No.
+ required: false
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c36e4fea..00000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: BUG - [your bug title here]
-labels: bug
-assignees: ''
-
----
-
-**Are you a current Fivetran customer?**
-
-
-
-**Describe the bug**
-
-
-**Steps to reproduce**
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-
-
-**Project variables configuration**
-
-```yml
-copy dbt_project.yml here
-```
-
-**Package Version**
-
-```yml
-copy packages.yml here
-```
-
-**Warehouse**
-
-
-- [ ] BigQuery
-- [ ] Redshift
-- [ ] Snowflake
-- [ ] Postgres
-- [ ] Databricks
-- [ ] Other (provide details below)
-
-**Additional context**
-
-
-**Screenshots**
-
-
-**Please indicate the level of urgency**
-
-
-**Are you interested in contributing to this package?**
-
-- [ ] Yes, I can do this and open a PR for your review.
-- [ ] Possibly, but I'm not quite sure how to do this. I'd be happy to do a live coding session with someone to get this fixed.
-- [ ] No, I'd prefer if someone else fixed this. I don't have the time and/or don't know what the root cause of the problem is.
-
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..65a074bc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,13 @@
+contact_links:
+ - name: Ask a question during our office hours
+ url: https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours
+ about: Schedule time during the external office hours block with the Fivetran Analytics Engineering team for support
+ - name: Fivetran connector question
+ url: https://support.fivetran.com/hc
+ about: Have a question about your connector? Check out the Fivetran support portal for more details.
+ - name: What is dbt
+ url: https://docs.getdbt.com/docs/introduction
+ about: Check out the dbt docs for all dbt related information
+ - name: Hang out in dbt Slack
+ url: https://www.getdbt.com/community/
+ about: Have a question or just want to chat with fellow data friends, join dbt Slack and hangout in the tools-fivetran channel with us!
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000..a1d28bbb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,46 @@
+name: 🎉 Feature
+description: Suggest a new feature for the Fivetran dbt package
+title: "[Feature] "
+labels: ["enhancement"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Thanks for using the Fivetran dbt package and for taking the time to fill out this feature request. Your contributions help improve this package for the entire community of users!
+ - type: checkboxes
+ attributes:
+ label: Is there an existing feature request for this?
+ description: Please search to see if an issue already exists for the feature you would like.
+ options:
+ - label: I have searched the existing issues
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe the Feature
+ description: A clear and concise description of what you want to happen and why you want the new feature.
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: Describe alternatives you've considered
+ description: |
+ A clear and concise description of any alternative solutions or features you've considered.
+ validations:
+ required: false
+ - type: checkboxes
+ id: contributing
+ attributes:
+ label: Are you interested in contributing this feature?
+ description: Our team will assess this feature and let you know if we will add it to a future sprint. However, if you would like to expedite the feature, we encourage you to contribute to the package via a PR. Our team will then work with you to approve and merge your contributions as soon as possible.
+ options:
+ - label: Yes.
+ - label: Yes, but I will need assistance and will schedule time during your [office hours](https://calendly.com/fivetran-solutions-team/fivetran-solutions-team-office-hours) for guidance.
+ - label: No.
+ required: false
+ - type: textarea
+ attributes:
+ label: Anything else?
+ description: |
+ Links? References? Anything that will give us more context about the feature you are suggesting!
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index ad1df3f2..00000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,32 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: FEATURE - [your feature request title here]
-labels: enhancement
-assignees: ''
-
----
-
-**Are you a Fivetran customer?**
-
-
-**Is your feature request related to a problem? Please describe.**
-
-
-**Describe the solution you'd like**
-
-
-**Describe alternatives you've considered**
-
-
-**Additional context**
-
-
-**Please indicate the level of urgency and business impact of this request**
-
-
-**Are you interested in contributing to this package?**
-
-- [ ] Yes, I can do this and open a PR for your review.
-- [ ] Possibly, but I'm not quite sure how to do this. I'd be happy to do a live coding session with someone to get this work implemented.
-- [ ] No, I'd prefer if someone else did this. I don't have the time and/or don't know how to incorporate the changes necessary.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 2bd3b256..00000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,20 +0,0 @@
----
-name: Question
-about: Confused about how to use the package? Ask us a question
-title: QUESTION - [your question title here]
-labels: question
-assignees: ''
-
----
-
-**Are you a Fivetran customer?**
-
-
-**Your Question**
-
-
-**Additional context**
-
-
-**Please indicate the level of urgency and business impact of this request**
-
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 1d9bae8c..35f658da 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,29 +1,42 @@
+Pull Request
**Are you a current Fivetran customer?**
**What change(s) does this PR introduce?**
-
+
+
+**Did you update the CHANGELOG?**
+
+
+- [ ] Yes
**Does this PR introduce a breaking change?**
-
-
+
+
- [ ] Yes (please provide breaking change details below.)
-- [ ] No (please provide explanation how the change is non breaking below.)
+- [ ] No (please provide an explanation as to how the change is non-breaking below.)
+
+**Did you update the dbt_project.yml files with the version upgrade (please leverage standard semantic versioning)? (In both your main project and integration_tests)**
+
+
+- [ ] Yes
-**Is this PR in response to a previously created Issue**
+**Is this PR in response to a previously created Bug or Feature Request**
-
-- [ ] Yes, Issue [link issue number here]
+
+- [ ] Yes, Issue/Feature [link bug/feature number here]
- [ ] No
**How did you test the PR changes?**
+
- [ ] CircleCi
-- [ ] Other (please provide additional testing details below)
+- [ ] Local (please provide additional testing details below)
**Select which warehouse(s) were used to test the PR**
+
- [ ] BigQuery
- [ ] Redshift
- [ ] Snowflake
diff --git a/integration_tests/requirements.txt b/integration_tests/requirements.txt
index 9edc95a6..89c6ccb4 100644
--- a/integration_tests/requirements.txt
+++ b/integration_tests/requirements.txt
@@ -1,6 +1,6 @@
-dbt-snowflake==1.0.0
-dbt-bigquery==1.0.0
-dbt-redshift==1.0.0
-dbt-postgres==1.0.0
-dbt-spark==1.0.0
-dbt-spark[PyHive]==1.0.0
+dbt-snowflake~=1.0.0
+dbt-bigquery~=1.0.0
+dbt-redshift~=1.0.0
+dbt-postgres~=1.0.0
+dbt-spark~=1.0.0
+dbt-spark[PyHive]~=1.0.0