diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
index fadfab375..4d266ec33 100644
--- a/.github/workflows/Linux.yml
+++ b/.github/workflows/Linux.yml
@@ -91,6 +91,7 @@ jobs:
 
     - name: Test extension
       env:
+        LOCAL_EXTENSION_REPO: ${{ github.workspace }}/build/release/repository/
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
         PGSERVICE: postgres
       run: |
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
index b1ea791eb..1e2094cf1 100644
--- a/.github/workflows/MainDistributionPipeline.yml
+++ b/.github/workflows/MainDistributionPipeline.yml
@@ -14,21 +14,21 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: v1.5-variegata
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: v1.5-variegata
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
       deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}
diff --git a/duckdb b/duckdb
index 68d7555f6..1f9ecad74 160000
--- a/duckdb
+++ b/duckdb
@@ -1 +1 @@
-Subproject commit 68d7555f68bd25c1a251ccca2e6338949c33986a
+Subproject commit 1f9ecad7465a86b1fdfb70c3fa8d8b5d9d95e426
diff --git a/extension-ci-tools b/extension-ci-tools
index aac964061..795096d04 160000
--- a/extension-ci-tools
+++ b/extension-ci-tools
@@ -1 +1 @@
-Subproject commit aac9640615e51d6e7e8b72d4bf023703cfd8e479
+Subproject commit 795096d04b009c0d087468439ebb526a5460dfac
diff --git a/src/include/storage/postgres_delete.hpp b/src/include/storage/postgres_delete.hpp
index e709ceed1..4e878de01 100644
--- a/src/include/storage/postgres_delete.hpp
+++ b/src/include/storage/postgres_delete.hpp
@@ -22,7 +22,7 @@ class PostgresDelete : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;
diff --git a/src/include/storage/postgres_index.hpp b/src/include/storage/postgres_index.hpp
index 47c46c0d4..76593a023 100644
--- a/src/include/storage/postgres_index.hpp
+++ b/src/include/storage/postgres_index.hpp
@@ -24,7 +24,7 @@ class PostgresCreateIndex : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;
diff --git a/src/include/storage/postgres_insert.hpp b/src/include/storage/postgres_insert.hpp
index d22b4f195..4bd0e2991 100644
--- a/src/include/storage/postgres_insert.hpp
+++ b/src/include/storage/postgres_insert.hpp
@@ -35,7 +35,7 @@ class PostgresInsert : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;
diff --git a/src/include/storage/postgres_update.hpp b/src/include/storage/postgres_update.hpp
index 12b5e5e7a..dd25e7594 100644
--- a/src/include/storage/postgres_update.hpp
+++ b/src/include/storage/postgres_update.hpp
@@ -29,7 +29,7 @@ class PostgresUpdate : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;
diff --git a/src/postgres_storage.cpp b/src/postgres_storage.cpp
index cfff7466e..e0ee73cac 100644
--- a/src/postgres_storage.cpp
+++ b/src/postgres_storage.cpp
@@ -1,7 +1,7 @@
 #include "duckdb.hpp"
-
 #include "postgres_storage.hpp"
 #include "storage/postgres_catalog.hpp"
+#include "duckdb/main/settings.hpp"
 #include "duckdb/parser/parsed_data/attach_info.hpp"
 #include "storage/postgres_transaction_manager.hpp"
 
@@ -10,8 +10,7 @@ namespace duckdb {
 static unique_ptr<Catalog> PostgresAttach(optional_ptr<StorageExtensionInfo> storage_info, ClientContext &context,
                                           AttachedDatabase &db, const string &name, AttachInfo &info,
                                           AttachOptions &attach_options) {
-	auto &config = DBConfig::GetConfig(context);
-	if (!config.options.enable_external_access) {
+	if (!Settings::Get<EnableExternalAccessSetting>(context)) {
 		throw PermissionException("Attaching Postgres databases is disabled through configuration");
 	}
 	string attach_path = info.path;
diff --git a/src/storage/postgres_delete.cpp b/src/storage/postgres_delete.cpp
index 8e1c01437..b50fbc171 100644
--- a/src/storage/postgres_delete.cpp
+++ b/src/storage/postgres_delete.cpp
@@ -96,7 +96,7 @@ SinkFinalizeType PostgresDelete::Finalize(Pipeline &pipeline, Event &event, Clie
 //===--------------------------------------------------------------------===//
 // GetData
 //===--------------------------------------------------------------------===//
-SourceResultType PostgresDelete::GetData(ExecutionContext &context, DataChunk &chunk,
+SourceResultType PostgresDelete::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
                                          OperatorSourceInput &input) const {
 	auto &insert_gstate = sink_state->Cast<PostgresDeleteGlobalState>();
 	chunk.SetCardinality(1);
diff --git a/src/storage/postgres_index.cpp b/src/storage/postgres_index.cpp
index d2de80e06..eae13de59 100644
--- a/src/storage/postgres_index.cpp
+++ b/src/storage/postgres_index.cpp
@@ -20,7 +20,7 @@ PostgresCreateIndex::PostgresCreateIndex(PhysicalPlan &physical_plan, unique_ptr
 //===--------------------------------------------------------------------===//
 // Source
 //===--------------------------------------------------------------------===//
-SourceResultType PostgresCreateIndex::GetData(ExecutionContext &context, DataChunk &chunk,
+SourceResultType PostgresCreateIndex::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
                                               OperatorSourceInput &input) const {
 	auto &catalog = table.catalog;
 	auto &schema = table.schema;
diff --git a/src/storage/postgres_insert.cpp b/src/storage/postgres_insert.cpp
index e3961e4f9..385351df7 100644
--- a/src/storage/postgres_insert.cpp
+++ b/src/storage/postgres_insert.cpp
@@ -148,7 +148,7 @@ SinkFinalizeType PostgresInsert::Finalize(Pipeline &pipeline, Event &event, Clie
 //===--------------------------------------------------------------------===//
 // GetData
 //===--------------------------------------------------------------------===//
-SourceResultType PostgresInsert::GetData(ExecutionContext &context, DataChunk &chunk,
+SourceResultType PostgresInsert::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
                                          OperatorSourceInput &input) const {
 	auto &insert_gstate = sink_state->Cast<PostgresInsertGlobalState>();
 	chunk.SetCardinality(1);
diff --git a/src/storage/postgres_update.cpp b/src/storage/postgres_update.cpp
index 8c3b8a305..6a22b81b9 100644
--- a/src/storage/postgres_update.cpp
+++ b/src/storage/postgres_update.cpp
@@ -177,7 +177,7 @@ SinkFinalizeType PostgresUpdate::Finalize(Pipeline &pipeline, Event &event, Clie
 //===--------------------------------------------------------------------===//
 // GetData
 //===--------------------------------------------------------------------===//
-SourceResultType PostgresUpdate::GetData(ExecutionContext &context, DataChunk &chunk,
+SourceResultType PostgresUpdate::GetDataInternal(ExecutionContext &context, DataChunk &chunk,
                                          OperatorSourceInput &input) const {
 	auto &insert_gstate = sink_state->Cast<PostgresUpdateGlobalState>();
 	chunk.SetCardinality(1);
diff --git a/test/sql/storage/attach_types.test b/test/sql/storage/attach_types.test
index 687238b7b..9791a62a8 100644
--- a/test/sql/storage/attach_types.test
+++ b/test/sql/storage/attach_types.test
@@ -56,19 +56,19 @@ FROM test_all_types();
 statement ok
 CREATE OR REPLACE TABLE s.all_types AS FROM all_types_tbl
 
-query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 SELECT COLUMNS(*)::VARCHAR FROM all_types_tbl
 ----
-false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]	00:00:00
+true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]	24:00:00
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 
-query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 SELECT COLUMNS(*)::VARCHAR FROM s.all_types
 ----
-false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]	00:00:00
+true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]	24:00:00
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 
 # filter pushdown
 foreach column_name bool tinyint smallint int bigint utinyint usmallint uint date time timestamp timestamp_s timestamp_ms timestamp_ns time_tz timestamp_tz dec_4_1 dec_9_4 dec_18_6 dec38_10 uuid interval varchar blob bit small_enum medium_enum large_enum int_array double_array date_array timestamp_array timestamptz_array varchar_array
@@ -87,9 +87,9 @@ endloop
 statement ok
 SET pg_use_text_protocol=true;
 
-query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+query IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
 SELECT COLUMNS(*)::VARCHAR FROM s.all_types
 ----
-false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]
-NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
+false	-128	-32768	-2147483648	-9223372036854775808	0	0	0	2000-01-01	00:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	-999.9	-99999.9999	-999999999999.999999	-9999999999999999999999999999.9999999999	00000000-0000-0000-0000-000000000000	00:00:00	🦆🦆🦆🦆🦆🦆	thisisalongblob\x00withnullbytes	0010001001011100010101011010111	DUCK_DUCK_ENUM	enum_0	enum_0	[]	[]	[]	[]	[]	[🦆🦆🦆🦆🦆🦆, goose, NULL]	00:00:00
+true	127	32767	2147483647	9223372036854775807	255	65535	4294967295	2000-01-01	24:00:00	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	2000-01-01 01:02:03	00:00:00+15:00	2000-01-01 01:02:03	999.9	99999.9999	999999999999.999999	9999999999999999999999999999.9999999999	ffffffff-ffff-ffff-ffff-ffffffffffff	83 years 3 months 999 days 00:16:39.999999	goo se	\x00\x00\x00a	10101	GOOSE	enum_299	enum_69999	[42, 999, NULL, NULL, -42]	[42.0, nan, inf, -inf, NULL, -42.0]	[1970-01-01, infinity, -infinity, NULL, 2022-05-12]	['1970-01-01 00:00:00', infinity, -infinity, NULL, '2022-05-12 16:23:45']	['1970-01-01 00:00:00+00', infinity, -infinity, NULL, '2022-05-12 23:23:45+00']	[🦆🦆🦆🦆🦆🦆, goose, NULL]	24:00:00
+NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL