diff --git a/apps/web/codegen.yml b/apps/web/codegen.yml
index 8e1b0e2e..f29c23f6 100644
--- a/apps/web/codegen.yml
+++ b/apps/web/codegen.yml
@@ -1,4 +1,4 @@
-schema: https://api.goldsky.com/api/public/project_clkk1ucdyf6ak38svcatie9tf/subgraphs/nouns-builder-goerli-testnet/1.1.0/gn
+schema: https://api.goldsky.com/api/public/project_clkk1ucdyf6ak38svcatie9tf/subgraphs/nouns-builder-ethereum-mainnet/1.1.0/gn
 documents: 'src/data/subgraph/**/*.graphql'
 generates:
   src/data/subgraph/sdk.generated.ts:
diff --git a/apps/web/src/data/subgraph/queries/daoMembersList.graphql b/apps/web/src/data/subgraph/queries/daoMembersList.graphql
index adf692a3..823725f2 100644
--- a/apps/web/src/data/subgraph/queries/daoMembersList.graphql
+++ b/apps/web/src/data/subgraph/queries/daoMembersList.graphql
@@ -15,7 +15,7 @@ query daoMembersList(
     id
     owner
     daoTokenCount
-    daoTokens {
+    daoTokens(first: $first) {
       tokenId
       mintedAt
     }
diff --git a/apps/web/src/data/subgraph/queries/daoMetadata.graphql b/apps/web/src/data/subgraph/queries/daoMetadata.graphql
index f45ded5d..6f16aa32 100644
--- a/apps/web/src/data/subgraph/queries/daoMetadata.graphql
+++ b/apps/web/src/data/subgraph/queries/daoMetadata.graphql
@@ -4,7 +4,7 @@ query daoMetadata($tokenAddress: ID!, $first: Int!) {
       ipfsBaseUri
       ipfsExtension
       names
-      items(orderBy: propertyId, first: $first) {
+      items(orderBy: index, first: $first) {
         name
         propertyId
         isNewProperty
diff --git a/apps/web/src/data/subgraph/requests/memberSnapshot.ts b/apps/web/src/data/subgraph/requests/memberSnapshot.ts
index eda10d3b..f456fd70 100644
--- a/apps/web/src/data/subgraph/requests/memberSnapshot.ts
+++ b/apps/web/src/data/subgraph/requests/memberSnapshot.ts
@@ -17,6 +17,7 @@ export const memberSnapshotRequest = async (
     where: {
       dao: collectionAddress.toLowerCase(),
     },
+    first: 1000,
     orderBy: DaoTokenOwner_OrderBy.DaoTokenCount,
     orderDirection: OrderDirection.Desc,
   })
diff --git a/apps/web/src/data/subgraph/sdk.generated.ts b/apps/web/src/data/subgraph/sdk.generated.ts
index d3b619e0..f8b49f92 100644
--- a/apps/web/src/data/subgraph/sdk.generated.ts
+++ b/apps/web/src/data/subgraph/sdk.generated.ts
@@ -844,6 +844,7 @@ export enum Dao_OrderBy {
 export type MetadataItem = {
   __typename?: 'MetadataItem'
   id: Scalars['ID']
+  index: Scalars['Int']
   isNewProperty: Scalars['Boolean']
   name: Scalars['String']
   propertyId: Scalars['BigInt']
@@ -862,6 +863,14 @@ export type MetadataItem_Filter = {
   id_lte?: InputMaybe<Scalars['ID']>
   id_not?: InputMaybe<Scalars['ID']>
   id_not_in?: InputMaybe<Array<Scalars['ID']>>
+  index?: InputMaybe<Scalars['Int']>
+  index_gt?: InputMaybe<Scalars['Int']>
+  index_gte?: InputMaybe<Scalars['Int']>
+  index_in?: InputMaybe<Array<Scalars['Int']>>
+  index_lt?: InputMaybe<Scalars['Int']>
+  index_lte?: InputMaybe<Scalars['Int']>
+  index_not?: InputMaybe<Scalars['Int']>
+  index_not_in?: InputMaybe<Array<Scalars['Int']>>
   isNewProperty?: InputMaybe<Scalars['Boolean']>
   isNewProperty_in?: InputMaybe<Array<Scalars['Boolean']>>
   isNewProperty_not?: InputMaybe<Scalars['Boolean']>
@@ -920,6 +929,7 @@ export type MetadataItem_Filter = {
 
 export enum MetadataItem_OrderBy {
   Id = 'id',
+  Index = 'index',
   IsNewProperty = 'isNewProperty',
   Name = 'name',
   PropertyId = 'propertyId',
@@ -2890,7 +2900,7 @@ export const DaoMetadataDocument = gql`
         ipfsBaseUri
         ipfsExtension
         names
-        items(orderBy: propertyId, first: $first) {
+        items(orderBy: index, first: $first) {
           name
           propertyId
           isNewProperty
diff --git a/apps/web/src/modules/create-proposal/hooks/usePrepareMigration.tsx b/apps/web/src/modules/create-proposal/hooks/usePrepareMigration.tsx
index e3fc8d4c..3850e114 100644
--- a/apps/web/src/modules/create-proposal/hooks/usePrepareMigration.tsx
+++ b/apps/web/src/modules/create-proposal/hooks/usePrepareMigration.tsx
@@ -134,7 +134,7 @@ const prepareTransactions = ({
   const { founderParams, tokenParams, auctionParams, govParams } = currentDAOConfig!
 
   const delayedGovernanceAmount = 0n
-  const minimumMetadataCalls = 0n
+  const minimumMetadataCalls = BigInt(encodedMetadata.length)
 
   const deployerParams = encodeFunctionData({
     abi: L2DeployerABI,