diff --git a/lib/contentful.ts b/lib/contentful.ts
index 4baee404a..1c27520e2 100644
--- a/lib/contentful.ts
+++ b/lib/contentful.ts
@@ -7,13 +7,10 @@ import axios from 'axios'
 import type { AxiosAdapter, AxiosRequestConfig, AxiosResponse } from 'axios'
 
 import { createHttpClient, getUserAgentHeader } from 'contentful-sdk-core'
-import { createGlobalOptions } from './create-global-options.js'
-import { makeClient } from './make-client.js'
-import {
-  validateRemoveUnresolvedParam,
-  validateResolveLinksParam,
-} from './utils/validate-params.js'
-import type { ContentfulClientApi } from './types/client.js'
+import { createGlobalOptions } from './create-global-options'
+import { makeClient } from './make-client'
+import { validateRemoveUnresolvedParam, validateResolveLinksParam } from './utils/validate-params'
+import type { ContentfulClientApi } from './types/client'
 
 /**
  * @category Client
diff --git a/lib/create-contentful-api.ts b/lib/create-contentful-api.ts
index c11d56226..9cccc3210 100644
--- a/lib/create-contentful-api.ts
+++ b/lib/create-contentful-api.ts
@@ -5,9 +5,9 @@
 
 import { encodeCPAResponse } from '@contentful/content-source-maps'
 import { AxiosInstance, createRequestConfig, errorHandler } from 'contentful-sdk-core'
-import { CreateClientParams } from './contentful.js'
-import { GetGlobalOptions } from './create-global-options.js'
-import pagedSync from './paged-sync.js'
+import { CreateClientParams } from './contentful'
+import { GetGlobalOptions } from './create-global-options'
+import pagedSync from './paged-sync'
 import type {
   Asset,
   AssetCollection,
@@ -28,20 +28,20 @@ import type {
   Concept,
   ConceptScheme,
   ConceptSchemeCollection,
-} from './types/index.js'
-import normalizeSearchParameters from './utils/normalize-search-parameters.js'
-import normalizeSelect from './utils/normalize-select.js'
-import resolveCircular from './utils/resolve-circular.js'
-import getQuerySelectionSet from './utils/query-selection-set.js'
-import validateTimestamp from './utils/validate-timestamp.js'
-import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
+} from './types/index'
+import normalizeSearchParameters from './utils/normalize-search-parameters'
+import normalizeSelect from './utils/normalize-select'
+import resolveCircular from './utils/resolve-circular'
+import getQuerySelectionSet from './utils/query-selection-set'
+import validateTimestamp from './utils/validate-timestamp'
+import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
 import {
   checkIncludeContentSourceMapsParamIsAllowed,
   validateLocaleParam,
   validateRemoveUnresolvedParam,
   validateResolveLinksParam,
-} from './utils/validate-params.js'
-import validateSearchParameters from './utils/validate-search-parameters.js'
+} from './utils/validate-params'
+import validateSearchParameters from './utils/validate-search-parameters'
 
 const ASSET_KEY_MAX_LIFETIME = 48 * 60 * 60
 
diff --git a/lib/index.ts b/lib/index.ts
index 410b53740..dadcccb8c 100644
--- a/lib/index.ts
+++ b/lib/index.ts
@@ -1,7 +1,7 @@
-export * from './contentful.js'
-export * from './create-global-options.js'
-export * from './mixins/stringify-safe.js'
-export * from './utils/normalize-select.js'
-export * from './utils/resolve-circular.js'
+export * from './contentful'
+export * from './create-global-options'
+export * from './mixins/stringify-safe'
+export * from './utils/normalize-select'
+export * from './utils/resolve-circular'
 
-export * from './types/index.js'
+export * from './types/index'
diff --git a/lib/make-client.ts b/lib/make-client.ts
index b30e05aea..27e73200e 100644
--- a/lib/make-client.ts
+++ b/lib/make-client.ts
@@ -1,11 +1,11 @@
-import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api.js'
+import createContentfulApi, { CreateContentfulApiParams } from './create-contentful-api'
 import {
   ChainOptions,
   DefaultChainOption,
   ChainOption,
   ModifiersFromOptions,
-} from './utils/client-helpers.js'
-import type { ContentfulClientApi } from './types/index.js'
+} from './utils/client-helpers'
+import type { ContentfulClientApi } from './types/index'
 
 function create<OptionsType extends ChainOptions>(
   { http, getGlobalOptions }: CreateContentfulApiParams,
diff --git a/lib/paged-sync.ts b/lib/paged-sync.ts
index 56f35213e..94ff4732c 100644
--- a/lib/paged-sync.ts
+++ b/lib/paged-sync.ts
@@ -1,6 +1,6 @@
 import resolveResponse from 'contentful-resolve-response'
 import { AxiosInstance, createRequestConfig, freezeSys, toPlainObject } from 'contentful-sdk-core'
-import mixinStringifySafe from './mixins/stringify-safe.js'
+import mixinStringifySafe from './mixins/stringify-safe'
 import type {
   SyncPageQuery,
   SyncResponse,
@@ -11,8 +11,8 @@ import type {
   SyncQuery,
   LocaleCode,
   EntrySkeletonType,
-} from './types/index.js'
-import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers.js'
+} from './types/index'
+import { ChainOptions, ModifiersFromOptions } from './utils/client-helpers'
 
 /**
  * Retrieves all the available pages for a sync operation
diff --git a/lib/types/asset.ts b/lib/types/asset.ts
index c96a882e5..136c44bac 100644
--- a/lib/types/asset.ts
+++ b/lib/types/asset.ts
@@ -1,8 +1,8 @@
-import { ContentfulCollection } from './collection.js'
-import { LocaleCode } from './locale.js'
-import { Metadata } from './metadata.js'
-import { EntitySys } from './sys.js'
-import { ChainModifiers } from './client.js'
+import { ContentfulCollection } from './collection'
+import { LocaleCode } from './locale'
+import { Metadata } from './metadata'
+import { EntitySys } from './sys'
+import { ChainModifiers } from './client'
 
 /**
  * @category Asset
diff --git a/lib/types/client.ts b/lib/types/client.ts
index d58799038..d9b15e0f4 100644
--- a/lib/types/client.ts
+++ b/lib/types/client.ts
@@ -1,6 +1,6 @@
-import { ContentType, ContentTypeCollection } from './content-type.js'
-import { Space } from './space.js'
-import { LocaleCode, LocaleCollection } from './locale.js'
+import { ContentType, ContentTypeCollection } from './content-type'
+import { Space } from './space'
+import { LocaleCode, LocaleCollection } from './locale'
 import {
   AssetQueries,
   AssetsQueries,
@@ -10,14 +10,14 @@ import {
   EntryQueries,
   EntrySkeletonType,
   TagQueries,
-} from './query/index.js'
-import { SyncCollection, SyncOptions, SyncQuery } from './sync.js'
-import { Tag, TagCollection } from './tag.js'
-import { AssetKey } from './asset-key.js'
-import { Entry, EntryCollection } from './entry.js'
-import { Asset, AssetCollection, AssetFields } from './asset.js'
-import { Concept, ConceptCollection } from './concept.js'
-import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme.js'
+} from './query/index'
+import { SyncCollection, SyncOptions, SyncQuery } from './sync'
+import { Tag, TagCollection } from './tag'
+import { AssetKey } from './asset-key'
+import { Entry, EntryCollection } from './entry'
+import { Asset, AssetCollection, AssetFields } from './asset'
+import { Concept, ConceptCollection } from './concept'
+import { ConceptScheme, ConceptSchemeCollection } from './concept-scheme'
 
 /**
  * Client chain modifiers used in all types that depend on the client configuration.
diff --git a/lib/types/collection.ts b/lib/types/collection.ts
index 588a56be8..dd412fde5 100644
--- a/lib/types/collection.ts
+++ b/lib/types/collection.ts
@@ -1,5 +1,5 @@
-import { AssetSys } from './asset.js'
-import { EntrySys } from './entry.js'
+import { AssetSys } from './asset'
+import { EntrySys } from './entry'
 
 /**
  * A wrapper object containing additional information for
diff --git a/lib/types/content-type.ts b/lib/types/content-type.ts
index b3d6df658..f33421210 100644
--- a/lib/types/content-type.ts
+++ b/lib/types/content-type.ts
@@ -1,7 +1,7 @@
-import { ContentfulCollection } from './collection.js'
-import { EntryFields } from './entry.js'
-import { SpaceLink, EnvironmentLink } from './link.js'
-import { BaseSys } from './sys.js'
+import { ContentfulCollection } from './collection'
+import { EntryFields } from './entry'
+import { SpaceLink, EnvironmentLink } from './link'
+import { BaseSys } from './sys'
 import type { BLOCKS, INLINES } from '@contentful/rich-text-types'
 
 /**
diff --git a/lib/types/entry.ts b/lib/types/entry.ts
index 6a14a26a9..b247f3f80 100644
--- a/lib/types/entry.ts
+++ b/lib/types/entry.ts
@@ -1,14 +1,14 @@
 import { Document as RichTextDocument } from '@contentful/rich-text-types'
-import { Asset } from './asset.js'
-import { ContentfulCollection } from './collection.js'
-import { ContentTypeLink, UnresolvedLink } from './link.js'
-import { LocaleCode } from './locale.js'
-import { Metadata } from './metadata.js'
-import { EntrySkeletonType } from './query/index.js'
-import { EntitySys } from './sys.js'
+import { Asset } from './asset'
+import { ContentfulCollection } from './collection'
+import { ContentTypeLink, UnresolvedLink } from './link'
+import { LocaleCode } from './locale'
+import { Metadata } from './metadata'
+import { EntrySkeletonType } from './query/index'
+import { EntitySys } from './sys'
 import { JsonArray, JsonObject } from 'type-fest'
-import { ResourceLink } from './resource-link.js'
-import { ChainModifiers } from './client.js'
+import { ResourceLink } from './resource-link'
+import { ChainModifiers } from './client'
 
 /**
  * System managed metadata for entries
diff --git a/lib/types/index.ts b/lib/types/index.ts
index 3c009bcb5..bef8dfd6e 100644
--- a/lib/types/index.ts
+++ b/lib/types/index.ts
@@ -1,17 +1,17 @@
-export * from './asset.js'
-export * from './asset-key.js'
-export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client.js'
-export * from './collection.js'
-export * from './concept-scheme.js'
-export * from './concept.js'
-export * from './content-type.js'
-export * from './entry.js'
-export * from './link.js'
-export * from './locale.js'
-export * from './metadata.js'
-export * from './query/index.js'
-export * from './resource-link.js'
-export * from './space.js'
-export * from './sync.js'
-export * from './sys.js'
-export * from './tag.js'
+export * from './asset'
+export * from './asset-key'
+export { AddChainModifier, ChainModifiers, ContentfulClientApi } from './client'
+export * from './collection'
+export * from './concept-scheme'
+export * from './concept'
+export * from './content-type'
+export * from './entry'
+export * from './link'
+export * from './locale'
+export * from './metadata'
+export * from './query/index'
+export * from './resource-link'
+export * from './space'
+export * from './sync'
+export * from './sys'
+export * from './tag'
diff --git a/lib/types/link.ts b/lib/types/link.ts
index 28871a181..fdfd1a613 100644
--- a/lib/types/link.ts
+++ b/lib/types/link.ts
@@ -1,4 +1,4 @@
-import { ResourceLink } from './resource-link.js'
+import { ResourceLink } from './resource-link'
 
 /**
  * @category Link
diff --git a/lib/types/locale.ts b/lib/types/locale.ts
index 555841997..c8734ddcf 100644
--- a/lib/types/locale.ts
+++ b/lib/types/locale.ts
@@ -1,5 +1,5 @@
-import { ContentfulCollection } from './collection.js'
-import { BaseSys } from './sys.js'
+import { ContentfulCollection } from './collection'
+import { BaseSys } from './sys'
 
 /**
  * @category Entity
diff --git a/lib/types/metadata.ts b/lib/types/metadata.ts
index b1179eba7..2e0785fb2 100644
--- a/lib/types/metadata.ts
+++ b/lib/types/metadata.ts
@@ -1,4 +1,4 @@
-import { TagLink, TaxonomyConceptLink } from './link.js'
+import { TagLink, TaxonomyConceptLink } from './link'
 
 /**
  * User-controlled metadata
diff --git a/lib/types/query/equality.ts b/lib/types/query/equality.ts
index bb743296b..c66ef15ce 100644
--- a/lib/types/query/equality.ts
+++ b/lib/types/query/equality.ts
@@ -1,5 +1,5 @@
-import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
-import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
+import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
+import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'
 
 type SupportedTypes =
   | EntryFields.Symbol
diff --git a/lib/types/query/existence.ts b/lib/types/query/existence.ts
index d29f1aba9..f44f31034 100644
--- a/lib/types/query/existence.ts
+++ b/lib/types/query/existence.ts
@@ -1,6 +1,6 @@
-import { EntryField, EntryFieldType } from '../entry.js'
-import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util.js'
-import { AssetDetails, AssetFile } from '../asset.js'
+import { EntryField, EntryFieldType } from '../entry'
+import { ConditionalFixedQueries, FieldsType, EntrySkeletonType } from './util'
+import { AssetDetails, AssetFile } from '../asset'
 
 /**
  * Check for existence of provided fields
diff --git a/lib/types/query/index.ts b/lib/types/query/index.ts
index e8cbca29e..3fdad9d7b 100644
--- a/lib/types/query/index.ts
+++ b/lib/types/query/index.ts
@@ -3,16 +3,16 @@ export {
   EntrySkeletonType,
   type ConditionalFixedQueries,
   type ConditionalListQueries,
-} from './util.js'
+} from './util'
 
-export * from './equality.js'
-export * from './existence.js'
-export * from './location.js'
-export * from './order.js'
-export * from './query.js'
-export * from './range.js'
-export * from './reference.js'
-export * from './search.js'
-export * from './select.js'
-export * from './set.js'
-export * from './subset.js'
+export * from './equality'
+export * from './existence'
+export * from './location'
+export * from './order'
+export * from './query'
+export * from './range'
+export * from './reference'
+export * from './search'
+export * from './select'
+export * from './set'
+export * from './subset'
diff --git a/lib/types/query/location.ts b/lib/types/query/location.ts
index 1a3fa9c79..371d3d02f 100644
--- a/lib/types/query/location.ts
+++ b/lib/types/query/location.ts
@@ -1,5 +1,5 @@
 import { ConditionalPick } from 'type-fest'
-import { EntryFieldTypes } from '../entry.js'
+import { EntryFieldTypes } from '../entry'
 
 type Types = EntryFieldTypes.Location | undefined
 
diff --git a/lib/types/query/order.ts b/lib/types/query/order.ts
index 4bf90b7c6..26f8d7510 100644
--- a/lib/types/query/order.ts
+++ b/lib/types/query/order.ts
@@ -1,8 +1,8 @@
-import { EntrySkeletonType, FieldsType } from './util.js'
-import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry.js'
-import { AssetSys } from '../asset.js'
+import { EntrySkeletonType, FieldsType } from './util'
+import { EntryFields, EntryFieldType, EntryFieldTypes, EntrySys } from '../entry'
+import { AssetSys } from '../asset'
 import { ConditionalPick } from 'type-fest'
-import { TagSys } from '../tag.js'
+import { TagSys } from '../tag'
 
 export type SupportedTypes =
   | EntryFields.Symbol
diff --git a/lib/types/query/query.ts b/lib/types/query/query.ts
index c2172c5e6..669e54edb 100644
--- a/lib/types/query/query.ts
+++ b/lib/types/query/query.ts
@@ -1,36 +1,36 @@
-import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset.js'
-import { ChainModifiers } from '../client.js'
-import { EntrySys } from '../entry.js'
-import { TagLink, TaxonomyConceptLink } from '../link.js'
-import { Metadata } from '../metadata.js'
-import { TagSys } from '../tag.js'
+import { AssetDetails, AssetFile, AssetMimeType, AssetSys } from '../asset'
+import { ChainModifiers } from '../client'
+import { EntrySys } from '../entry'
+import { TagLink, TaxonomyConceptLink } from '../link'
+import { Metadata } from '../metadata'
+import { TagSys } from '../tag'
 import {
   EntryFieldsEqualityFilter,
   EntryFieldsInequalityFilter,
   EqualityFilter,
   InequalityFilter,
-} from './equality.js'
-import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence.js'
-import { LocationSearchFilters } from './location.js'
+} from './equality'
+import { EntryFieldsExistenceFilter, ExistenceFilter } from './existence'
+import { LocationSearchFilters } from './location'
 import {
   AssetOrderFilter,
   TaxonomyOrderFilter,
   EntryOrderFilter,
   EntryOrderFilterWithFields,
   TagOrderFilter,
-} from './order.js'
-import { EntryFieldsRangeFilters, RangeFilters } from './range.js'
-import { ReferenceSearchFilters } from './reference.js'
-import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search.js'
-import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select.js'
-import { EntryFieldsSetFilter } from './set.js'
-import { EntryFieldsSubsetFilters, SubsetFilters } from './subset.js'
+} from './order'
+import { EntryFieldsRangeFilters, RangeFilters } from './range'
+import { ReferenceSearchFilters } from './reference'
+import { EntryFieldsFullTextSearchFilters, FullTextSearchFilters } from './search'
+import { AssetSelectFilter, EntrySelectFilter, EntrySelectFilterWithFields } from './select'
+import { EntryFieldsSetFilter } from './set'
+import { EntryFieldsSubsetFilters, SubsetFilters } from './subset'
 import {
   ConditionalFixedQueries,
   ConditionalListQueries,
   EntrySkeletonType,
   FieldsType,
-} from './util.js'
+} from './util'
 
 export type FixedPagedOptions = {
   skip?: number
diff --git a/lib/types/query/range.ts b/lib/types/query/range.ts
index 095cd4622..a7490829e 100644
--- a/lib/types/query/range.ts
+++ b/lib/types/query/range.ts
@@ -1,5 +1,5 @@
-import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry.js'
-import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util.js'
+import { EntryFields, EntryFieldType, EntryFieldTypes } from '../entry'
+import { ConditionalQueries, EntryFieldsConditionalQueries, EntrySkeletonType } from './util'
 
 type RangeFilterTypes = 'lt' | 'lte' | 'gt' | 'gte'
 
diff --git a/lib/types/query/reference.ts b/lib/types/query/reference.ts
index 81a3249be..b8a895660 100644
--- a/lib/types/query/reference.ts
+++ b/lib/types/query/reference.ts
@@ -1,4 +1,4 @@
-import { EntryFieldTypes } from '../entry.js'
+import { EntryFieldTypes } from '../entry'
 import { ConditionalPick } from 'type-fest'
 
 type SupportedTypes =
diff --git a/lib/types/query/search.ts b/lib/types/query/search.ts
index 92c202d08..e5e468e68 100644
--- a/lib/types/query/search.ts
+++ b/lib/types/query/search.ts
@@ -1,5 +1,5 @@
-import { EntryFields, EntryFieldTypes } from '../entry.js'
-import { ConditionalFixedQueries, FieldsType } from './util.js'
+import { EntryFields, EntryFieldTypes } from '../entry'
+import { ConditionalFixedQueries, FieldsType } from './util'
 
 type SupportedTypes =
   | EntryFields.Text
diff --git a/lib/types/query/select.ts b/lib/types/query/select.ts
index b6f8a22c6..9ce94a97d 100644
--- a/lib/types/query/select.ts
+++ b/lib/types/query/select.ts
@@ -1,7 +1,7 @@
-import { FieldsType } from './util.js'
-import { EntrySys } from '../entry.js'
-import { AssetSys } from '../asset.js'
-import { Metadata } from '../metadata.js'
+import { FieldsType } from './util'
+import { EntrySys } from '../entry'
+import { AssetSys } from '../asset'
+import { Metadata } from '../metadata'
 
 export type SelectFilterPaths<
   Fields extends FieldsType,
diff --git a/lib/types/query/set.ts b/lib/types/query/set.ts
index 70781e773..31a6b7881 100644
--- a/lib/types/query/set.ts
+++ b/lib/types/query/set.ts
@@ -1,5 +1,5 @@
-import { EntryFieldType, EntryFieldTypes } from '../index.js'
-import { EntryFieldsConditionalListQueries } from './util.js'
+import { EntryFieldType, EntryFieldTypes } from '../index'
+import { EntryFieldsConditionalListQueries } from './util'
 
 type SupportedTypes =
   | EntryFieldTypes.Symbol
diff --git a/lib/types/query/subset.ts b/lib/types/query/subset.ts
index 32f30b056..e59a00a5a 100644
--- a/lib/types/query/subset.ts
+++ b/lib/types/query/subset.ts
@@ -1,5 +1,5 @@
-import { EntryFields, EntryFieldType, EntryFieldTypes } from '../index.js'
-import { ConditionalListQueries, EntryFieldsConditionalListQueries } from './util.js'
+import { EntryFields, EntryFieldType, EntryFieldTypes } from '../index'
+import { ConditionalListQueries, EntryFieldsConditionalListQueries } from './util'
 
 type SubsetFilterTypes = 'in' | 'nin'
 
diff --git a/lib/types/query/util.ts b/lib/types/query/util.ts
index 077d8cd9c..13aa2f962 100644
--- a/lib/types/query/util.ts
+++ b/lib/types/query/util.ts
@@ -1,5 +1,5 @@
 import { ConditionalPick } from 'type-fest'
-import { BaseFieldMap, EntryFieldType, EntryFieldTypes } from '../entry.js'
+import { BaseFieldMap, EntryFieldType, EntryFieldTypes } from '../entry'
 
 /**
  * @category Entity
diff --git a/lib/types/space.ts b/lib/types/space.ts
index 852dc6dab..5ab03a3e5 100644
--- a/lib/types/space.ts
+++ b/lib/types/space.ts
@@ -1,5 +1,5 @@
-import { Locale } from './locale.js'
-import { BaseSys } from './sys.js'
+import { Locale } from './locale'
+import { BaseSys } from './sys'
 
 /**
  * System managed metadata for spaces
diff --git a/lib/types/sync.ts b/lib/types/sync.ts
index 98d58d1e8..591856bd1 100644
--- a/lib/types/sync.ts
+++ b/lib/types/sync.ts
@@ -1,9 +1,9 @@
-import { Asset } from './asset.js'
-import { Entry } from './entry.js'
-import { EntitySys } from './sys.js'
-import { EntrySkeletonType } from './query/index.js'
-import { LocaleCode } from './locale.js'
-import { ChainModifiers } from './client.js'
+import { Asset } from './asset'
+import { Entry } from './entry'
+import { EntitySys } from './sys'
+import { EntrySkeletonType } from './query/index'
+import { LocaleCode } from './locale'
+import { ChainModifiers } from './client'
 
 /**
  * @category Sync
diff --git a/lib/types/sys.ts b/lib/types/sys.ts
index 25d23f51d..1a058cb70 100644
--- a/lib/types/sys.ts
+++ b/lib/types/sys.ts
@@ -1,6 +1,6 @@
 import { ContentSourceMapsLookup, CPAContentSourceMaps } from '@contentful/content-source-maps'
-import { EntryFields } from './entry.js'
-import { EnvironmentLink, SpaceLink } from './link.js'
+import { EntryFields } from './entry'
+import { EnvironmentLink, SpaceLink } from './link'
 
 /**
  * Definition of common part of system managed metadata
diff --git a/lib/types/tag.ts b/lib/types/tag.ts
index f1ce3f958..adaaee5ac 100644
--- a/lib/types/tag.ts
+++ b/lib/types/tag.ts
@@ -1,6 +1,6 @@
-import { EntitySys } from './sys.js'
-import { ContentfulCollection } from './collection.js'
-import { UserLink } from './link.js'
+import { EntitySys } from './sys'
+import { ContentfulCollection } from './collection'
+import { UserLink } from './link'
 
 /**
  * System managed metadata for tags
diff --git a/lib/utils/client-helpers.ts b/lib/utils/client-helpers.ts
index 7517895d9..f5ac820aa 100644
--- a/lib/utils/client-helpers.ts
+++ b/lib/utils/client-helpers.ts
@@ -1,4 +1,4 @@
-import { ChainModifiers } from '../types/client.js'
+import { ChainModifiers } from '../types/client'
 
 export type ChainOption<Modifiers extends ChainModifiers = ChainModifiers> = {
   withoutLinkResolution: ChainModifiers extends Modifiers
diff --git a/lib/utils/normalize-select.ts b/lib/utils/normalize-select.ts
index a5dbfe014..7b99a30b5 100644
--- a/lib/utils/normalize-select.ts
+++ b/lib/utils/normalize-select.ts
@@ -1,4 +1,4 @@
-import getQuerySelectionSet from './query-selection-set.js'
+import getQuerySelectionSet from './query-selection-set'
 
 /*
  * sdk relies heavily on sys metadata
diff --git a/lib/utils/resolve-circular.ts b/lib/utils/resolve-circular.ts
index 3f270764b..b9276d51e 100644
--- a/lib/utils/resolve-circular.ts
+++ b/lib/utils/resolve-circular.ts
@@ -1,6 +1,6 @@
 import resolveResponse from 'contentful-resolve-response'
 
-import mixinStringifySafe from '../mixins/stringify-safe.js'
+import mixinStringifySafe from '../mixins/stringify-safe'
 
 export default function resolveCircular(data: any, { resolveLinks, removeUnresolved }): any {
   const wrappedData = mixinStringifySafe(data)
diff --git a/lib/utils/validate-params.ts b/lib/utils/validate-params.ts
index 917dc9fdb..22687293e 100644
--- a/lib/utils/validate-params.ts
+++ b/lib/utils/validate-params.ts
@@ -1,4 +1,4 @@
-import { ValidationError } from './validation-error.js'
+import { ValidationError } from './validation-error'
 
 function checkLocaleParamIsAll(query) {
   if (query.locale === '*') {
diff --git a/lib/utils/validate-timestamp.ts b/lib/utils/validate-timestamp.ts
index 9000ea589..1a126a3fc 100644
--- a/lib/utils/validate-timestamp.ts
+++ b/lib/utils/validate-timestamp.ts
@@ -1,4 +1,4 @@
-import { ValidationError } from './validation-error.js'
+import { ValidationError } from './validation-error'
 
 type Options = {
   maximum?: number