diff --git a/amazon-arm64-nix.pkr.hcl b/amazon-arm64-nix.pkr.hcl
index ec427ff9f..e460dfc72 100644
--- a/amazon-arm64-nix.pkr.hcl
+++ b/amazon-arm64-nix.pkr.hcl
@@ -228,11 +228,6 @@ build {
     destination = "/tmp"
   }
 
-  provisioner "file" {
-    source = "ebssurrogate/files/unit-tests"
-    destination = "/tmp"
-  }
-
   # Copy ansible playbook
   provisioner "shell" {
     inline = ["mkdir /tmp/ansible-playbook"]
diff --git a/ansible/tasks/test-image.yml b/ansible/tasks/test-image.yml
index c680ce68e..a0d3b2b78 100644
--- a/ansible/tasks/test-image.yml
+++ b/ansible/tasks/test-image.yml
@@ -1,9 +1,3 @@
-- name: install pg_prove
-  apt:
-    pkg:
-      - libtap-parser-sourcehandler-pgtap-perl
-  when: debpkg_mode
-
 # - name: Temporarily disable PG Sodium references in config
 #   become: yes
 #   become_user: postgres
@@ -16,9 +10,9 @@
   become_user: postgres
   shell:
     cmd: >
-      sed -i.bak 
-      -e 's/\(shared_preload_libraries = '\''.*\)pgsodium,\(.*'\''\)/\1\2/' 
-      -e 's/\(shared_preload_libraries = '\''.*\)supabase_vault,\(.*'\''\)/\1\2/' 
+      sed -i.bak
+      -e 's/\(shared_preload_libraries = '\''.*\)pgsodium,\(.*'\''\)/\1\2/'
+      -e 's/\(shared_preload_libraries = '\''.*\)supabase_vault,\(.*'\''\)/\1\2/'
       -e 's/\(shared_preload_libraries = '\''.*\), *supabase_vault'\''/\1'\''/'
       -e 's/pgsodium.getkey_script=/#pgsodium.getkey_script=/'
       /etc/postgresql/postgresql.conf
@@ -74,53 +68,6 @@
     LOCALE_ARCHIVE: /usr/lib/locale/locale-archive
   when: stage2_nix
 
-
-- name: Check psql_version and modify migrations if oriole-xx
-  block:
-    - name: Check if psql_version is psql_orioledb-xx
-      set_fact:
-        is_psql_oriole: "{{ psql_version in ['psql_orioledb-16', 'psql_orioledb-17'] }}"
-
-    - name: Remove specified extensions from SQL file
-      ansible.builtin.command:
-        cmd: >
-          sed -i '/\\ir.*\(timescaledb\|postgis\|pgrouting\|plv8\).*\.sql/d' /tmp/migrations/tests/extensions/test.sql
-      when: is_psql_oriole
-      become: yes
-
-    - name: Remove specified extension files from extensions directory
-      ansible.builtin.find:
-        paths: /tmp/migrations/tests/extensions
-        patterns: 
-          - '*timescaledb*.sql'
-          - '*plv8*.sql'
-          - '*postgis*.sql'
-          - '*pgrouting*.sql'
-      register: files_to_remove
-      when: is_psql_oriole
-
-    - name: Delete matched extension files
-      ansible.builtin.file:
-        path: "{{ item.path }}"
-        state: absent
-      loop: "{{ files_to_remove.files }}"
-      when: is_psql_oriole
-      become: yes
-
-- name: Run Unit tests (with filename unit-test-*) on Postgres Database
-  shell: /usr/bin/pg_prove -U postgres -h localhost -d postgres -v /tmp/unit-tests/unit-test-*.sql
-  register: retval
-  failed_when: retval.rc != 0
-  when: debpkg_mode or stage2_nix
-
-- name: Run migrations tests
-  shell: /usr/bin/pg_prove -U supabase_admin -h localhost -d postgres -v tests/test.sql
-  register: retval
-  failed_when: retval.rc != 0
-  when: debpkg_mode or stage2_nix
-  args:
-    chdir: /tmp/migrations
-
 - name: Re-enable PG Sodium references in config
   become: yes
   become_user: postgres
@@ -132,14 +79,6 @@
   shell: /usr/lib/postgresql/bin/psql --no-password --no-psqlrc -d postgres -h localhost -U supabase_admin -c 'SELECT pg_stat_statements_reset(); SELECT pg_stat_reset();'
   when: debpkg_mode or stage2_nix
 
-- name: remove pg_prove
-  apt:
-    pkg:
-      - libtap-parser-sourcehandler-pgtap-perl
-    state: absent
-    autoremove: yes
-  when: debpkg_mode
-
 - name: Stop Postgres Database
   become: yes
   become_user: postgres
diff --git a/ebssurrogate/files/unit-tests/unit-test-01.sql b/ebssurrogate/files/unit-tests/unit-test-01.sql
deleted file mode 100644
index c466af12e..000000000
--- a/ebssurrogate/files/unit-tests/unit-test-01.sql
+++ /dev/null
@@ -1,58 +0,0 @@
-BEGIN;
-CREATE EXTENSION IF NOT EXISTS pgtap;
-
-DO $$ 
-DECLARE
-    extension_array text[];
-    orioledb_available boolean;
-BEGIN
-    -- Check if orioledb is available
-    SELECT EXISTS (
-        SELECT 1 FROM pg_available_extensions WHERE name = 'orioledb'
-    ) INTO orioledb_available;
-
-    -- If available, create it and add to the expected extensions list
-    IF orioledb_available THEN
-        CREATE EXTENSION IF NOT EXISTS orioledb;
-        extension_array := ARRAY[
-            'plpgsql',
-            'pg_stat_statements',
-            'pgtap',
-            'pg_graphql',
-            'pgcrypto',
-            'pgjwt',
-            'uuid-ossp',
-            'supabase_vault',
-            'orioledb'
-        ];
-    ELSE
-        extension_array := ARRAY[
-            'plpgsql',
-            'pg_stat_statements',
-            'pgtap',
-            'pg_graphql',
-            'pgcrypto',
-            'pgjwt',
-            'uuid-ossp',
-            'supabase_vault'
-        ];
-    END IF;
-
-    -- Set the array as a temporary variable to use in the test
-    PERFORM set_config('myapp.extensions', array_to_string(extension_array, ','), false);
-END $$;
-
-SELECT no_plan();
-
-SELECT extensions_are(
-    string_to_array(current_setting('myapp.extensions'), ',')::text[]
-);
-
-
-SELECT has_schema('pg_toast');
-SELECT has_schema('pg_catalog');
-SELECT has_schema('information_schema');
-SELECT has_schema('public');
-
-SELECT * FROM finish();
-ROLLBACK;
diff --git a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
index b204b326a..39b8f4e82 100755
--- a/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
+++ b/ebssurrogate/scripts/surrogate-bootstrap-nix.sh
@@ -180,9 +180,6 @@ function setup_chroot_environment {
 	# Copy migrations
 	cp -r /tmp/migrations /mnt/tmp/
 
-	# Copy unit tests 
-	cp -r /tmp/unit-tests /mnt/tmp/
-
 	# Copy the bootstrap script into place and execute inside chroot
 	cp /tmp/chroot-bootstrap-nix.sh /mnt/tmp/chroot-bootstrap-nix.sh
 	chroot /mnt /tmp/chroot-bootstrap-nix.sh
diff --git a/flake.nix b/flake.nix
index b36ccda57..afbbb7c54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -807,6 +807,9 @@
                 exit 1
               fi
 
+              echo "Running migrations tests"
+              pg_prove -p 5435 -U supabase_admin -h localhost -d postgres -v ${./migrations/tests}/test.sql
+
               mkdir -p $out/regression_output
               if ! pg_regress \
                 --use-existing \
diff --git a/migrations/tests/extensions/01-postgis.sql b/migrations/tests/extensions/01-postgis.sql
index 23fab501c..6c3e154e3 100644
--- a/migrations/tests/extensions/01-postgis.sql
+++ b/migrations/tests/extensions/01-postgis.sql
@@ -1,43 +1,38 @@
-BEGIN;
-create extension if not exists postgis_sfcgal with schema "extensions" cascade;
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    -- create postgis tiger as supabase_admin
+    create extension if not exists postgis_tiger_geocoder cascade;
 
-BEGIN;
-create extension if not exists postgis_raster with schema "extensions" cascade;
-ROLLBACK;
+    -- \ir ansible/files/postgresql_extension_custom_scripts/postgis_tiger_geocoder/after-create.sql
+    grant usage on schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all tables in schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all routines in schema tiger, tiger_data to postgres with grant option;
+    grant all privileges on all sequences in schema tiger, tiger_data to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on tables to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on routines to postgres with grant option;
+    alter default privileges in schema tiger, tiger_data grant all on sequences to postgres with grant option;
+    SET search_path TO extensions, public, tiger, tiger_data;
+    -- postgres role should have access
+    set local role postgres;
+    perform tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
 
-BEGIN;
--- create postgis tiger as supabase_admin
-create extension if not exists address_standardizer with schema extensions;
-create extension if not exists postgis_tiger_geocoder cascade;
+    -- other roles can be granted access
+    grant usage on schema tiger, tiger_data to authenticated;
+    grant select on all tables in schema tiger, tiger_data to authenticated;
+    grant execute on all routines in schema tiger, tiger_data to authenticated;
 
--- \ir ansible/files/postgresql_extension_custom_scripts/postgis_tiger_geocoder/after-create.sql
-grant usage on schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all tables in schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all routines in schema tiger, tiger_data to postgres with grant option;
-grant all privileges on all sequences in schema tiger, tiger_data to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on tables to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on routines to postgres with grant option;
-alter default privileges in schema tiger, tiger_data grant all on sequences to postgres with grant option;
-SET search_path TO extensions, public, tiger, tiger_data;
--- postgres role should have access
-set local role postgres;
-select tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
+    -- authenticated role should have access now
+    set local role authenticated;
+    perform tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
+    reset role;
 
--- other roles can be granted access
-grant usage on schema tiger, tiger_data to authenticated;
-grant select on all tables in schema tiger, tiger_data to authenticated;
-grant execute on all routines in schema tiger, tiger_data to authenticated;
-
--- authenticated role should have access now
-set local role authenticated;
-select tiger.pprint_addy(tiger.pagc_normalize_address('710 E Ben White Blvd, Austin, TX 78704'));
-ROLLBACK;
-
-BEGIN;
--- address standardizer creates a table in extensions schema, owned by supabase_admin
-create extension if not exists address_standardizer_data_us with schema extensions;
--- postgres role should have access
-set local role postgres;
-select * from extensions.us_lex;
-ROLLBACK;
+    -- postgres role should have access to address_standardizer_data_us
+    set local role postgres;
+    perform 1 from us_lex;
+    reset role;
+  end if;
+end
+$_$;
+rollback;
diff --git a/migrations/tests/extensions/02-pgrouting.sql b/migrations/tests/extensions/02-pgrouting.sql
index 27dec0b55..f8d478657 100644
--- a/migrations/tests/extensions/02-pgrouting.sql
+++ b/migrations/tests/extensions/02-pgrouting.sql
@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists pgrouting with schema "extensions" cascade;
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists pgrouting with schema "extensions" cascade;
+  end if;
+end
+$_$;
+rollback;
diff --git a/migrations/tests/extensions/10-timescaledb.sql b/migrations/tests/extensions/10-timescaledb.sql
index acf32b8d2..2d787a8b8 100644
--- a/migrations/tests/extensions/10-timescaledb.sql
+++ b/migrations/tests/extensions/10-timescaledb.sql
@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists timescaledb with schema "extensions";
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists timescaledb with schema "extensions";
+  end if;
+end
+$_$;
+rollback;
diff --git a/migrations/tests/extensions/13-plv8.sql b/migrations/tests/extensions/13-plv8.sql
index a40792504..b19b908dc 100644
--- a/migrations/tests/extensions/13-plv8.sql
+++ b/migrations/tests/extensions/13-plv8.sql
@@ -1,3 +1,9 @@
-BEGIN;
-create extension if not exists plv8 with schema "pg_catalog";
-ROLLBACK;
+begin;
+do $_$
+begin
+  if not exists (select 1 from pg_extension where extname = 'orioledb') then
+    create extension if not exists plv8 with schema "pg_catalog";
+  end if;
+end
+$_$;
+rollback;
diff --git a/nix/docs/adding-new-package.md b/nix/docs/adding-new-package.md
index 30a85f7b5..6f7753953 100644
--- a/nix/docs/adding-new-package.md
+++ b/nix/docs/adding-new-package.md
@@ -131,7 +131,6 @@ buildPgrxExtension_0_11_3 rec {
   meta = with lib; {
     description = "JSON Schema Validation for PostgreSQL";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/hypopg.nix b/nix/ext/hypopg.nix
index 300a44900..ffafe904e 100644
--- a/nix/ext/hypopg.nix
+++ b/nix/ext/hypopg.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Hypothetical Indexes for PostgreSQL";
     homepage = "https://github.com/HypoPG/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/index_advisor.nix b/nix/ext/index_advisor.nix
index 3ed5a5fbc..ae23354b9 100644
--- a/nix/ext/index_advisor.nix
+++ b/nix/ext/index_advisor.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Recommend indexes to improve query performance in PostgreSQL";
     homepage = "https://github.com/olirice/index_advisor";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/mecab-naist-jdic/default.nix b/nix/ext/mecab-naist-jdic/default.nix
index d7ea6c541..82f0ed37c 100644
--- a/nix/ext/mecab-naist-jdic/default.nix
+++ b/nix/ext/mecab-naist-jdic/default.nix
@@ -21,21 +21,20 @@ stdenv.mkDerivation rec {
     ${mecab}/libexec/mecab/mecab-dict-index -d . -o . -f UTF-8 -t utf-8
     runHook postBuild
   '';
-  
+
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/lib/mecab/dic/naist-jdic
     cp *.dic *.bin *.def $out/lib/mecab/dic/naist-jdic/
-    
+
     runHook postInstall
   '';
-  
+
   meta = with lib; {
     description = "Naist Japanese Dictionary for MeCab";
     homepage = "https://taku910.github.io/mecab/";
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ samrose ];
   };
-}
\ No newline at end of file
+}
diff --git a/nix/ext/orioledb.nix b/nix/ext/orioledb.nix
index 856539d56..0e0ae9cdc 100644
--- a/nix/ext/orioledb.nix
+++ b/nix/ext/orioledb.nix
@@ -14,24 +14,23 @@ stdenv.mkDerivation rec {
   buildPhase = "make USE_PGXS=1 ORIOLEDB_PATCHSET_VERSION=5";
   installPhase = ''
     runHook preInstall
-    
+
     mkdir -p $out/{lib,share/postgresql/extension}
 
     # Copy the extension library
     cp orioledb${postgresql.dlSuffix} $out/lib/
-    
+
     # Copy sql files from the sql directory
     cp sql/*.sql $out/share/postgresql/extension/
-    
+
     # Copy control file
     cp orioledb.control $out/share/postgresql/extension/
-        
+
     runHook postInstall
   '';
   doCheck = true;
   meta = with lib; {
     description = "orioledb";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pg-safeupdate.nix b/nix/ext/pg-safeupdate.nix
index d24fab54a..f5ad17a82 100644
--- a/nix/ext/pg-safeupdate.nix
+++ b/nix/ext/pg-safeupdate.nix
@@ -24,6 +24,5 @@ stdenv.mkDerivation rec {
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
     broken      = versionOlder postgresql.version "14";
-    maintainers = with maintainers; [ samrose ];
   };
 }
diff --git a/nix/ext/pg_backtrace.nix b/nix/ext/pg_backtrace.nix
index 47ede88e2..0a0b0ae4f 100644
--- a/nix/ext/pg_backtrace.nix
+++ b/nix/ext/pg_backtrace.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Updated fork of pg_backtrace";
     homepage    = "https://github.com/pashkinelfe/pg_backtrace";
-    maintainers = with maintainers; [ samrose ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
   };
diff --git a/nix/ext/pg_cron.nix b/nix/ext/pg_cron.nix
index d51254aa2..792db7676 100644
--- a/nix/ext/pg_cron.nix
+++ b/nix/ext/pg_cron.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
     description = "Run Cron jobs through PostgreSQL";
     homepage    = "https://github.com/citusdata/pg_cron";
     changelog   = "https://github.com/citusdata/pg_cron/raw/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ samrose ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
   };
diff --git a/nix/ext/pg_graphql.nix b/nix/ext/pg_graphql.nix
index 54e500924..b1353d858 100644
--- a/nix/ext/pg_graphql.nix
+++ b/nix/ext/pg_graphql.nix
@@ -35,14 +35,13 @@ buildPgrxExtension_0_12_9 rec {
 CARGO_BUILD_RUSTFLAGS = "--cfg tokio_unstable -C debuginfo=0";
   CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG = true;
 
-  
+
   doCheck = false;
 
   meta = with lib; {
     description = "GraphQL support for PostreSQL";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
-}
\ No newline at end of file
+}
diff --git a/nix/ext/pg_hashids.nix b/nix/ext/pg_hashids.nix
index 50bff95da..828db60fb 100644
--- a/nix/ext/pg_hashids.nix
+++ b/nix/ext/pg_hashids.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Generate short unique IDs in PostgreSQL";
     homepage = "https://github.com/iCyberon/pg_hashids";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pg_jsonschema.nix b/nix/ext/pg_jsonschema.nix
index 50a2d3472..642519f08 100644
--- a/nix/ext/pg_jsonschema.nix
+++ b/nix/ext/pg_jsonschema.nix
@@ -66,8 +66,7 @@ buildPgrxExtension_0_12_6 rec {
   meta = with lib; {
     description = "JSON Schema Validation for PostgreSQL";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
-}
\ No newline at end of file
+}
diff --git a/nix/ext/pg_net.nix b/nix/ext/pg_net.nix
index 22be10893..0f20163e5 100644
--- a/nix/ext/pg_net.nix
+++ b/nix/ext/pg_net.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Async networking for Postgres";
     homepage = "https://github.com/supabase/pg_net";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pg_partman.nix b/nix/ext/pg_partman.nix
index 1ece63386..899716b44 100644
--- a/nix/ext/pg_partman.nix
+++ b/nix/ext/pg_partman.nix
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
     description = "Partition management extension for PostgreSQL";
     homepage    = "https://github.com/pgpartman/pg_partman";
     changelog   = "https://github.com/pgpartman/pg_partman/blob/v${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ samrose ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.postgresql;
     broken      = versionOlder postgresql.version "14";
diff --git a/nix/ext/pg_plan_filter.nix b/nix/ext/pg_plan_filter.nix
index 0ed527251..6281d0b67 100644
--- a/nix/ext/pg_plan_filter.nix
+++ b/nix/ext/pg_plan_filter.nix
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Filter PostgreSQL statements by execution plans";
     homepage = "https://github.com/pgexperts/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pg_regress.nix b/nix/ext/pg_regress.nix
index 6e581c475..08f82aa79 100644
--- a/nix/ext/pg_regress.nix
+++ b/nix/ext/pg_regress.nix
@@ -17,8 +17,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Regression testing tool for PostgreSQL";
     homepage = "https://www.postgresql.org/";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
-}
\ No newline at end of file
+}
diff --git a/nix/ext/pg_repack.nix b/nix/ext/pg_repack.nix
index 7b8a69593..076e878f2 100644
--- a/nix/ext/pg_repack.nix
+++ b/nix/ext/pg_repack.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/reorg/pg_repack";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ samrose ];
     inherit (postgresql.meta) platforms;
     mainProgram = "pg_repack";
   };
diff --git a/nix/ext/pg_stat_monitor.nix b/nix/ext/pg_stat_monitor.nix
index c3e91fe2b..8469f4b98 100644
--- a/nix/ext/pg_stat_monitor.nix
+++ b/nix/ext/pg_stat_monitor.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Query Performance Monitoring Tool for PostgreSQL";
     homepage = "https://github.com/percona/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
     broken = lib.versionOlder postgresql.version "15";
diff --git a/nix/ext/pg_tle.nix b/nix/ext/pg_tle.nix
index 0221d8768..a0e9385b2 100644
--- a/nix/ext/pg_tle.nix
+++ b/nix/ext/pg_tle.nix
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Framework for 'Trusted Language Extensions' in PostgreSQL";
     homepage = "https://github.com/aws/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pgaudit.nix b/nix/ext/pgaudit.nix
index 84fbf440d..01ab66f15 100644
--- a/nix/ext/pgaudit.nix
+++ b/nix/ext/pgaudit.nix
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
     description = "Open Source PostgreSQL Audit Logging";
     homepage = "https://github.com/pgaudit/pgaudit";
     changelog = "https://github.com/pgaudit/pgaudit/releases/tag/${source.version}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pgjwt.nix b/nix/ext/pgjwt.nix
index 2eb60f72e..4ecd76339 100644
--- a/nix/ext/pgjwt.nix
+++ b/nix/ext/pgjwt.nix
@@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.mit;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [samrose];
   };
 }
diff --git a/nix/ext/pgroonga.nix b/nix/ext/pgroonga.nix
index 7ebe84960..de0dedc93 100644
--- a/nix/ext/pgroonga.nix
+++ b/nix/ext/pgroonga.nix
@@ -74,6 +74,5 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/pgroonga/pgroonga/releases/tag/${version}";
     license = licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ samrose ];
   };
-}
\ No newline at end of file
+}
diff --git a/nix/ext/pgrouting.nix b/nix/ext/pgrouting.nix
index 5587566cd..3e898022f 100644
--- a/nix/ext/pgrouting.nix
+++ b/nix/ext/pgrouting.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation rec {
     description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality";
     homepage    = "https://pgrouting.org/";
     changelog   = "https://github.com/pgRouting/pgrouting/releases/tag/v${version}";
-    maintainers = with maintainers; [ steve-chavez samrose ];
     platforms   = postgresql.meta.platforms;
     license     = licenses.gpl2Plus;
   };
diff --git a/nix/ext/pgsodium.nix b/nix/ext/pgsodium.nix
index 4e184faa9..ec2979499 100644
--- a/nix/ext/pgsodium.nix
+++ b/nix/ext/pgsodium.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Modern cryptography for PostgreSQL";
     homepage = "https://github.com/michelp/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pgsql-http.nix b/nix/ext/pgsql-http.nix
index 03fc3e683..8b74f191b 100644
--- a/nix/ext/pgsql-http.nix
+++ b/nix/ext/pgsql-http.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "HTTP client for Postgres";
     homepage = "https://github.com/pramsey/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/pgtap.nix b/nix/ext/pgtap.nix
index c5a17c97f..159fec433 100644
--- a/nix/ext/pgtap.nix
+++ b/nix/ext/pgtap.nix
@@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
       as well as the ability to integrate with other TAP-emitting test frameworks.
       It can also be used in the xUnit testing style.
     '';
-    maintainers = with maintainers; [ samrose ];
     homepage = "https://pgtap.org";
     inherit (postgresql.meta) platforms;
     license = licenses.mit;
diff --git a/nix/ext/pljava.nix b/nix/ext/pljava.nix
index 16f8a59c3..51c5e1317 100644
--- a/nix/ext/pljava.nix
+++ b/nix/ext/pljava.nix
@@ -46,6 +46,5 @@ maven.buildMavenPackage rec {
     description = "PL/Java extension for PostgreSQL";
     homepage = https://github.com/tada/pljava;
     license = licenses.bsd3;
-    maintainers = [ maintainers.samrose ];  # Update with actual maintainer info
   };
 }
diff --git a/nix/ext/plv8.nix b/nix/ext/plv8.nix
index 340a07382..b3fd03e07 100644
--- a/nix/ext/plv8.nix
+++ b/nix/ext/plv8.nix
@@ -139,7 +139,6 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "V8 Engine Javascript Procedural Language add-on for PostgreSQL";
     homepage = "https://plv8.github.io/";
-    maintainers = with maintainers; [ samrose ];
     platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" "x86_64-darwin" ];
     license = licenses.postgresql;
   };
diff --git a/nix/ext/postgis.nix b/nix/ext/postgis.nix
index 2c8a36ce5..e5ccda443 100644
--- a/nix/ext/postgis.nix
+++ b/nix/ext/postgis.nix
@@ -81,7 +81,6 @@ postInstall = ''
     homepage = "https://postgis.net/";
     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ samrose ];
     inherit (postgresql.meta) platforms;
   };
 }
diff --git a/nix/ext/rum.nix b/nix/ext/rum.nix
index 1270f1ff1..574ef3d3a 100644
--- a/nix/ext/rum.nix
+++ b/nix/ext/rum.nix
@@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/postgrespro/rum";
     license = licenses.postgresql;
     platforms = postgresql.meta.platforms;
-    maintainers = with maintainers; [ samrose ];
   };
 }
diff --git a/nix/ext/sfcgal/sfcgal.nix b/nix/ext/sfcgal/sfcgal.nix
index 54d7b52cb..b1d5842f8 100644
--- a/nix/ext/sfcgal/sfcgal.nix
+++ b/nix/ext/sfcgal/sfcgal.nix
@@ -26,6 +26,5 @@ stdenv.mkDerivation rec {
     homepage = "https://sfcgal.gitlab.io/SFCGAL/";
     license = with licenses; [ gpl3Plus lgpl3Plus];
     platforms = platforms.all;
-    maintainers = with maintainers; [ samrose ];
   };
 }
diff --git a/nix/ext/timescaledb-2.9.1.nix b/nix/ext/timescaledb-2.9.1.nix
index ad955e86f..92d5d73fe 100644
--- a/nix/ext/timescaledb-2.9.1.nix
+++ b/nix/ext/timescaledb-2.9.1.nix
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
     homepage = "https://www.timescale.com/";
     changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.asl20;
     broken = versionOlder postgresql.version "13";
diff --git a/nix/ext/timescaledb.nix b/nix/ext/timescaledb.nix
index 1c87916be..1d7360762 100644
--- a/nix/ext/timescaledb.nix
+++ b/nix/ext/timescaledb.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space";
     homepage = "https://www.timescale.com/";
     changelog = "https://github.com/timescale/timescaledb/blob/${version}/CHANGELOG.md";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.asl20;
     broken = versionOlder postgresql.version "13";
diff --git a/nix/ext/vault.nix b/nix/ext/vault.nix
index 2cbd7e7a9..fcc1a9129 100644
--- a/nix/ext/vault.nix
+++ b/nix/ext/vault.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Store encrypted secrets in PostgreSQL";
     homepage = "https://github.com/supabase/${pname}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/ext/wal2json.nix b/nix/ext/wal2json.nix
index ed578c7fd..b1f532dcf 100644
--- a/nix/ext/wal2json.nix
+++ b/nix/ext/wal2json.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
     description = "PostgreSQL JSON output plugin for changeset extraction";
     homepage = "https://github.com/eulerto/wal2json";
     changelog = "https://github.com/eulerto/wal2json/releases/tag/wal2json_${version}";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.bsd3;
   };
diff --git a/nix/ext/wrappers/default.nix b/nix/ext/wrappers/default.nix
index e51589eb4..74810a342 100644
--- a/nix/ext/wrappers/default.nix
+++ b/nix/ext/wrappers/default.nix
@@ -157,7 +157,6 @@ buildPgrxExtension_0_12_9 rec {
   meta = with lib; {
     description = "Various Foreign Data Wrappers (FDWs) for PostreSQL";
     homepage = "https://github.com/supabase/wrappers";
-    maintainers = with maintainers; [ samrose ];
     platforms = postgresql.meta.platforms;
     license = licenses.postgresql;
   };
diff --git a/nix/supabase-groonga.nix b/nix/supabase-groonga.nix
index 410bab067..5035f369f 100644
--- a/nix/supabase-groonga.nix
+++ b/nix/supabase-groonga.nix
@@ -65,7 +65,6 @@ in stdenv.mkDerivation (finalAttrs: {
     homepage = "https://groonga.org/";
     description = "Open-source fulltext search engine and column store";
     license = licenses.lgpl21;
-    maintainers = [ maintainers.samrose ];
     platforms = platforms.all;
     longDescription = ''
       Groonga is an open-source fulltext search engine and column store.
diff --git a/nix/wal-g.nix b/nix/wal-g.nix
index 764b1c9e4..0e29fd272 100644
--- a/nix/wal-g.nix
+++ b/nix/wal-g.nix
@@ -60,7 +60,6 @@ let
         license = licenses.asl20;
         description = "Archival restoration tool for PostgreSQL";
         mainProgram = "wal-g-${majorVersion}";
-        maintainers = [ samrose ];
       };
     };
 in
diff --git a/qemu-arm64-nix.pkr.hcl b/qemu-arm64-nix.pkr.hcl
index a9843d1ad..192796205 100644
--- a/qemu-arm64-nix.pkr.hcl
+++ b/qemu-arm64-nix.pkr.hcl
@@ -122,11 +122,6 @@ build {
     destination = "/tmp"
   }
 
-  provisioner "file" {
-    source = "ebssurrogate/files/unit-tests"
-    destination = "/tmp"
-  }
-
   provisioner "shell" {
     environment_vars = [
       "POSTGRES_MAJOR_VERSION=${var.postgres-major-version}",
diff --git a/stage2-nix-psql.pkr.hcl b/stage2-nix-psql.pkr.hcl
index 2897ffd32..243e5e2e4 100644
--- a/stage2-nix-psql.pkr.hcl
+++ b/stage2-nix-psql.pkr.hcl
@@ -73,17 +73,17 @@ source "amazon-ebs" "ubuntu" {
     most_recent = true
     owners      = ["amazon", "self"]
   }
-  
+
   communicator = "ssh"
   ssh_pty = true
   ssh_username = "ubuntu"
   ssh_timeout = "5m"
-  
+
   associate_public_ip_address = true
 
 
   ena_support = true
-  
+
   run_tags = {
     creator           = "packer"
     appType           = "postgres"
@@ -126,16 +126,11 @@ build {
     destination = "/tmp"
   }
 
-  provisioner "file" {
-    source       = "ebssurrogate/files/unit-tests"
-    destination  = "/tmp/unit-tests"
-  }
-
   provisioner "file" {
     source = "scripts"
     destination = "/tmp/ansible-playbook"
   }
-  
+
   provisioner "shell" {
     environment_vars = [
       "GIT_SHA=${var.git_sha}",
@@ -143,5 +138,5 @@ build {
     ]
      script = "scripts/nix-provision.sh"
   }
-  
+
 }