diff --git a/dbt/include/bigquery/macros/adapters.sql b/dbt/include/bigquery/macros/adapters.sql
index f166e5d05..66c42cdf2 100644
--- a/dbt/include/bigquery/macros/adapters.sql
+++ b/dbt/include/bigquery/macros/adapters.sql
@@ -3,7 +3,7 @@
     {%- set raw_partition_by = config.get('partition_by', none) -%}
     {%- set raw_cluster_by = config.get('cluster_by', none) -%}
     {%- set sql_header = config.get('sql_header', none) -%}
-
+    {%- set table_format = config.get('table_format', 'default') -%}
     {%- set partition_config = adapter.parse_partition_by(raw_partition_by) -%}
     {%- if partition_config.time_ingestion_partitioning -%}
     {%- set columns = get_columns_with_types_in_query_sql(sql) -%}
@@ -23,10 +23,39 @@
         {#-- cannot do contracts at the same time as time ingestion partitioning -#}
         {{ columns }}
       {% endif %}
-    {{ partition_by(partition_config) }}
+    {%- if table_format == "iceberg" and partition_config is not none-%}
+        {% do exceptions.raise_compiler_error("Partition by not yet available in iceberg tables, use cluster by instead") %}
+        {#-- PARTITION BY cannot be used in iceberg-#}
+    {%- else -%}
+        {{ partition_by(partition_config) }}
+    {% endif %}
     {{ cluster_by(raw_cluster_by) }}
+    {% if table_format == "iceberg" %}
+
+        {% set base_location = config.get('base_location') %}
+        {%- if not base_location-%}
+            {% do exceptions.raise_compiler_error("base_location not found") %}
+        {% endif %}
+           {% set connection = config.get('connection') %}
+        {%- if not connection-%}
+           {% do exceptions.raise_compiler_error("Bq connection not found") %}
+        {% endif %}
+        {% set sub_path = relation.identifier %}
+        {% set connection = "WITH CONNECTION `"~connection~"`" %}
+        {# All these options could be part of the options config of the model #}
+        {% set options %}
+         OPTIONS(
+            file_format = 'PARQUET',
+            table_format = 'ICEBERG',
+            storage_uri = '{{base_location}}/{{sub_path}}'
+        )
+        {%- endset -%}
+        {{- connection -}}
+        {#-- pass this through {{ bigquery_table_options(config, model, temporary) }}-#}
+        {{- options -}}
+
+    {% endif %}
 
-    {{ bigquery_table_options(config, model, temporary) }}
 
     {#-- PARTITION BY cannot be used with the AS query_statement clause.
          https://cloud.google.com/bigquery/docs/reference/standard-sql/data-definition-language#partition_expression