diff --git a/.github/workflows/lint_models.yml b/.github/workflows/lint_models.yml
new file mode 100644
index 0000000..f98151c
--- /dev/null
+++ b/.github/workflows/lint_models.yml
@@ -0,0 +1,53 @@
+name: SQLFluff
+
+on:
+  - pull_request
+
+jobs:
+  lint-models:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: Install Python
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "3.7"
+      - name: install sqlfluff
+        run: "pip install sqlfluff"
+      - name: Get changed files
+        id: get_file_changes
+        uses: trilom/file-changes-action@v1.2.4
+        with:
+          output: ' '
+
+      - name: Get changed .sql files in /models to lint
+        id: get_files_to_lint
+        shell: bash -l {0}
+        run: |
+          # Set the command in the $() brackets as an output to use in later steps
+          echo "::set-output name=lintees::$(
+          # Issue where grep regular expressions don't work as expected on the
+          # Github Actions shell, check dbt/models/ folder
+          echo \
+          $(echo ${{ steps.get_file_changes.outputs.files_modified }} |
+          tr -s ' ' '\n' |
+          grep -E '^dbt/models.*[.]sql$' |
+          tr -s '\n' ' ') \
+          $(echo ${{ steps.get_file_changes.outputs.files_added }} |
+          tr -s ' ' '\n' |
+          grep -E '^dbt/models.*[.]sql$' |
+          tr -s '\n' ' ')
+          )"
+
+      - name: Lint dbt models
+        id: sqlfluff_json
+        if: steps.get_files_to_lint.outputs.lintees != ''
+        shell: bash -l {0}
+        run: sqlfluff lint --format github-annotation --annotation-level failure --nofail ${{ steps.get_files_to_lint.outputs.lintees }} > annotations.json
+      - name: Annotate
+        uses: yuzutech/annotations-action@v0.3.0
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          title: "SQLFluff Lint"
+          input: "./annotations.json"
\ No newline at end of file
diff --git a/macros/create_schema.sql b/macros/create_schema.sql
new file mode 100644
index 0000000..c9be6d1
--- /dev/null
+++ b/macros/create_schema.sql
@@ -0,0 +1,5 @@
+{% macro create_schema(relation) %}
+{%- call statement('create_schema') -%}
+    create schema if not exists {{ relation.without_identifier() }} with managed access
+  {% endcall %}
+{% endmacro %}
\ No newline at end of file
diff --git a/models/marts/core/dim_customers.sql b/models/marts/core/dim_customers.sql
index e86796a..0fe2169 100644
--- a/models/marts/core/dim_customers.sql
+++ b/models/marts/core/dim_customers.sql
@@ -13,7 +13,7 @@ with customer as (
 nation as (
 
     select * from {{ ref('stg_tpch_nations') }}
-),
+), 
 region as (
 
     select * from {{ ref('stg_tpch_regions') }}
diff --git a/models/marts/core/dim_parts.sql b/models/marts/core/dim_parts.sql
index 14b9a95..163ad0c 100644
--- a/models/marts/core/dim_parts.sql
+++ b/models/marts/core/dim_parts.sql
@@ -12,7 +12,7 @@ with part as (
 final as (
     select 
         part_key,
-        manufacturer,
+        manufacturer        ,
         name,
         brand as brand,
         type,
diff --git a/models/staging/tpch/stg_tpch_nations.sql b/models/staging/tpch/stg_tpch_nations.sql
index 58ae737..f852f3b 100644
--- a/models/staging/tpch/stg_tpch_nations.sql
+++ b/models/staging/tpch/stg_tpch_nations.sql
@@ -1,3 +1,8 @@
+{{
+    config(
+        schema='managed_access_test'
+    )
+}}
 with source as (
 
     select * from {{ source('tpch', 'nation') }}
@@ -11,7 +16,8 @@ renamed as (
         n_nationkey as nation_key,
         n_name as name,
         n_regionkey as region_key,
-        n_comment as comment
+        n_comment as comment,
+        '{{env_var('DBT_ENV_TYPE')}}' as env_type
 
     from source