diff --git a/device-types/Juniper/MX304-BASE.yaml b/device-types/Juniper/MX304-BASE.yaml
new file mode 100644
index 000000000..e76739b5b
--- /dev/null
+++ b/device-types/Juniper/MX304-BASE.yaml
@@ -0,0 +1,32 @@
+---
+manufacturer: Juniper
+model: MX304
+slug: juniper-mx304-base
+part_number: MX304-BASE
+u_height: 2
+weight: 30
+weight_unit: kg
+airflow: front-to-rear
+front_image: true
+rear_image: true
+is_full_depth: true
+comments: '[Juniper MX304 Data Sheet](https://www.juniper.net/us/en/products/routers/mx-series/mx304-universal-routing-platform-datasheet.html)'
+module-bays:
+  - name: Power Supply 0
+    position: PSU 0
+  - name: Power Supply 1
+    position: PSU 1
+  - name: Fan tray 0
+    position: '0'
+  - name: Fan tray 1
+    position: '1'
+  - name: Fan tray 2
+    position: '2'
+  - name: RE 0
+    position: RE 0
+  - name: RE1 / LMIC 2
+    position: RE1 / LMIC 2
+  - name: LMIC 0
+    position: LMIC 0
+  - name: LMIC 1
+    position: LMIC 1
diff --git a/elevation-images/Juniper/juniper-mx304-base.front.png b/elevation-images/Juniper/juniper-mx304-base.front.png
new file mode 100644
index 000000000..0d505b54b
Binary files /dev/null and b/elevation-images/Juniper/juniper-mx304-base.front.png differ
diff --git a/elevation-images/Juniper/juniper-mx304-base.rear.png b/elevation-images/Juniper/juniper-mx304-base.rear.png
new file mode 100644
index 000000000..0cc8674bf
Binary files /dev/null and b/elevation-images/Juniper/juniper-mx304-base.rear.png differ
diff --git a/module-types/Juniper/MX304-FAN-2RU.yaml b/module-types/Juniper/MX304-FAN-2RU.yaml
new file mode 100644
index 000000000..7f7bd2dd5
--- /dev/null
+++ b/module-types/Juniper/MX304-FAN-2RU.yaml
@@ -0,0 +1,5 @@
+---
+manufacturer: Juniper
+model: MX304-FAN-2RU
+part_number: JNP-FAN-2RU
+comments: Fan module for MX304
diff --git a/module-types/Juniper/MX304-LMIC16.yaml b/module-types/Juniper/MX304-LMIC16.yaml
new file mode 100644
index 000000000..ca0e65a80
--- /dev/null
+++ b/module-types/Juniper/MX304-LMIC16.yaml
@@ -0,0 +1,37 @@
+---
+manufacturer: Juniper
+model: MX304-LMIC16
+part_number: MX304-LMIC16-BASE
+interfaces:
+  - name: et-0/{module}/0
+    type: 400gbase-x-qsfpdd
+  - name: et-0/{module}/1
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/2
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/3
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/4
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/5
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/6
+    type: 400gbase-x-qsfpdd
+  - name: et-0/{module}/7
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/8
+    type: 400gbase-x-qsfpdd
+  - name: et-0/{module}/9
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/10
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/11
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/12
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/13
+    type: 100gbase-x-qsfp28
+  - name: et-0/{module}/14
+    type: 400gbase-x-qsfpdd
+  - name: et-0/{module}/15
+    type: 100gbase-x-qsfp28
diff --git a/module-types/Juniper/MX304-PWR2200-AC.yaml b/module-types/Juniper/MX304-PWR2200-AC.yaml
new file mode 100644
index 000000000..8e9ad9af5
--- /dev/null
+++ b/module-types/Juniper/MX304-PWR2200-AC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Juniper
+model: MX304-PWR2200-AC
+part_number: JNP-PWR2200-AC
+comments: 2200W 240V AC PSU for MX304
+power-ports:
+  - name: PSU {module}
+    type: iec-60320-c14
+    maximum_draw: 2200
diff --git a/module-types/Juniper/MX304-PWR2200-DC.yaml b/module-types/Juniper/MX304-PWR2200-DC.yaml
new file mode 100644
index 000000000..74477ffd0
--- /dev/null
+++ b/module-types/Juniper/MX304-PWR2200-DC.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Juniper
+model: MX304-PWR2200-DC
+part_number: JNP-PWR2200-DC
+comments: 2200W 48V DC PSU for MX304
+power-ports:
+  - name: PSU {module}
+    type: dc-terminal
+    maximum_draw: 2200
diff --git a/module-types/Juniper/MX304-PWR2200-HV.yaml b/module-types/Juniper/MX304-PWR2200-HV.yaml
new file mode 100644
index 000000000..15b582012
--- /dev/null
+++ b/module-types/Juniper/MX304-PWR2200-HV.yaml
@@ -0,0 +1,9 @@
+---
+manufacturer: Juniper
+model: MX304-PWR2200-HV
+part_number: JNP-PWR2200-HV
+comments: 2200W High Voltage AC/DC PSU for MX304
+power-ports:
+  - name: PSU {module}
+    type: saf-d-grid
+    maximum_draw: 2200
diff --git a/module-types/Juniper/MX304-RE.yaml b/module-types/Juniper/MX304-RE.yaml
new file mode 100644
index 000000000..58cbb92b9
--- /dev/null
+++ b/module-types/Juniper/MX304-RE.yaml
@@ -0,0 +1,12 @@
+---
+manufacturer: Juniper
+model: MX304-RE
+part_number: JNP304-RE
+console-ports:
+  - name: '{module}'
+    type: rj-45
+interfaces:
+  - name: '{module}-em0'
+    type: 1000base-t
+    enabled: true
+    mgmt_only: true