diff --git a/.github/workflows/dbt_run_incremental_non_realtime.yml b/.github/workflows/dbt_run_incremental_non_realtime.yml
index 568fdb14..41964b4c 100644
--- a/.github/workflows/dbt_run_incremental_non_realtime.yml
+++ b/.github/workflows/dbt_run_incremental_non_realtime.yml
@@ -42,5 +42,5 @@ jobs:
           dbt deps
       - name: Run DBT Jobs
         run: |
-          dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m tag:non_realtime 1+tag:streamline_decoded_logs_realtime
+          dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m tag:non_realtime tag:streamline_decoded_logs_complete tag:streamline_decoded_logs_realtime
           
\ No newline at end of file
diff --git a/.github/workflows/dbt_run_streamline_chainhead.yml b/.github/workflows/dbt_run_streamline_chainhead.yml
index 53c8180c..a8b170b2 100644
--- a/.github/workflows/dbt_run_streamline_chainhead.yml
+++ b/.github/workflows/dbt_run_streamline_chainhead.yml
@@ -42,4 +42,4 @@ jobs:
           dbt deps
       - name: Run DBT Jobs
         run: |
-          dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m 1+tag:streamline_core_realtime
\ No newline at end of file
+          dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m tag:streamline_core_complete tag:streamline_core_realtime
\ No newline at end of file
diff --git a/.github/workflows/dbt_run_streamline_decoder_history.yml b/.github/workflows/dbt_run_streamline_decoder_history.yml
index 05b10a89..b93e0830 100644
--- a/.github/workflows/dbt_run_streamline_decoder_history.yml
+++ b/.github/workflows/dbt_run_streamline_decoder_history.yml
@@ -42,4 +42,4 @@ jobs:
           dbt deps
       - name: Run DBT Jobs
         run: |
-          dbt run --threads 8 --vars '{"STREAMLINE_INVOKE_STREAMS":True,"WAIT":120}' -m 1+tag:streamline_decoded_logs_history
\ No newline at end of file
+          dbt run --threads 8 --vars '{"STREAMLINE_INVOKE_STREAMS":True,"WAIT":120}' -m tag:streamline_decoded_logs_complete tag:streamline_decoded_logs_history
\ No newline at end of file
diff --git a/.github/workflows/dbt_run_streamline_history_adhoc.yml b/.github/workflows/dbt_run_streamline_history_adhoc.yml
index 81818049..4130e5fc 100644
--- a/.github/workflows/dbt_run_streamline_history_adhoc.yml
+++ b/.github/workflows/dbt_run_streamline_history_adhoc.yml
@@ -29,8 +29,8 @@ on:
         description: 'DBT Run Command'
         required: true
         options:
-          - dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m 1+tag:streamline_core_history
-          - dbt run --threads 8 --vars '{"STREAMLINE_INVOKE_STREAMS":True,"WAIT":120}' -m 1+tag:streamline_decoded_logs_history
+          - dbt run --vars '{"STREAMLINE_INVOKE_STREAMS":True}' -m tag:streamline_core_complete tag:streamline_core_history
+          - dbt run --threads 8 --vars '{"STREAMLINE_INVOKE_STREAMS":True,"WAIT":120}' -m tag:streamline_decoded_logs_complete tag:streamline_decoded_logs_history
     
 env:
   DBT_PROFILES_DIR: ./
diff --git a/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql b/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
index bf635cd1..4432bd16 100644
--- a/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_confirmed_blocks.sql
@@ -2,7 +2,8 @@
 {{ config (
     materialized = "incremental",
     unique_key = "id",
-    cluster_by = "ROUND(block_number, -3)"
+    cluster_by = "ROUND(block_number, -3)",
+    tags = ['streamline_core_complete']
 ) }}
 
 SELECT
diff --git a/models/streamline/silver/core/complete/streamline__complete_debug_traceBlockByNumber.sql b/models/streamline/silver/core/complete/streamline__complete_debug_traceBlockByNumber.sql
index 8df59cdd..266e510c 100644
--- a/models/streamline/silver/core/complete/streamline__complete_debug_traceBlockByNumber.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_debug_traceBlockByNumber.sql
@@ -4,7 +4,8 @@
     unique_key = "id",
     cluster_by = "ROUND(block_number, -3)",
     merge_update_columns = ["id"],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(id)"
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(id)",
+    tags = ['streamline_core_complete']
 ) }}
 
 SELECT
diff --git a/models/streamline/silver/core/complete/streamline__complete_qn_getBlockWithReceipts.sql b/models/streamline/silver/core/complete/streamline__complete_qn_getBlockWithReceipts.sql
index f73a1e9c..59a24ffd 100644
--- a/models/streamline/silver/core/complete/streamline__complete_qn_getBlockWithReceipts.sql
+++ b/models/streamline/silver/core/complete/streamline__complete_qn_getBlockWithReceipts.sql
@@ -4,7 +4,8 @@
     unique_key = "id",
     cluster_by = "ROUND(block_number, -3)",
     merge_update_columns = ["id"],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(id)"
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(id)",
+    tags = ['streamline_core_complete']
 ) }}
 
 SELECT
diff --git a/models/streamline/silver/core/streamline__blocks.sql b/models/streamline/silver/core/streamline__blocks.sql
index da743e60..47b657a1 100644
--- a/models/streamline/silver/core/streamline__blocks.sql
+++ b/models/streamline/silver/core/streamline__blocks.sql
@@ -1,6 +1,6 @@
 {{ config (
     materialized = "view",
-    tags = ['streamline_view']
+    tags = ['streamline_core_complete']
 ) }}
 
 
diff --git a/models/streamline/silver/decoder/complete/streamline__complete_decode_logs.sql b/models/streamline/silver/decoder/complete/streamline__complete_decode_logs.sql
index 7f470a03..4130953d 100644
--- a/models/streamline/silver/decoder/complete/streamline__complete_decode_logs.sql
+++ b/models/streamline/silver/decoder/complete/streamline__complete_decode_logs.sql
@@ -5,7 +5,8 @@
     cluster_by = "ROUND(block_number, -3)",
     incremental_predicates = ["dynamic_range", "block_number"],
     merge_update_columns = ["_log_id"],
-    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(_log_id)"
+    post_hook = "ALTER TABLE {{ this }} ADD SEARCH OPTIMIZATION on equality(_log_id)",
+    tags = ['streamline_decoded_logs_complete']
 ) }}
 
 SELECT