diff --git a/packages/components/button/package.json b/packages/components/button/package.json
index 7327aa6bbe..75d3cb5fe9 100644
--- a/packages/components/button/package.json
+++ b/packages/components/button/package.json
@@ -8,7 +8,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.6.2",
+    "@contentful/f36-core": "^4.0.0",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-icon": "^4.0.0",
+    "@contentful/f36-icons": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/empty-state/package.json b/packages/components/empty-state/package.json
index 306f5b58af..357a790abc 100644
--- a/packages/components/empty-state/package.json
+++ b/packages/components/empty-state/package.json
@@ -9,6 +9,8 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
+    "@contentful/f36-typography": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/forms/src/Label/Label.tsx b/packages/components/forms/src/Label/Label.tsx
index 397a26234f..0f11e7df5e 100644
--- a/packages/components/forms/src/Label/Label.tsx
+++ b/packages/components/forms/src/Label/Label.tsx
@@ -1,6 +1,6 @@
 import { cx, css } from 'emotion';
 import React, { forwardRef } from 'react';
-import type { HTMLProps, ReactNode } from 'react';
+import type { ReactNode } from 'react';
 import tokens from '@contentful/f36-tokens';
 import { Box } from '@contentful/f36-core';
 import type { BoxProps } from '@contentful/f36-core';
@@ -13,7 +13,7 @@ export type LabelInternalProps = {
   /**
    * ID of the input to associate the label with
    */
-  htmlFor: HTMLProps<HTMLLabelElement>['htmlFor'];
+  htmlFor: JSX.IntrinsicElements['label']['htmlFor'];
   /**
    * Whether or not the associated input element is required
    *
diff --git a/packages/components/helptext/package.json b/packages/components/helptext/package.json
index db55b5af57..7b0bf41411 100644
--- a/packages/components/helptext/package.json
+++ b/packages/components/helptext/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/icon/package.json b/packages/components/icon/package.json
index d367d47ecf..9b1ed194be 100644
--- a/packages/components/icon/package.json
+++ b/packages/components/icon/package.json
@@ -9,6 +9,7 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "devDependencies": {
diff --git a/packages/components/icons/package.json b/packages/components/icons/package.json
index fac3a143b8..a2da93fc45 100644
--- a/packages/components/icons/package.json
+++ b/packages/components/icons/package.json
@@ -10,6 +10,7 @@
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-icon": "^4.0.0",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/inputs/src/controlled-input/ControlledInput.tsx b/packages/components/inputs/src/controlled-input/ControlledInput.tsx
index 6a9e77e6d4..5fa4015fd4 100644
--- a/packages/components/inputs/src/controlled-input/ControlledInput.tsx
+++ b/packages/components/inputs/src/controlled-input/ControlledInput.tsx
@@ -30,8 +30,8 @@ export interface ControlledInputProps extends Omit<BoxProps<'div'>, 'ref'> {
   testId?: string;
   canBlurOnEsc?: boolean;
   isIndeterminate?: boolean;
-  inputProps?: Partial<React.InputHTMLAttributes<HTMLInputElement>>;
-  labelProps?: Partial<React.InputHTMLAttributes<HTMLLabelElement>>;
+  inputProps?: Partial<JSX.IntrinsicElements['input']>;
+  labelProps?: Partial<JSX.IntrinsicElements['label']>;
 }
 
 const _ControlledInput = (
diff --git a/packages/components/list/package.json b/packages/components/list/package.json
index fa6cb9e347..d9dceeddec 100644
--- a/packages/components/list/package.json
+++ b/packages/components/list/package.json
@@ -24,6 +24,7 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/note/package.json b/packages/components/note/package.json
index 0867986373..de94e2df4b 100644
--- a/packages/components/note/package.json
+++ b/packages/components/note/package.json
@@ -9,6 +9,9 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-button": "^4.0.0",
+    "@contentful/f36-typography": "^4.0.0",
+    "@contentful/f36-icons": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/pill/package.json b/packages/components/pill/package.json
index 382f85e993..730292c72c 100644
--- a/packages/components/pill/package.json
+++ b/packages/components/pill/package.json
@@ -9,6 +9,9 @@
   "dependencies": {
     "@babel/runtime": "^7.6.2",
     "@contentful/f36-tokens": "^4.0.0",
+    "@contentful/f36-core": "^4.0.0",
+    "@contentful/f36-utils": "^4.0.0",
+    "@contentful/f36-icons": "^4.0.0",
     "emotion": "^10.0.17"
   },
   "peerDependencies": {
diff --git a/packages/components/table/src/Table.tsx b/packages/components/table/src/Table.tsx
index 154b09b18e..084a611e46 100644
--- a/packages/components/table/src/Table.tsx
+++ b/packages/components/table/src/Table.tsx
@@ -1,6 +1,5 @@
 import { cx, css } from 'emotion';
 import React, { forwardRef } from 'react';
-import type { HTMLProps } from 'react';
 import { Box } from '@contentful/f36-core';
 import type { BoxProps } from '@contentful/f36-core';
 import tokens from '@contentful/f36-tokens';
@@ -27,10 +26,9 @@ const styles = {
   }),
 };
 
-export type TableInternalProps = HTMLProps<HTMLTableElement> &
-  Omit<BoxProps<'table'>, 'as'> & {
-    layout?: 'inline' | 'embedded';
-  };
+export type TableInternalProps = Omit<BoxProps<'table'>, 'as'> & {
+  layout?: 'inline' | 'embedded';
+};
 
 export type TableProps = TableInternalProps;
 
diff --git a/packages/forma-36-react-components/src/components/Card/Card.tsx b/packages/forma-36-react-components/src/components/Card/Card.tsx
index 69c7e7c539..b83233e899 100644
--- a/packages/forma-36-react-components/src/components/Card/Card.tsx
+++ b/packages/forma-36-react-components/src/components/Card/Card.tsx
@@ -15,7 +15,7 @@ export interface BaseCardProps {
   /**
    * Used with href to specify target attribute value
    */
-  target?: React.AnchorHTMLAttributes<HTMLAnchorElement>['target'];
+  target?: JSX.IntrinsicElements['a']['target'];
   /**
    * Applies selected styles to the element
    */
diff --git a/packages/forma-36-react-components/src/components/TextLink/TextLink.tsx b/packages/forma-36-react-components/src/components/TextLink/TextLink.tsx
index 061bebd9da..7af82f6feb 100644
--- a/packages/forma-36-react-components/src/components/TextLink/TextLink.tsx
+++ b/packages/forma-36-react-components/src/components/TextLink/TextLink.tsx
@@ -28,9 +28,9 @@ type IconPositionType = 'right' | 'left';
 export interface TextLinkProps {
   children?: React.ReactNode;
   linkType?: TextLinkType;
-  href?: React.AnchorHTMLAttributes<HTMLAnchorElement>['href'];
-  target?: React.AnchorHTMLAttributes<HTMLAnchorElement>['target'];
-  rel?: React.AnchorHTMLAttributes<HTMLInputElement>['rel'];
+  href?: JSX.IntrinsicElements['a']['href'];
+  target?: JSX.IntrinsicElements['a']['target'];
+  rel?: JSX.IntrinsicElements['a']['rel'];
   disabled?: boolean;
   testId?: string;
   onClick?: MouseEventHandler<HTMLAnchorElement | HTMLButtonElement>;