diff --git a/.github/workflows/dbt_integration_test.yml b/.github/workflows/dbt_integration_test.yml
index 1646d61..8e8d3ac 100644
--- a/.github/workflows/dbt_integration_test.yml
+++ b/.github/workflows/dbt_integration_test.yml
@@ -3,15 +3,32 @@ run-name: ${{ github.event.inputs.branch }}
 
 on:
   workflow_dispatch:
+    inputs:
+      environment:
+        required: true
+        type: string
 
 concurrency: ${{ github.workflow }}
 
 jobs:
+  prepare_vars:
+    runs-on: ubuntu-latest
+    environment: 
+      name: ${{ inputs.environment }}  
+    outputs:  
+      warehouse: ${{ steps.set_outputs.outputs.warehouse }}
+    steps:
+      - name: Set warehouse output
+        id: set_outputs
+        run: |
+          echo "warehouse=${{ vars.WAREHOUSE }}" >> $GITHUB_OUTPUT  
+
   called_workflow_template:
+    needs: prepare_vars
     uses: FlipsideCrypto/analytics-workflow-templates/.github/workflows/dbt.yml@main
     with:
       command: >
         dbt test --selector 'integration_tests'
-      environment:  ${{ github.ref == 'refs/heads/main' && 'workflow_prod' || 'workflow_dev' }}
-      warehouse: ${{ vars.WAREHOUSE }}
+      environment: ${{ inputs.environment }}
+      warehouse: ${{ needs.prepare_vars.outputs.warehouse }}  
     secrets: inherit
\ No newline at end of file
diff --git a/macros/livetable/near_live_table_abstractions.sql b/macros/livetable/near_live_table_abstractions.sql
index f7c5686..f5f57e3 100644
--- a/macros/livetable/near_live_table_abstractions.sql
+++ b/macros/livetable/near_live_table_abstractions.sql
@@ -147,21 +147,21 @@ FROM {{raw_blocks}}
 {% endmacro %}
 
 {% macro near_live_table_fact_blocks(schema, blockchain, network) %}
-    {%- set near_live_table_fact_blocks = livequery_base.get_rendered_model('near_models', 'livetable_fact_blocks', schema, blockchain, network) -%}
+    {%- set near_live_table_fact_blocks = livequery_models.get_rendered_model('near_models', 'livetable_fact_blocks', schema, blockchain, network) -%}
     {{ near_live_table_fact_blocks }}
 {% endmacro %}
 
 {% macro near_live_table_fact_transactions(schema, blockchain, network) %}
-    {%- set near_live_table_fact_transactions = livequery_base.get_rendered_model('near_models', 'livetable_fact_transactions', schema, blockchain, network) -%}
+    {%- set near_live_table_fact_transactions = livequery_models.get_rendered_model('near_models', 'livetable_fact_transactions', schema, blockchain, network) -%}
     {{ near_live_table_fact_transactions }}
 {% endmacro %}
 
 {% macro near_live_table_fact_receipts(schema, blockchain, network) %}
-    {%- set near_live_table_fact_receipts = livequery_base.get_rendered_model('near_models', 'livetable_fact_receipts', schema, blockchain, network) -%}
+    {%- set near_live_table_fact_receipts = livequery_models.get_rendered_model('near_models', 'livetable_fact_receipts', schema, blockchain, network) -%}
     {{ near_live_table_fact_receipts }}
 {% endmacro %}
 
 {% macro near_live_table_ez_actions(schema, blockchain, network) %}
-    {%- set near_live_table_ez_actions = livequery_base.get_rendered_model('near_models', 'livetable_ez_actions', schema, blockchain, network) -%}
+    {%- set near_live_table_ez_actions = livequery_models.get_rendered_model('near_models', 'livetable_ez_actions', schema, blockchain, network) -%}
     {{ near_live_table_ez_actions }}
 {% endmacro %}
diff --git a/models/deploy/near/live__table.sql b/models/deploy/near/live__table.sql
index 7027511..07acce8 100644
--- a/models/deploy/near/live__table.sql
+++ b/models/deploy/near/live__table.sql
@@ -15,4 +15,4 @@
     config_near_high_level_abstractions
     ] -%}
 
-{{- livequery_base.ephemeral_deploy(configs) -}}
+{{- livequery_models.ephemeral_deploy(configs) -}}
diff --git a/package-lock.yml b/package-lock.yml
index 7a369fe..b2350d7 100644
--- a/package-lock.yml
+++ b/package-lock.yml
@@ -4,11 +4,11 @@ packages:
 - package: dbt-labs/dbt_utils
   version: 1.0.0
 - git: https://github.com/FlipsideCrypto/fsc-utils.git
-  revision: 62dbf237680acb2f3c68821e279e056f93af7b2f
+  revision: 87e00eb90acddcc7a34aa8e67e3b3bac86b262e6
 - package: get-select/dbt_snowflake_query_tags
   version: 2.5.0
 - package: calogica/dbt_date
   version: 0.7.2
-- git: https://github.com/FlipsideCrypto/livequery-base.git
-  revision: 6a453542476e9e36959fbee3b09105c4949833fe
-sha1_hash: 64150427f8503bff3a904ff47fc0a4d143673ffe
+- git: https://github.com/FlipsideCrypto/livequery-models.git
+  revision: 2651a45b7e123f7bd421bcc0e7e2a7bcbaf7652f
+sha1_hash: 3a13ebba8cc512b1092e942e770f61c35caae8fc
diff --git a/packages.yml b/packages.yml
index 3d87fce..d781e7d 100644
--- a/packages.yml
+++ b/packages.yml
@@ -4,6 +4,6 @@ packages:
   - package: dbt-labs/dbt_utils
     version: 1.0.0
   - git: https://github.com/FlipsideCrypto/fsc-utils.git
-    revision: v1.35.1
+    revision: "v1.35.1"
   - package: get-select/dbt_snowflake_query_tags
     version: [">=2.0.0", "<3.0.0"]
diff --git a/selectors.yml b/selectors.yml
index 885f6b7..791cf99 100644
--- a/selectors.yml
+++ b/selectors.yml
@@ -4,5 +4,5 @@ selectors:
     definition:
       union:
         - method: fqn
-          value: "livequery_base.deploy.core._utils"
+          value: "livequery_models.deploy.core._utils"
         
\ No newline at end of file