diff --git a/database/migration/src/main/resources/changelog.xml b/database/migration/src/main/resources/changelog.xml
index 49d568766b3..09c613bd24b 100644
--- a/database/migration/src/main/resources/changelog.xml
+++ b/database/migration/src/main/resources/changelog.xml
@@ -93,6 +93,11 @@
     <!-- REMINDER!
       Before appending here, did you remember to include the 'objectQuotingStrategy="QUOTE_ALL_OBJECTS"' line in your changeset/xyz.xml...?
     -->
+    <!-- WARNING!
+      This changeset should always be last. It it always run (and should always run last) to set table ownership correctly:
+    -->
+    <include file="changesets/set_table_role.xml" relativeToChangelogFile="true" />
+
 
 </databaseChangeLog>
 <!--
diff --git a/database/migration/src/main/resources/metadata_changesets/init_role.xml b/database/migration/src/main/resources/changesets/set_table_role.xml
similarity index 88%
rename from database/migration/src/main/resources/metadata_changesets/init_role.xml
rename to database/migration/src/main/resources/changesets/set_table_role.xml
index 89ae793ff9f..d846b4d3081 100644
--- a/database/migration/src/main/resources/metadata_changesets/init_role.xml
+++ b/database/migration/src/main/resources/changesets/set_table_role.xml
@@ -11,7 +11,7 @@
         This changeset will be applied whenever the 'sharedCromwellDbRole' property is set.
         It runs every time to ensure the role is set correctly before any other changesets.
      -->
-    <changeSet runAlways="true" author="sshah" id="init_role" dbms="postgresql">
+    <changeSet runAlways="true" author="sshah" id="set_table_role" dbms="postgresql">
         <preConditions onFail="MARK_RAN">
             <!-- check that 'sharedCromwellDbRole' role is set, and matches something in the pg_roles table -->
             <sqlCheck expectedResult="1">
@@ -20,7 +20,7 @@
                 where '${sharedCromwellDbRole}' != '' and pg_roles.rolname = '${sharedCromwellDbRole}';
             </sqlCheck>
         </preConditions>
-        <sql>SET ROLE TO ${sharedCromwellDbRole};</sql>
+        <sql>REASSIGN OWNED BY CURRENT_USER TO ${sharedCromwellDbRole};</sql>
     </changeSet>
 
 </databaseChangeLog>
diff --git a/database/migration/src/main/resources/metadata_changesets/set_table_role.xml b/database/migration/src/main/resources/metadata_changesets/set_table_role.xml
new file mode 120000
index 00000000000..8437e311cb2
--- /dev/null
+++ b/database/migration/src/main/resources/metadata_changesets/set_table_role.xml
@@ -0,0 +1 @@
+../changesets/set_table_role.xml
\ No newline at end of file
diff --git a/database/migration/src/main/resources/sql_metadata_changelog.xml b/database/migration/src/main/resources/sql_metadata_changelog.xml
index 17c1a87eb98..e1f8c93e4bb 100644
--- a/database/migration/src/main/resources/sql_metadata_changelog.xml
+++ b/database/migration/src/main/resources/sql_metadata_changelog.xml
@@ -3,7 +3,6 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
 
-    <include file="metadata_changesets/init_role.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/move_sql_metadata_changelog.xml" relativeToChangelogFile="true" />
     <include file="changesets/change_max_size_label_entry.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/delete_duplicate_custom_labels.xml" relativeToChangelogFile="true"/>
@@ -20,5 +19,10 @@
     <include file="metadata_changesets/remove_non_summarizable_metadata_from_queue.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/update_metadata_archive_index.xml" relativeToChangelogFile="true" />
     <include file="metadata_changesets/reset_archive_statuses_to_null.xml" relativeToChangelogFile="true" />
+    <!-- WARNING!
+      This changeset should always be last. It it always run (and should always run last) to set table ownership correctly:
+    -->
+    <include file="metadata_changesets/set_table_role.xml" relativeToChangelogFile="true" />
+
 </databaseChangeLog>
 <!-- See Dos and Don'ts in changelog.xml -->