diff --git a/package-lock.json b/package-lock.json
index 543455944..9651fc310 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@dnd-kit/sortable": "8.0.0",
         "@dnd-kit/utilities": "3.2.2",
         "@faker-js/faker": "7.6.0",
-        "@iqss/dataverse-client-javascript": "2.0.0-alpha.67",
+        "@iqss/dataverse-client-javascript": "2.0.0-alpha.75",
         "@iqss/dataverse-design-system": "*",
         "@istanbuljs/nyc-config-typescript": "1.0.2",
         "@tanstack/react-table": "8.9.2",
@@ -81,7 +81,7 @@
         "babel-plugin-named-exports-order": "0.0.2",
         "chai": "4.3.7",
         "chai-as-promised": "7.1.1",
-        "chromatic": "^13.3.0",
+        "chromatic": "13.3.0",
         "concurrently": "8.0.1",
         "cypress": "15.2.0",
         "cypress-vite": "1.4.0",
@@ -1954,14 +1954,14 @@
     },
     "node_modules/@iqss/dataverse-client-javascript": {
       "name": "@IQSS/dataverse-client-javascript",
-      "version": "2.0.0-alpha.67",
-      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-alpha.67/0ee4f1c8e03eb3ef688d6b034e84003c9e155d3b",
-      "integrity": "sha512-uEAGtwXz7LYkBfWCBRktgb5d8oba6yPH9YWnVFhI40UqgdB1sQ/WWCDhZTn5LFsaQY+1XBzOoTjwrQ2HGz94og==",
+      "version": "2.0.0-alpha.75",
+      "resolved": "https://npm.pkg.github.com/download/@IQSS/dataverse-client-javascript/2.0.0-alpha.75/7c205be675dd5b0bd2def5ede62f69c7b031c38f",
+      "integrity": "sha512-V/NZXUMCJF9K9p31EXd7EU5WSXmS4X7El2TNs0IdiVvh/oeQKXQkdmqQg8BJNC/LS/oVq6ytUT3PPl4Trjfqlw==",
       "license": "MIT",
       "dependencies": {
         "@types/node": "^18.15.11",
         "@types/turndown": "^5.0.1",
-        "axios": "^1.7.2",
+        "axios": "^1.12.2",
         "turndown": "^7.1.2",
         "typescript": "^4.9.5"
       }
@@ -30401,7 +30401,7 @@
         "@testing-library/cypress": "10.1.0",
         "@vitejs/plugin-react": "4.3.1",
         "axe-playwright": "1.2.3",
-        "chromatic": "^13.3.0",
+        "chromatic": "13.3.0",
         "cypress": "15.2.0",
         "react": "18.2.0",
         "vite": "5.4.20",
diff --git a/package.json b/package.json
index 34008bc0b..9fdf1297a 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
     "@dnd-kit/sortable": "8.0.0",
     "@dnd-kit/utilities": "3.2.2",
     "@faker-js/faker": "7.6.0",
-    "@iqss/dataverse-client-javascript": "2.0.0-alpha.67",
+    "@iqss/dataverse-client-javascript": "2.0.0-alpha.75",
     "@iqss/dataverse-design-system": "*",
     "@istanbuljs/nyc-config-typescript": "1.0.2",
     "@tanstack/react-table": "8.9.2",
diff --git a/public/locales/en/header.json b/public/locales/en/header.json
index eef91ae01..dd4e57783 100644
--- a/public/locales/en/header.json
+++ b/public/locales/en/header.json
@@ -8,6 +8,7 @@
     "addData": "Add Data",
     "newCollection": "New Collection",
     "newDataset": "New Dataset",
+    "newReview": "New Review",
     "accountInfo": "Account Information",
     "apiToken": "API Token",
     "myData": "My Data"
diff --git a/src/dataset/domain/hooks/useGetAvailableDatasetTypes.ts b/src/dataset/domain/hooks/useGetAvailableDatasetTypes.ts
new file mode 100644
index 000000000..16f6e34bd
--- /dev/null
+++ b/src/dataset/domain/hooks/useGetAvailableDatasetTypes.ts
@@ -0,0 +1,56 @@
+import { useCallback, useEffect, useState } from 'react'
+import { ReadError } from '@iqss/dataverse-client-javascript'
+import { JSDataverseReadErrorHandler } from '@/shared/helpers/JSDataverseReadErrorHandler'
+import { DatasetRepository } from '../repositories/DatasetRepository'
+import { getAvailableDatasetTypes } from '../useCases/getAvailableDatasetTypes'
+import { DatasetType } from '../models/DatasetType'
+
+interface useGetAvailableDatasetTypesProps {
+  datasetRepository: DatasetRepository
+  autoFetch?: boolean
+}
+
+export const useGetAvailableDatasetTypes = ({
+  datasetRepository,
+  autoFetch = true
+}: useGetAvailableDatasetTypesProps) => {
+  const [datasetTypes, setDatasetTypes] = useState<DatasetType[]>([])
+  const [isLoadingDatasetTypes, setIsLoadingDatasetTypes] = useState<boolean>(autoFetch)
+  const [errorGetDatasetTypes, setErrorGetDatasetTypes] = useState<string | null>(null)
+
+  const fetchDatasetTypes = useCallback(async () => {
+    setIsLoadingDatasetTypes(true)
+    setErrorGetDatasetTypes(null)
+
+    try {
+      const response: DatasetType[] = await getAvailableDatasetTypes(datasetRepository)
+
+      setDatasetTypes(response)
+    } catch (err) {
+      if (err instanceof ReadError) {
+        const error = new JSDataverseReadErrorHandler(err)
+        const formattedError =
+          error.getReasonWithoutStatusCode() ?? /* istanbul ignore next */ error.getErrorMessage()
+
+        setErrorGetDatasetTypes(formattedError)
+      } else {
+        setErrorGetDatasetTypes('Something went wrong getting the dataset types. Try again later.')
+      }
+    } finally {
+      setIsLoadingDatasetTypes(false)
+    }
+  }, [datasetRepository])
+
+  useEffect(() => {
+    if (autoFetch) {
+      void fetchDatasetTypes()
+    }
+  }, [autoFetch, fetchDatasetTypes])
+
+  return {
+    datasetTypes,
+    isLoadingDatasetTypes,
+    errorGetDatasetTypes,
+    fetchDatasetTypes
+  }
+}
diff --git a/src/dataset/domain/models/Dataset.ts b/src/dataset/domain/models/Dataset.ts
index 30e10ea5f..b5e8f9e8d 100644
--- a/src/dataset/domain/models/Dataset.ts
+++ b/src/dataset/domain/models/Dataset.ts
@@ -430,7 +430,8 @@ export class Dataset {
     public readonly nextMajorVersion?: string,
     public readonly nextMinorVersion?: string,
     public readonly requiresMajorVersionUpdate?: boolean,
-    public readonly fileStore?: string
+    public readonly fileStore?: string,
+    public readonly datasetType?: string
   ) {}
 
   public checkIsLockedFromPublishing(userPersistentId: string): boolean {
@@ -525,7 +526,8 @@ export class Dataset {
       public readonly nextMajorVersionNumber?: string,
       public readonly nextMinorVersionNumber?: string,
       public readonly requiresMajorVersionUpdate?: boolean,
-      public readonly fileStore?: string
+      public readonly fileStore?: string,
+      public readonly datasetType?: string
     ) {
       this.withAlerts()
     }
@@ -597,7 +599,8 @@ export class Dataset {
         this.nextMajorVersionNumber,
         this.nextMinorVersionNumber,
         this.requiresMajorVersionUpdate,
-        this.fileStore
+        this.fileStore,
+        this.datasetType
       )
     }
   }
diff --git a/src/dataset/domain/models/DatasetType.ts b/src/dataset/domain/models/DatasetType.ts
new file mode 100644
index 000000000..56a5ed436
--- /dev/null
+++ b/src/dataset/domain/models/DatasetType.ts
@@ -0,0 +1,6 @@
+export interface DatasetType {
+  id?: number
+  name: string
+  linkedMetadataBlocks?: string[]
+  availableLicenses?: string[]
+}
diff --git a/src/dataset/domain/repositories/DatasetRepository.ts b/src/dataset/domain/repositories/DatasetRepository.ts
index b87314506..27942a941 100644
--- a/src/dataset/domain/repositories/DatasetRepository.ts
+++ b/src/dataset/domain/repositories/DatasetRepository.ts
@@ -9,6 +9,7 @@ import { DatasetDeaccessionDTO } from '../useCases/DTOs/DatasetDTO'
 import { DatasetDownloadCount } from '../models/DatasetDownloadCount'
 import { FormattedCitation, CitationFormat } from '../models/DatasetCitation'
 import { DatasetTemplate } from '../models/DatasetTemplate'
+import { DatasetType } from '../models/DatasetType'
 
 export interface DatasetRepository {
   getByPersistentId: (
@@ -26,7 +27,11 @@ export interface DatasetRepository {
     includeDeaccessioned: boolean
   ) => Promise<DatasetVersionDiff>
 
-  create: (dataset: DatasetDTO, collectionId: string) => Promise<{ persistentId: string }>
+  create: (
+    dataset: DatasetDTO,
+    collectionId: string,
+    datasetType?: string
+  ) => Promise<{ persistentId: string }>
   updateMetadata: (
     datasetId: string | number,
     datasetDTO: DatasetDTO,
@@ -55,5 +60,6 @@ export interface DatasetRepository {
     version: string,
     format: CitationFormat
   ) => Promise<FormattedCitation>
+  getAvailableDatasetTypes: () => Promise<DatasetType[]>
   getTemplates: (collectionIdOrAlias: number | string) => Promise<DatasetTemplate[]>
 }
diff --git a/src/dataset/domain/useCases/createDataset.ts b/src/dataset/domain/useCases/createDataset.ts
index abe0a943f..bc231855c 100644
--- a/src/dataset/domain/useCases/createDataset.ts
+++ b/src/dataset/domain/useCases/createDataset.ts
@@ -4,9 +4,10 @@ import { DatasetDTO } from './DTOs/DatasetDTO'
 export function createDataset(
   datasetRepository: DatasetRepository,
   dataset: DatasetDTO,
-  collectionId: string
+  collectionId: string,
+  datasetType?: string
 ): Promise<{ persistentId: string }> {
-  return datasetRepository.create(dataset, collectionId).catch((error: Error) => {
+  return datasetRepository.create(dataset, collectionId, datasetType).catch((error: Error) => {
     throw new Error(error.message)
   })
 }
diff --git a/src/dataset/domain/useCases/getAvailableDatasetTypes.ts b/src/dataset/domain/useCases/getAvailableDatasetTypes.ts
new file mode 100644
index 000000000..926a42f58
--- /dev/null
+++ b/src/dataset/domain/useCases/getAvailableDatasetTypes.ts
@@ -0,0 +1,8 @@
+import { DatasetRepository } from '../repositories/DatasetRepository'
+import { DatasetType } from '@iqss/dataverse-client-javascript'
+
+export function getAvailableDatasetTypes(
+  datasetRepository: DatasetRepository
+): Promise<DatasetType[]> {
+  return datasetRepository.getAvailableDatasetTypes()
+}
diff --git a/src/dataset/infrastructure/mappers/JSDatasetMapper.ts b/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
index edb9d5a70..5f020b410 100644
--- a/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
+++ b/src/dataset/infrastructure/mappers/JSDatasetMapper.ts
@@ -49,7 +49,8 @@ export class JSDatasetMapper {
     latestPublishedVersionMajorNumber?: number,
     latestPublishedVersionMinorNumber?: number,
     datasetVersionDiff?: JSDatasetVersionDiff,
-    fileStore?: string
+    fileStore?: string,
+    datasetType?: string
   ): Dataset {
     const version = JSDatasetVersionMapper.toVersion(
       jsDataset.versionId,
@@ -99,7 +100,8 @@ export class JSDatasetMapper {
         latestPublishedVersionMinorNumber
       ),
       JSDatasetMapper.toRequiresMajorVersionUpdate(datasetVersionDiff),
-      fileStore
+      fileStore,
+      datasetType
     ).build()
   }
 
diff --git a/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts b/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
index 8d7d73d51..08badfaa2 100644
--- a/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
+++ b/src/dataset/infrastructure/repositories/DatasetJSDataverseRepository.ts
@@ -34,7 +34,9 @@ import {
   deleteDatasetDraft,
   getDatasetCitationInOtherFormats,
   getDatasetAvailableCategories,
-  getDatasetTemplates
+  getDatasetTemplates,
+  getDatasetAvailableDatasetTypes,
+  DatasetType
 } from '@iqss/dataverse-client-javascript'
 import { JSDatasetMapper } from '../mappers/JSDatasetMapper'
 import { DatasetPaginationInfo } from '../../domain/models/DatasetPaginationInfo'
@@ -254,7 +256,8 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
           datasetDetails.latestPublishedVersionMajorNumber,
           datasetDetails.latestPublishedVersionMinorNumber,
           datasetDetails.datasetVersionDiff,
-          datasetDetails.fileStore
+          datasetDetails.fileStore,
+          datasetDetails.jsDataset.datasetType
         )
       })
       .catch((error: ReadError) => {
@@ -312,9 +315,13 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
       })
   }
 
-  create(dataset: DatasetDTO, collectionId: string): Promise<{ persistentId: string }> {
+  create(
+    dataset: DatasetDTO,
+    collectionId: string,
+    datasetType?: string
+  ): Promise<{ persistentId: string }> {
     return createDataset
-      .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId)
+      .execute(DatasetDTOMapper.toJSDatasetDTO(dataset), collectionId, datasetType)
       .then((jsDatasetIdentifiers: JSDatasetIdentifiers) => ({
         persistentId: jsDatasetIdentifiers.persistentId
       }))
@@ -397,6 +404,9 @@ export class DatasetJSDataverseRepository implements DatasetRepository {
   getAvailableCategories(datasetId: string | number): Promise<string[]> {
     return getDatasetAvailableCategories.execute(datasetId)
   }
+  getAvailableDatasetTypes(): Promise<DatasetType[]> {
+    return getDatasetAvailableDatasetTypes.execute()
+  }
 
   getTemplates(collectionIdOrAlias: number | string): Promise<DatasetTemplate[]> {
     return getDatasetTemplates.execute(collectionIdOrAlias)
diff --git a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
index 4b5044051..95553cf0e 100644
--- a/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
+++ b/src/metadata-block-info/domain/repositories/MetadataBlockInfoRepository.ts
@@ -8,8 +8,13 @@ export interface MetadataBlockInfoRepository {
   getByName: (name: string) => Promise<MetadataBlockInfoDisplayFormat | undefined>
   getAll: () => Promise<MetadataBlockInfo[]>
   getDisplayedOnCreateByCollectionId: (
-    collectionId: number | string
+    collectionId: number | string,
+    datasetType?: string
+  ) => Promise<MetadataBlockInfo[]>
+  getByCollectionId: (
+    collectionId: number | string,
+    onlyDisplayedOnCreate?: boolean,
+    datasetType?: string
   ) => Promise<MetadataBlockInfo[]>
-  getByCollectionId: (collectionId: number | string) => Promise<MetadataBlockInfo[]>
   getAllFacetableMetadataFields: () => Promise<MetadataField[]>
 }
diff --git a/src/metadata-block-info/domain/useCases/getDisplayedOnCreateMetadataBlockInfoByCollectionId.ts b/src/metadata-block-info/domain/useCases/getDisplayedOnCreateMetadataBlockInfoByCollectionId.ts
index 3fede920f..da9c676c8 100644
--- a/src/metadata-block-info/domain/useCases/getDisplayedOnCreateMetadataBlockInfoByCollectionId.ts
+++ b/src/metadata-block-info/domain/useCases/getDisplayedOnCreateMetadataBlockInfoByCollectionId.ts
@@ -3,10 +3,11 @@ import { MetadataBlockInfoRepository } from '../repositories/MetadataBlockInfoRe
 
 export async function getDisplayedOnCreateMetadataBlockInfoByCollectionId(
   metadataBlockInfoRepository: MetadataBlockInfoRepository,
-  collectionId: number | string
+  collectionId: number | string,
+  datasetType?: string
 ): Promise<MetadataBlockInfo[]> {
   return metadataBlockInfoRepository
-    .getDisplayedOnCreateByCollectionId(collectionId)
+    .getDisplayedOnCreateByCollectionId(collectionId, datasetType)
     .catch((error: Error) => {
       throw new Error(error.message)
     })
diff --git a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
index ab3fba345..5fe7becdf 100644
--- a/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
+++ b/src/metadata-block-info/domain/useCases/getMetadataBlockInfoByCollectionId.ts
@@ -3,9 +3,13 @@ import { MetadataBlockInfoRepository } from '../repositories/MetadataBlockInfoRe
 
 export async function getMetadataBlockInfoByCollectionId(
   metadataBlockInfoRepository: MetadataBlockInfoRepository,
-  collectionId: number | string
+  collectionId: number | string,
+  onlyDisplayedOnCreate?: boolean,
+  datasetType?: string
 ): Promise<MetadataBlockInfo[]> {
-  return metadataBlockInfoRepository.getByCollectionId(collectionId).catch((error: Error) => {
-    throw new Error(error.message)
-  })
+  return metadataBlockInfoRepository
+    .getByCollectionId(collectionId, onlyDisplayedOnCreate, datasetType)
+    .catch((error: Error) => {
+      throw new Error(error.message)
+    })
 }
diff --git a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
index baa46e3d3..fb49676da 100644
--- a/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
+++ b/src/metadata-block-info/infrastructure/repositories/MetadataBlockInfoJSDataverseRepository.ts
@@ -37,9 +37,13 @@ export class MetadataBlockInfoJSDataverseRepository implements MetadataBlockInfo
       })
   }
 
-  getByCollectionId(collectionIdOrAlias: number | string): Promise<MetadataBlockInfo[]> {
+  getByCollectionId(
+    collectionIdOrAlias: number | string,
+    onlyDisplayedOnCreate?: boolean,
+    datasetType?: string
+  ): Promise<MetadataBlockInfo[]> {
     return getCollectionMetadataBlocks
-      .execute(collectionIdOrAlias)
+      .execute(collectionIdOrAlias, onlyDisplayedOnCreate, datasetType)
       .then((metadataBlocks: MetadataBlockInfo[]) => {
         return metadataBlocks
       })
@@ -49,12 +53,23 @@ export class MetadataBlockInfoJSDataverseRepository implements MetadataBlockInfo
   }
 
   getDisplayedOnCreateByCollectionId(
-    collectionIdOrAlias: number | string
+    collectionIdOrAlias: number | string,
+    datasetType?: string
   ): Promise<MetadataBlockInfo[]> {
     return getCollectionMetadataBlocks
-      .execute(collectionIdOrAlias, true)
+      .execute(collectionIdOrAlias, true, datasetType)
       .then((metadataBlocks: MetadataBlockInfo[]) => {
-        return metadataBlocks
+        const metadataBlocksWithFields: MetadataBlockInfo[] = []
+        metadataBlocks.forEach((block) => {
+          const numFields = Object.keys(block.metadataFields).length
+          // numFields can be zero if you pass a datasetType that's linked to
+          // a metadata block that doesn't have any fields set to displayOnCreate.
+          // See https://github.com/IQSS/dataverse/blob/v6.7.1/src/test/java/edu/harvard/iq/dataverse/api/DatasetTypesIT.java#L512
+          if (numFields > 0) {
+            metadataBlocksWithFields.push(block)
+          }
+        })
+        return metadataBlocksWithFields
       })
       .catch((error: ReadError) => {
         throw new Error(error.message)
diff --git a/src/sections/Route.enum.ts b/src/sections/Route.enum.ts
index d7d64fb7a..7bda291c6 100644
--- a/src/sections/Route.enum.ts
+++ b/src/sections/Route.enum.ts
@@ -79,6 +79,7 @@ export enum QueryParamKey {
   TAB = 'tab',
   FILE_ID = 'id',
   DATASET_VERSION = 'datasetVersion',
+  DATASET_TYPE = 'datasetType',
   REFERRER = 'referrer',
   AUTH_STATE = 'state',
   VALID_TOKEN_BUT_NOT_LINKED_ACCOUNT = 'validTokenButNotLinkedAccount',
diff --git a/src/sections/collection/Collection.tsx b/src/sections/collection/Collection.tsx
index 7dc0f5c27..1ed9aaedc 100644
--- a/src/sections/collection/Collection.tsx
+++ b/src/sections/collection/Collection.tsx
@@ -22,6 +22,7 @@ import { CollectionHelper } from './CollectionHelper'
 import { ContactRepository } from '@/contact/domain/repositories/ContactRepository'
 import { NotFoundPage } from '../not-found-page/NotFoundPage'
 import styles from './Collection.module.scss'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 
 interface CollectionProps {
   collectionRepository: CollectionRepository
@@ -31,6 +32,7 @@ interface CollectionProps {
   accountCreated: boolean
   infiniteScrollEnabled?: boolean
   contactRepository: ContactRepository
+  datasetRepository: DatasetRepository
 }
 
 export function Collection({
@@ -39,7 +41,8 @@ export function Collection({
   created,
   collectionQueryParams,
   contactRepository,
-  accountCreated
+  accountCreated,
+  datasetRepository
 }: CollectionProps) {
   useScrollTop()
   const { previousPath } = useHistoryTracker()
@@ -142,6 +145,7 @@ export function Collection({
                     collectionId={collection.id}
                     canAddCollection={canUserAddCollection}
                     canAddDataset={canUserAddDataset}
+                    datasetRepository={datasetRepository}
                   />
                 ) : null
               }
diff --git a/src/sections/collection/CollectionFactory.tsx b/src/sections/collection/CollectionFactory.tsx
index 8f4d97a9c..f34e9a479 100644
--- a/src/sections/collection/CollectionFactory.tsx
+++ b/src/sections/collection/CollectionFactory.tsx
@@ -6,9 +6,11 @@ import { Collection } from './Collection'
 import { INFINITE_SCROLL_ENABLED } from './config'
 import { useGetCollectionQueryParams } from './useGetCollectionQueryParams'
 import { ACCOUNT_CREATED_SESSION_STORAGE_KEY } from './AccountCreatedAlert'
+import { DatasetJSDataverseRepository } from '@/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
 
 const collectionRepository = new CollectionJSDataverseRepository()
 const contactRepository = new ContactJSDataverseRepository()
+const datasetRepository = new DatasetJSDataverseRepository()
 
 export class CollectionFactory {
   static create(): ReactElement {
@@ -39,6 +41,7 @@ function CollectionWithSearchParams() {
       accountCreated={accountCreated}
       infiniteScrollEnabled={INFINITE_SCROLL_ENABLED}
       contactRepository={contactRepository}
+      datasetRepository={datasetRepository}
     />
   )
 }
diff --git a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.tsx b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.tsx
index 18a304b02..7ff550df7 100644
--- a/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.tsx
+++ b/src/sections/dataset/dataset-action-buttons/edit-dataset-menu/EditDatasetMenu.tsx
@@ -41,6 +41,9 @@ export function EditDatasetMenu({ dataset, datasetRepository }: EditDatasetMenuP
   const handleOnSelect = (eventKey: EditDatasetMenuItems | string | null) => {
     const searchParams = new URLSearchParams()
     searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
+    if (dataset.datasetType) {
+      searchParams.set(QueryParamKey.DATASET_TYPE, dataset.datasetType)
+    }
 
     if (dataset.version.publishingStatus === DatasetPublishingStatus.DRAFT) {
       searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
diff --git a/src/sections/layout/header/Header.tsx b/src/sections/layout/header/Header.tsx
index 95edfde45..f46d5bae3 100644
--- a/src/sections/layout/header/Header.tsx
+++ b/src/sections/layout/header/Header.tsx
@@ -10,11 +10,13 @@ import { LoggedInHeaderActions } from './LoggedInHeaderActions'
 import { CollectionRepository } from '@/collection/domain/repositories/CollectionRepository'
 import { encodeReturnToPathInStateQueryParam } from '@/sections/auth-callback/AuthCallback'
 import styles from './Header.module.scss'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
 
 interface HeaderProps {
   collectionRepository: CollectionRepository
+  datasetRepository: DatasetRepository
 }
-export function Header({ collectionRepository }: HeaderProps) {
+export function Header({ collectionRepository, datasetRepository }: HeaderProps) {
   const { t } = useTranslation('header')
   const { user } = useSession()
   const { pathname, search } = useLocation()
@@ -36,7 +38,11 @@ export function Header({ collectionRepository }: HeaderProps) {
       }}
       className={styles.navbar}>
       {user ? (
-        <LoggedInHeaderActions user={user} collectionRepository={collectionRepository} />
+        <LoggedInHeaderActions
+          user={user}
+          collectionRepository={collectionRepository}
+          datasetRepository={datasetRepository}
+        />
       ) : (
         <Button
           onClick={handleOidcLogIn}
diff --git a/src/sections/layout/header/HeaderFactory.tsx b/src/sections/layout/header/HeaderFactory.tsx
index a00eaa5ce..41aed09f0 100644
--- a/src/sections/layout/header/HeaderFactory.tsx
+++ b/src/sections/layout/header/HeaderFactory.tsx
@@ -1,11 +1,15 @@
 import { ReactElement } from 'react'
 import { Header } from './Header'
 import { CollectionJSDataverseRepository } from '@/collection/infrastructure/repositories/CollectionJSDataverseRepository'
+import { DatasetJSDataverseRepository } from '@/dataset/infrastructure/repositories/DatasetJSDataverseRepository'
 
 const collectionRepository = new CollectionJSDataverseRepository()
+const datasetRepository = new DatasetJSDataverseRepository()
 
 export class HeaderFactory {
   static create(): ReactElement {
-    return <Header collectionRepository={collectionRepository} />
+    return (
+      <Header collectionRepository={collectionRepository} datasetRepository={datasetRepository} />
+    )
   }
 }
diff --git a/src/sections/layout/header/LoggedInHeaderActions.tsx b/src/sections/layout/header/LoggedInHeaderActions.tsx
index 5113a2ddb..f0302fa67 100644
--- a/src/sections/layout/header/LoggedInHeaderActions.tsx
+++ b/src/sections/layout/header/LoggedInHeaderActions.tsx
@@ -9,15 +9,19 @@ import { RouteWithParams, Route } from '@/sections//Route.enum'
 import { CollectionRepository } from '@/collection/domain/repositories/CollectionRepository'
 import { AccountHelper } from '@/sections/account/AccountHelper'
 import { useCollection } from '@/sections/collection/useCollection'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
+import { useGetAvailableDatasetTypes } from '@/dataset/domain/hooks/useGetAvailableDatasetTypes'
 
 interface LoggedInHeaderActionsProps {
   user: User
   collectionRepository: CollectionRepository
+  datasetRepository: DatasetRepository
 }
 
 export const LoggedInHeaderActions = ({
   user,
-  collectionRepository
+  collectionRepository,
+  datasetRepository
 }: LoggedInHeaderActionsProps) => {
   const { t } = useTranslation('header')
   const { logOut } = useContext(AuthContext)
@@ -29,6 +33,10 @@ export const LoggedInHeaderActions = ({
     collectionRepository: collectionRepository
   })
 
+  const { datasetTypes } = useGetAvailableDatasetTypes({ datasetRepository })
+  // We skip "dataset" because we hard-code it to appear at the top.
+  const nonDatasetDatasetTypes = datasetTypes.filter((type) => type.name !== 'dataset')
+
   if (!collection) {
     return null
   }
@@ -51,6 +59,21 @@ export const LoggedInHeaderActions = ({
         <Navbar.Dropdown.Item as={Link} to={createDatasetRoute} disabled={!canUserAddDatasetToRoot}>
           {t('navigation.newDataset')}
         </Navbar.Dropdown.Item>
+        {/* "Dataset" is hard coded above. Next we show "Software", "Review", etc. */}
+        {...nonDatasetDatasetTypes.map((datasetType) => (
+          <Navbar.Dropdown.Item
+            key={datasetType.name}
+            to={`${createDatasetRoute}?datasetType=${datasetType.name}`}
+            as={Link}
+            disabled={!canUserAddDatasetToRoot}>
+            {/* We capitalize the name because we have modified public/locales/en/header.json to include "newReview: New Review" specifically for the "review" dataset type but what about "software" and "workflow" or others we can't even predict? Should the API return the type in right language? Or should we continue to add types we think we'll want to support in header.json? And what if a name has a space in it? */}
+            {t(
+              `navigation.new${
+                datasetType.name.charAt(0).toUpperCase() + datasetType.name.slice(1)
+              }`
+            )}
+          </Navbar.Dropdown.Item>
+        ))}
       </Navbar.Dropdown>
       <Navbar.Dropdown title={user.displayName} id="dropdown-user">
         <Navbar.Dropdown.Item
diff --git a/src/sections/shared/add-data-actions/AddDataActionsButton.tsx b/src/sections/shared/add-data-actions/AddDataActionsButton.tsx
index e55d8bd8b..505653f5d 100644
--- a/src/sections/shared/add-data-actions/AddDataActionsButton.tsx
+++ b/src/sections/shared/add-data-actions/AddDataActionsButton.tsx
@@ -5,22 +5,29 @@ import { DropdownButton } from '@iqss/dataverse-design-system'
 import { PlusLg } from 'react-bootstrap-icons'
 import { RouteWithParams } from '../../Route.enum'
 import styles from './AddDataActionsButton.module.scss'
+import { DatasetRepository } from '@/dataset/domain/repositories/DatasetRepository'
+import { useGetAvailableDatasetTypes } from '@/dataset/domain/hooks/useGetAvailableDatasetTypes'
 
 interface AddDataActionsButtonProps {
   collectionId: string
   canAddCollection: boolean
   canAddDataset: boolean
+  datasetRepository: DatasetRepository
 }
 
 export default function AddDataActionsButton({
   collectionId,
   canAddCollection,
-  canAddDataset
+  canAddDataset,
+  datasetRepository
 }: AddDataActionsButtonProps) {
   const { t } = useTranslation('header')
 
   const createCollectionRoute = RouteWithParams.CREATE_COLLECTION(collectionId)
   const createDatasetRoute = RouteWithParams.CREATE_DATASET(collectionId)
+  const { datasetTypes } = useGetAvailableDatasetTypes({ datasetRepository })
+  // We skip "dataset" because we hard-code it to appear at the top.
+  const nonDatasetDatasetTypes = datasetTypes.filter((type) => type.name !== 'dataset')
 
   return (
     <DropdownButton
@@ -34,6 +41,19 @@ export default function AddDataActionsButton({
       <Dropdown.Item to={createDatasetRoute} as={Link} disabled={!canAddDataset}>
         {t('navigation.newDataset')}
       </Dropdown.Item>
+      {/* "Dataset" is hard coded above. Next we show "Software", "Review", etc. */}
+      {...nonDatasetDatasetTypes.map((datasetType) => (
+        <Dropdown.Item
+          key={datasetType.name}
+          to={`${createDatasetRoute}?datasetType=${datasetType.name}`}
+          as={Link}
+          disabled={!canAddDataset}>
+          {/* We capitalize the name because we have modified public/locales/en/header.json to include "newReview: New Review" specifically for the "review" dataset type but what about "software" and "workflow" or others we can't even predict? Should the API return the type in right language? Or should we continue to add types we think we'll want to support in header.json? And what if a name has a space in it? */}
+          {t(
+            `navigation.new${datasetType.name.charAt(0).toUpperCase() + datasetType.name.slice(1)}`
+          )}
+        </Dropdown.Item>
+      ))}
     </DropdownButton>
   )
 }
diff --git a/src/sections/shared/form/DatasetMetadataForm/index.tsx b/src/sections/shared/form/DatasetMetadataForm/index.tsx
index 107568919..308fcfd59 100644
--- a/src/sections/shared/form/DatasetMetadataForm/index.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/index.tsx
@@ -20,6 +20,7 @@ type DatasetMetadataFormProps =
       datasetMetadaBlocksCurrentValues?: never
       datasetInternalVersionNumber?: never
       datasetTemplate?: DatasetTemplate
+      datasetType?: string
     }
   | {
       mode: 'edit'
@@ -30,6 +31,8 @@ type DatasetMetadataFormProps =
       datasetMetadaBlocksCurrentValues: DatasetMetadataBlocks
       datasetInternalVersionNumber: number
       datasetTemplate?: never
+      // changing datasetType is not supported by the backend
+      datasetType?: string
     }
 
 export type DatasetMetadataFormMode = 'create' | 'edit'
@@ -42,7 +45,8 @@ export const DatasetMetadataForm = ({
   metadataBlockInfoRepository,
   datasetMetadaBlocksCurrentValues,
   datasetInternalVersionNumber,
-  datasetTemplate
+  datasetTemplate,
+  datasetType
 }: DatasetMetadataFormProps) => {
   const { setIsLoading } = useLoading()
 
@@ -53,7 +57,8 @@ export const DatasetMetadataForm = ({
   } = useGetMetadataBlocksInfo({
     mode: 'create',
     collectionId,
-    metadataBlockInfoRepository
+    metadataBlockInfoRepository,
+    datasetType
   })
 
   const {
diff --git a/src/sections/shared/form/DatasetMetadataForm/useGetMetadataBlocksInfo.tsx b/src/sections/shared/form/DatasetMetadataForm/useGetMetadataBlocksInfo.tsx
index 27e5ce567..8f4f30549 100644
--- a/src/sections/shared/form/DatasetMetadataForm/useGetMetadataBlocksInfo.tsx
+++ b/src/sections/shared/form/DatasetMetadataForm/useGetMetadataBlocksInfo.tsx
@@ -4,11 +4,14 @@ import { getDisplayedOnCreateMetadataBlockInfoByCollectionId } from '../../../..
 import { MetadataBlockInfoRepository } from '../../../../metadata-block-info/domain/repositories/MetadataBlockInfoRepository'
 import { MetadataBlockInfo } from '../../../../metadata-block-info/domain/models/MetadataBlockInfo'
 import { DatasetMetadataFormMode } from '.'
+import { useSearchParams } from 'react-router-dom'
+import { QueryParamKey } from '@/sections/Route.enum'
 
 interface Props {
   mode: DatasetMetadataFormMode
   collectionId: string
   metadataBlockInfoRepository: MetadataBlockInfoRepository
+  datasetType?: string
 }
 
 interface UseGetMetadataBlocksInfoReturn {
@@ -20,11 +23,13 @@ interface UseGetMetadataBlocksInfoReturn {
 export const useGetMetadataBlocksInfo = ({
   mode,
   collectionId,
-  metadataBlockInfoRepository
+  metadataBlockInfoRepository,
+  datasetType
 }: Props): UseGetMetadataBlocksInfoReturn => {
   const [metadataBlocksInfo, setMetadataBlocksInfo] = useState<MetadataBlockInfo[]>([])
   const [isLoading, setIsLoading] = useState<boolean>(true)
   const [error, setError] = useState<string | null>(null)
+  const [searchParams] = useSearchParams()
 
   useEffect(() => {
     const handleGetDatasetMetadataBlockFields = async () => {
@@ -32,15 +37,22 @@ export const useGetMetadataBlocksInfo = ({
       try {
         let metadataBlocks: MetadataBlockInfo[] = []
 
+        const datasetTypeIn = searchParams.get(QueryParamKey.DATASET_TYPE)
+        if (datasetTypeIn) {
+          datasetType = datasetTypeIn
+        }
         if (mode === 'edit') {
           metadataBlocks = await getMetadataBlockInfoByCollectionId(
             metadataBlockInfoRepository,
-            collectionId
+            collectionId,
+            false,
+            datasetType
           )
         } else {
           metadataBlocks = await getDisplayedOnCreateMetadataBlockInfoByCollectionId(
             metadataBlockInfoRepository,
-            collectionId
+            collectionId,
+            datasetType
           )
         }
 
diff --git a/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts b/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts
index c10f6eafb..589ef3466 100644
--- a/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts
+++ b/src/sections/shared/form/DatasetMetadataForm/useSubmitDataset.ts
@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { toast } from 'react-toastify'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, useSearchParams } from 'react-router-dom'
 import { useTranslation } from 'react-i18next'
 import { DatasetRepository } from '../../../../dataset/domain/repositories/DatasetRepository'
 import { createDataset } from '../../../../dataset/domain/useCases/createDataset'
@@ -50,6 +50,8 @@ export function useSubmitDataset(
   )
   const [submitError, setSubmitError] = useState<string | null>(null)
 
+  const [searchParams] = useSearchParams()
+
   const submitForm = (formData: DatasetMetadataFormValues): void => {
     setSubmissionStatus(SubmissionStatus.IsSubmitting)
 
@@ -61,7 +63,12 @@ export function useSubmitDataset(
     )
 
     if (mode === 'create') {
-      createDataset(datasetRepository, formattedFormValues, collectionId)
+      let datasetType = 'dataset'
+      const datasetTypeIn = searchParams.get(QueryParamKey.DATASET_TYPE)
+      if (datasetTypeIn) {
+        datasetType = datasetTypeIn
+      }
+      createDataset(datasetRepository, formattedFormValues, collectionId, datasetType)
         .then(({ persistentId }) => {
           setSubmitError(null)
           setSubmissionStatus(SubmissionStatus.SubmitComplete)
diff --git a/src/stories/collection/Collection.stories.tsx b/src/stories/collection/Collection.stories.tsx
index 019c0fd02..ec24af81f 100644
--- a/src/stories/collection/Collection.stories.tsx
+++ b/src/stories/collection/Collection.stories.tsx
@@ -9,6 +9,7 @@ import { UnpublishedCollectionMockRepository } from '@/stories/collection/Unpubl
 import { FeaturedItemMother } from '@tests/component/collection/domain/models/FeaturedItemMother'
 import { FakerHelper } from '@tests/component/shared/FakerHelper'
 import { ContactMockRepository } from '../shared-mock-repositories/contact/ContactMockRepository'
+import { DatasetMockRepository } from '../dataset/DatasetMockRepository'
 
 const meta: Meta<typeof Collection> = {
   title: 'Pages/Collection',
@@ -29,6 +30,7 @@ export const Default: Story = {
       collectionRepository={new CollectionMockRepository()}
       contactRepository={new ContactMockRepository()}
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       created={false}
       accountCreated={false}
       collectionQueryParams={{
@@ -44,6 +46,7 @@ export const Loading: Story = {
   render: () => (
     <Collection
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       collectionRepository={new CollectionLoadingMockRepository()}
       contactRepository={new ContactMockRepository()}
       created={false}
@@ -58,6 +61,7 @@ export const LoggedIn: Story = {
   render: () => (
     <Collection
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       collectionRepository={new CollectionMockRepository()}
       contactRepository={new ContactMockRepository()}
       created={false}
@@ -71,6 +75,7 @@ export const Unpublished: Story = {
   render: () => (
     <Collection
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       collectionRepository={new UnpublishedCollectionMockRepository()}
       contactRepository={new ContactMockRepository()}
       created={false}
@@ -87,6 +92,7 @@ export const Created: Story = {
       collectionRepository={new CollectionMockRepository()}
       contactRepository={new ContactMockRepository()}
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       created={true}
       accountCreated={false}
       collectionQueryParams={{ pageQuery: 1, searchQuery: undefined, typesQuery: undefined }}
@@ -101,6 +107,7 @@ export const AccountCreated: Story = {
       collectionRepository={new CollectionMockRepository()}
       contactRepository={new ContactMockRepository()}
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       created={false}
       accountCreated={true}
       collectionQueryParams={{ pageQuery: 1, searchQuery: undefined, typesQuery: undefined }}
@@ -124,6 +131,7 @@ export const WithFeaturedItems: Story = {
       collectionRepository={collectionRepositoryWithFeaturedItems}
       contactRepository={new ContactMockRepository()}
       collectionIdFromParams="collection"
+      datasetRepository={new DatasetMockRepository()}
       created={false}
       accountCreated={false}
       collectionQueryParams={{
diff --git a/src/stories/collection/collection-items-panel/CollectionItemsPanel.stories.tsx b/src/stories/collection/collection-items-panel/CollectionItemsPanel.stories.tsx
index 28282f2b5..fab09dba7 100644
--- a/src/stories/collection/collection-items-panel/CollectionItemsPanel.stories.tsx
+++ b/src/stories/collection/collection-items-panel/CollectionItemsPanel.stories.tsx
@@ -8,6 +8,7 @@ import { CollectionMockRepository } from '../CollectionMockRepository'
 import { CollectionLoadingMockRepository } from '../CollectionLoadingMockRepository'
 import { NoCollectionMockRepository } from '../NoCollectionMockRepository'
 import { CollectionErrorMockRepository } from '../CollectionErrorMockRepository'
+import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 
 const meta: Meta<typeof CollectionItemsPanel> = {
   title: 'Sections/Collection Page/CollectionItemsPanel',
@@ -79,7 +80,12 @@ export const WithAddDataButtons: Story = {
       collectionQueryParams={{ pageQuery: 1, searchQuery: undefined, typesQuery: undefined }}
       collectionRepository={new CollectionMockRepository()}
       addDataSlot={
-        <AddDataActionsButton collectionId={'someCollectionId'} canAddCollection canAddDataset />
+        <AddDataActionsButton
+          collectionId={'someCollectionId'}
+          canAddCollection
+          canAddDataset
+          datasetRepository={new DatasetMockRepository()}
+        />
       }
     />
   )
@@ -141,7 +147,12 @@ export const NoCollectionDatasetsOrFilesAuthenticatedUser: Story = {
       }}
       collectionRepository={new NoCollectionMockRepository()}
       addDataSlot={
-        <AddDataActionsButton collectionId={'collectionId'} canAddCollection canAddDataset />
+        <AddDataActionsButton
+          collectionId={'collectionId'}
+          canAddCollection
+          canAddDataset
+          datasetRepository={new DatasetMockRepository()}
+        />
       }
     />
   )
diff --git a/src/stories/dataset/DatasetErrorMockRepository.ts b/src/stories/dataset/DatasetErrorMockRepository.ts
index bde43004d..a00645443 100644
--- a/src/stories/dataset/DatasetErrorMockRepository.ts
+++ b/src/stories/dataset/DatasetErrorMockRepository.ts
@@ -11,6 +11,7 @@ import { DatasetDeaccessionDTO } from '@iqss/dataverse-client-javascript'
 import { DatasetDownloadCount } from '@/dataset/domain/models/DatasetDownloadCount'
 import { CitationFormat, FormattedCitation } from '@/dataset/domain/models/DatasetCitation'
 import { DatasetTemplate } from '@/dataset/domain/models/DatasetTemplate'
+import { DatasetType } from '@/dataset/domain/models/DatasetType'
 
 export class DatasetErrorMockRepository implements DatasetMockRepository {
   getAllWithCount: (
@@ -156,4 +157,12 @@ export class DatasetErrorMockRepository implements DatasetMockRepository {
       }, FakerHelper.loadingTimout())
     })
   }
+
+  getAvailableDatasetTypes(): Promise<DatasetType[]> {
+    return new Promise((_resolve, reject) => {
+      setTimeout(() => {
+        reject('Error thrown from mock')
+      }, FakerHelper.loadingTimout())
+    })
+  }
 }
diff --git a/src/stories/dataset/DatasetMockRepository.ts b/src/stories/dataset/DatasetMockRepository.ts
index c34cc164f..3616cdffd 100644
--- a/src/stories/dataset/DatasetMockRepository.ts
+++ b/src/stories/dataset/DatasetMockRepository.ts
@@ -17,6 +17,8 @@ import { DatasetDownloadCountMother } from '@tests/component/dataset/domain/mode
 import { CitationFormat, FormattedCitation } from '@/dataset/domain/models/DatasetCitation'
 import { DatasetTemplate } from '@/dataset/domain/models/DatasetTemplate'
 import { DatasetTemplateMother } from '@tests/component/dataset/domain/models/DatasetTemplateMother'
+import { DatasetTypeMother } from '@tests/component/dataset/domain/models/DatasetTypeMother'
+import { DatasetType } from '@/dataset/domain/models/DatasetType'
 
 export class DatasetMockRepository implements DatasetRepository {
   getAllWithCount: (
@@ -171,4 +173,12 @@ export class DatasetMockRepository implements DatasetRepository {
       }, FakerHelper.loadingTimout())
     })
   }
+
+  getAvailableDatasetTypes(): Promise<DatasetType[]> {
+    return new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(DatasetTypeMother.createMany(3))
+      }, FakerHelper.loadingTimout())
+    })
+  }
 }
diff --git a/src/stories/layout/header/Header.stories.tsx b/src/stories/layout/header/Header.stories.tsx
index aef730840..933cb3a07 100644
--- a/src/stories/layout/header/Header.stories.tsx
+++ b/src/stories/layout/header/Header.stories.tsx
@@ -3,6 +3,7 @@ import { WithI18next } from '../../WithI18next'
 import { Header } from '../../../sections/layout/header/Header'
 import { WithLoggedInUser } from '../../WithLoggedInUser'
 import { CollectionMockRepository } from '@/stories/collection/CollectionMockRepository'
+import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 
 const meta: Meta<typeof Header> = {
   title: 'Layout/Header',
@@ -15,13 +16,23 @@ type Story = StoryObj<typeof Header>
 
 export const LoggedOut: Story = {
   render: () => {
-    return <Header collectionRepository={new CollectionMockRepository()} />
+    return (
+      <Header
+        collectionRepository={new CollectionMockRepository()}
+        datasetRepository={new DatasetMockRepository()}
+      />
+    )
   }
 }
 
 export const LoggedIn: Story = {
   decorators: [WithLoggedInUser],
   render: () => {
-    return <Header collectionRepository={new CollectionMockRepository()} />
+    return (
+      <Header
+        collectionRepository={new CollectionMockRepository()}
+        datasetRepository={new DatasetMockRepository()}
+      />
+    )
   }
 }
diff --git a/src/stories/shared/add-data-actions/AddDataActionsButton.stories.tsx b/src/stories/shared/add-data-actions/AddDataActionsButton.stories.tsx
index 77df60b5a..8cff8c095 100644
--- a/src/stories/shared/add-data-actions/AddDataActionsButton.stories.tsx
+++ b/src/stories/shared/add-data-actions/AddDataActionsButton.stories.tsx
@@ -3,6 +3,7 @@ import { WithI18next } from '../../WithI18next'
 import AddDataActionsButton from '../../../sections/shared/add-data-actions/AddDataActionsButton'
 
 import { ROOT_COLLECTION_ALIAS } from '@tests/e2e-integration/shared/collection/ROOT_COLLECTION_ALIAS'
+import { DatasetMockRepository } from '@/stories/dataset/DatasetMockRepository'
 
 const meta: Meta<typeof AddDataActionsButton> = {
   title: 'Sections/Shared/AddDataActions/AddDataActionsButton',
@@ -15,7 +16,12 @@ type Story = StoryObj<typeof AddDataActionsButton>
 
 export const Default: Story = {
   render: () => (
-    <AddDataActionsButton collectionId={ROOT_COLLECTION_ALIAS} canAddCollection canAddDataset />
+    <AddDataActionsButton
+      collectionId={ROOT_COLLECTION_ALIAS}
+      canAddCollection
+      canAddDataset
+      datasetRepository={new DatasetMockRepository()}
+    />
   )
 }
 
@@ -25,6 +31,7 @@ export const NotAllowedToAddCollection: Story = {
       collectionId={ROOT_COLLECTION_ALIAS}
       canAddCollection={false}
       canAddDataset={true}
+      datasetRepository={new DatasetMockRepository()}
     />
   )
 }
@@ -35,6 +42,7 @@ export const NotAllowedToAddDataset: Story = {
       collectionId={ROOT_COLLECTION_ALIAS}
       canAddCollection={true}
       canAddDataset={false}
+      datasetRepository={new DatasetMockRepository()}
     />
   )
 }
diff --git a/tests/component/dataset/domain/models/DatasetMother.ts b/tests/component/dataset/domain/models/DatasetMother.ts
index 661a2e6e9..387d9b388 100644
--- a/tests/component/dataset/domain/models/DatasetMother.ts
+++ b/tests/component/dataset/domain/models/DatasetMother.ts
@@ -341,6 +341,7 @@ export class DatasetMother {
     const dataset = {
       id: faker.datatype.number(),
       persistentId: faker.datatype.uuid(),
+      datasetType: 'dataset',
       version: DatasetVersionMother.create(),
       internalVersionNumber: faker.datatype.number(),
       license: {
@@ -450,7 +451,8 @@ export class DatasetMother {
       dataset.nextMajorVersion,
       dataset.nextMinorVersion,
       dataset.requiresMajorVersionUpdate,
-      dataset.fileStore
+      dataset.fileStore,
+      dataset.datasetType
     ).build()
   }
 
diff --git a/tests/component/dataset/domain/models/DatasetTypeMother.ts b/tests/component/dataset/domain/models/DatasetTypeMother.ts
new file mode 100644
index 000000000..4c17a9815
--- /dev/null
+++ b/tests/component/dataset/domain/models/DatasetTypeMother.ts
@@ -0,0 +1,15 @@
+import { faker } from '@faker-js/faker'
+import { DatasetType } from '@/dataset/domain/models/DatasetType'
+
+export class DatasetTypeMother {
+  static createMany(count: number, props?: Partial<DatasetType>): DatasetType[] {
+    return Array.from({ length: count }, () => this.create(props))
+  }
+  static create(props?: Partial<DatasetType>): DatasetType {
+    return {
+      id: faker.datatype.number({ min: 1 }),
+      name: faker.lorem.words(3),
+      ...props
+    }
+  }
+}
diff --git a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
index ef11e886c..1f02543cf 100644
--- a/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
+++ b/tests/component/dataset/infrastructure/mappers/JSDatasetMapper.spec.ts
@@ -215,6 +215,7 @@ const jsDatasetFilesTotalArchivalDownloadSize = 7
 const expectedDataset = {
   id: 505,
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
+  datasetType: undefined,
   version: {
     id: 101,
     title: "Darwin's Finches",
@@ -334,6 +335,7 @@ const expectedDataset = {
 const expectedDatasetWithPublicationDate = {
   id: 505,
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
+  datasetType: undefined,
   version: {
     id: 101,
     title: "Darwin's Finches",
@@ -451,6 +453,7 @@ const expectedDatasetWithPublicationDate = {
 const expectedDatasetWithNextVersionNumbers = {
   id: 505,
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
+  datasetType: undefined,
   version: {
     id: 101,
     title: "Darwin's Finches",
@@ -569,6 +572,7 @@ const expectedDatasetWithNextVersionNumbers = {
 const expectedDatasetAlternateVersion = {
   id: 505,
   persistentId: 'doi:10.5072/FK2/B4B2MJ',
+  datasetType: undefined,
   version: {
     id: 101,
     title: "Darwin's Finches",
diff --git a/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx b/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
index aef796ff7..959089b04 100644
--- a/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
+++ b/tests/component/sections/dataset/dataset-action-buttons/DatasetActionButtons.spec.tsx
@@ -73,6 +73,34 @@ describe('DatasetActionButtons', () => {
     cy.findByRole('button', { name: 'Share' }).should('exist')
   })
 
+  it('renders the DatasetActionButtons with the Edit Dataset button and dropdown', () => {
+    const dataset = DatasetMother.create({
+      version: DatasetVersionMother.createDraftAsLatestVersionWithSomeVersionHasBeenReleased(),
+      permissions: DatasetPermissionsMother.create({
+        canDownloadFiles: true,
+        canUpdateDataset: true,
+        canPublishDataset: false
+      }),
+      fileDownloadSizes: [
+        DatasetFileDownloadSizeMother.createOriginal({ value: 2000, unit: FileSizeUnit.BYTES })
+      ],
+      hasValidTermsOfAccess: true
+    })
+
+    cy.mountAuthenticated(
+      <DatasetActionButtons
+        dataset={dataset}
+        datasetRepository={datasetRepository}
+        collectionRepository={collectionRepository}
+        contactRepository={contactRepository}
+      />
+    )
+
+    cy.findByRole('group', { name: 'Dataset Action Buttons' }).should('exist')
+    cy.findByRole('button', { name: 'Edit Dataset' }).click()
+    cy.findByRole('button', { name: 'Metadata' }).click()
+  })
+
   it('should not render Share button if the the dataset is deaccessioned and user has no edit permission', () => {
     const dataset = DatasetMother.createDeaccessionedwithNoEditPermission()
     cy.mountAuthenticated(
diff --git a/tests/component/sections/layout/header/LoggedInHeaderActions.spec.tsx b/tests/component/sections/layout/header/LoggedInHeaderActions.spec.tsx
index 9a172df70..eef26b3d1 100644
--- a/tests/component/sections/layout/header/LoggedInHeaderActions.spec.tsx
+++ b/tests/component/sections/layout/header/LoggedInHeaderActions.spec.tsx
@@ -2,9 +2,11 @@ import { UserMother } from '../../../users/domain/models/UserMother'
 import { LoggedInHeaderActions } from '../../../../../src/sections/layout/header/LoggedInHeaderActions'
 import { CollectionRepository } from '../../../../../src/collection/domain/repositories/CollectionRepository'
 import { CollectionMother } from '../../../collection/domain/models/CollectionMother'
+import { DatasetRepository } from '../../../../../src/dataset/domain/repositories/DatasetRepository'
 
 const testUser = UserMother.create()
 const collectionRepository: CollectionRepository = {} as CollectionRepository
+const datasetRepository: DatasetRepository = {} as DatasetRepository
 const userPermissionsMock = CollectionMother.createUserPermissions()
 
 describe('LoggedInHeaderActions', () => {
@@ -16,7 +18,11 @@ describe('LoggedInHeaderActions', () => {
     )
     collectionRepository.getById = cy.stub().resolves(CollectionMother.create())
     cy.customMount(
-      <LoggedInHeaderActions user={testUser} collectionRepository={collectionRepository} />
+      <LoggedInHeaderActions
+        user={testUser}
+        collectionRepository={collectionRepository}
+        datasetRepository={datasetRepository}
+      />
     )
 
     cy.findByRole('button', { name: /Add Data/i }).as('addDataBtn')
@@ -31,7 +37,11 @@ describe('LoggedInHeaderActions', () => {
     collectionRepository.getUserPermissions = cy.stub().resolves(userPermissionsMock)
 
     cy.customMount(
-      <LoggedInHeaderActions user={testUser} collectionRepository={collectionRepository} />
+      <LoggedInHeaderActions
+        user={testUser}
+        collectionRepository={collectionRepository}
+        datasetRepository={datasetRepository}
+      />
     )
 
     cy.findByRole('button', { name: /Add Data/i }).as('addDataBtn')
@@ -50,7 +60,11 @@ describe('LoggedInHeaderActions', () => {
     )
 
     cy.customMount(
-      <LoggedInHeaderActions user={testUser} collectionRepository={collectionRepository} />
+      <LoggedInHeaderActions
+        user={testUser}
+        collectionRepository={collectionRepository}
+        datasetRepository={datasetRepository}
+      />
     )
 
     cy.findByRole('button', { name: /Add Data/i }).as('addDataBtn')
@@ -65,7 +79,11 @@ describe('LoggedInHeaderActions', () => {
     collectionRepository.getUserPermissions = cy.stub().resolves(userPermissionsMock)
 
     cy.customMount(
-      <LoggedInHeaderActions user={testUser} collectionRepository={collectionRepository} />
+      <LoggedInHeaderActions
+        user={testUser}
+        collectionRepository={collectionRepository}
+        datasetRepository={datasetRepository}
+      />
     )
 
     cy.findByRole('button', { name: /Add Data/i }).as('addDataBtn')
@@ -80,7 +98,11 @@ describe('LoggedInHeaderActions', () => {
     collectionRepository.getUserPermissions = cy.stub().resolves(userPermissionsMock)
 
     cy.customMount(
-      <LoggedInHeaderActions user={testUser} collectionRepository={collectionRepository} />
+      <LoggedInHeaderActions
+        user={testUser}
+        collectionRepository={collectionRepository}
+        datasetRepository={datasetRepository}
+      />
     )
 
     cy.findByRole('button', { name: /Add Data/i }).as('addDataBtn')
diff --git a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
index b1b6c0ac9..d86912490 100644
--- a/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
+++ b/tests/component/sections/shared/dataset-metadata-form/DatasetMetadataForm.spec.tsx
@@ -9,6 +9,7 @@ import { DatasetMother } from '../../../dataset/domain/models/DatasetMother'
 import { MetadataBlockInfoMother } from '../../../metadata-block-info/domain/models/MetadataBlockInfoMother'
 import { UserMother } from '../../../users/domain/models/UserMother'
 import { DatasetTemplateMother } from '@tests/component/dataset/domain/models/DatasetTemplateMother'
+import { Route } from '@/sections/Route.enum'
 
 const datasetRepository: DatasetRepository = {} as DatasetRepository
 const metadataBlockInfoRepository: MetadataBlockInfoRepository = {} as MetadataBlockInfoRepository
@@ -1283,7 +1284,8 @@ describe('DatasetMetadataForm', () => {
           collectionId="root"
           datasetRepository={datasetRepository}
           metadataBlockInfoRepository={metadataBlockInfoRepository}
-        />
+        />,
+        [`${Route.CREATE_DATASET}?datasetType=dataset`]
       )
       fillRequiredFieldsOnCreate()
       cy.findByText(/Save Dataset/i).click()