diff --git a/_data/devices/a21s.yml b/_data/devices/a21s.yml
new file mode 100644
index 000000000..e2b1d79c5
--- /dev/null
+++ b/_data/devices/a21s.yml
@@ -0,0 +1,42 @@
+architecture: arm64
+battery: {capacity: 5000, removable: False, tech: 'Li-Ion'}
+before_install: {instructions: 'needs_specific_android_fw', lineage_version: 22.1, version: '12'}
+before_recovery_install: samsung_a21s
+bluetooth: {profiles: [A2DP], spec: '5'}
+cameras:
+ - {flash: 'LED', info: '48 MP'}
+ - {flash: 'LED', info: '8 MP (ultrawide)'}
+ - {flash: None, info: '2 MP (macro)'}
+ - {flash: None, info: '2 MP (depth)'}
+codename: a21s
+cpu: Cortex-A55
+cpu_cores: '8'
+cpu_freq: 8 x 2.0 GHz
+current_branch: 22.1
+dimensions: {depth: 8.9, height: 163.7, width: 75.3}
+download_boot: With the device powered off, hold Volume Up + Volume Down and connect USB cable to PC.
+firmware_update: firmware_update_samsung_a21s
+gpu: ARM Mali-G52 MC2
+image: a21s.png
+install_method: heimdall
+kernel: {repo: android_kernel_samsung_exynos850, version: '4.19'}
+maintainers: [DaemonMCR]
+models: [SM-A217F, Sm-A217M, SM-A217F/DS, SM-A217F/DSN, SM-A217M/DS]
+name: Galaxy A21s
+network: [2G GSM, 3G UMTS, 4G LTE]
+peripherals: [3.5mm jack, Accelerometer, Compass, Fingerprint reader, GPS, Gyroscope, Proximity sensor]
+quirks: [ims]
+ram: 2/3/4/6 GB
+recovery_boot: With the device powered off, hold Volume Up + Power while the device is connected to a PC via USB cable.
+recovery_partition_name: recovery
+release: 2020
+screen: {refresh_rate: 60, resolution: '720x1600', size: 6.5, technology: 'PLS LCD'}
+sdcard: {size_max: '512 GB', slot: 'hybrid'}
+soc: Samsung Exynos 850
+storage: 32/64/128 GB
+tree: android_device_samsung_a21s
+type: phone
+vendor: Samsung
+vendor_short: samsung
+versions: [22.1]
+wifi: 802.11 a/b/g/n/ac
diff --git a/_includes/templates/device_specific/before_recovery_install_samsung_a21s.md b/_includes/templates/device_specific/before_recovery_install_samsung_a21s.md
new file mode 100644
index 000000000..c684daeeb
--- /dev/null
+++ b/_includes/templates/device_specific/before_recovery_install_samsung_a21s.md
@@ -0,0 +1,15 @@
+## Pre-Install Instructions
+
+{% include alerts/warning.html content="The following instructions will unlock the bootloader and wipe all userdata on the device." %}
+
+1. Connect the device to a Wi-Fi network.
+2. Enable Developer Options by pressing the "Build Number" option at least 7 times, in the "Settings" app within the "About" menu
+3. Within the "Settings" app go to "Date and Time" and change the date to be 2 years in the past
+4. Reboot the device
+5. Go to the Developer Options menu in the "Settings" app and enable OEM unlock
+6. Power off the device, and boot it into download mode:
+ * {{ device.download_boot }}
+ * Now, click the button that the onscreen instructions correlate to "Continue" and/or "Unlock Bootloader".
+7. Your device will reboot and format all user data, you may now unplug the USB cable from your device.
+8. Run through Android Setup, it is crucial that you connect to a Wi-Fi network when setting up the device
+9. Re-enable Development settings by clicking the "Build Number" option 7 times, in the "Settings" app within the "About" menu, and verify that "OEM Unlock" is still enabled in the "Developer options" menu.
diff --git a/_includes/templates/device_specific/firmware_update_samsung_a21s.md b/_includes/templates/device_specific/firmware_update_samsung_a21s.md
new file mode 100644
index 000000000..3158a7814
--- /dev/null
+++ b/_includes/templates/device_specific/firmware_update_samsung_a21s.md
@@ -0,0 +1,14 @@
+There are two possibilities to get the latest firmware:
+
+### You are still on the stock OS with locked bootloader
+
+1. Simply perform OTA updates until the device reports that no updates are available.
+
+### You already installed a custom recovery
+
+1. Download the latest firmware for your model [here](https://github.com/DaemonMCR/samsung-sm-a217x-fw/releases) (All `.tar.md5` files)
+ {% include alerts/note.html content="You can find your model number under About Phone in your phone's Settings app!" %}
+2. Flash the just downloaded files using Odin. You can have a look at the [recovery installation instructions]({{ device | device_link: "/install" | append: "#installing-lineage-recovery-using-odin" | relative_url }}) if you forgot how to do that.
+ {% include alerts/note.html content="The filenames will give you a hint on which slot to flash each file to!" %}
+
+{% include snippets/fw_update_success.md %}
diff --git a/images/devices/a21s.png b/images/devices/a21s.png
new file mode 100644
index 000000000..ad000368c
Binary files /dev/null and b/images/devices/a21s.png differ
diff --git a/images/devices/small/a21s.png b/images/devices/small/a21s.png
new file mode 100644
index 000000000..b4a0abb2e
Binary files /dev/null and b/images/devices/small/a21s.png differ
diff --git a/pages/build/a21s.md b/pages/build/a21s.md
new file mode 100644
index 000000000..6ec3ba21e
--- /dev/null
+++ b/pages/build/a21s.md
@@ -0,0 +1,8 @@
+---
+sidebar: home_sidebar
+title: Build for a21s
+folder: build
+permalink: /devices/a21s/build/
+device: a21s
+---
+{% include templates/device_build.md %}
diff --git a/pages/fw_update/a21s.md b/pages/fw_update/a21s.md
new file mode 100644
index 000000000..fef4576e3
--- /dev/null
+++ b/pages/fw_update/a21s.md
@@ -0,0 +1,10 @@
+---
+sidebar: home_sidebar
+title: Update firmware on a21s
+folder: fw_update
+permalink: /devices/a21s/fw_update/
+device: a21s
+---
+{% assign device = site.data.devices[page.device] %}
+{% capture path %}templates/device_specific/{{ device.firmware_update }}.md{% endcapture %}
+{% include {{ path }} %}
diff --git a/pages/info/a21s.md b/pages/info/a21s.md
new file mode 100644
index 000000000..ada6f156d
--- /dev/null
+++ b/pages/info/a21s.md
@@ -0,0 +1,9 @@
+---
+sidebar: home_sidebar
+title: Info about a21s
+folder: info
+layout: deviceinfo
+permalink: /devices/a21s/
+device: a21s
+---
+{% include templates/device_info.md %}
diff --git a/pages/install/a21s.md b/pages/install/a21s.md
new file mode 100644
index 000000000..204a81478
--- /dev/null
+++ b/pages/install/a21s.md
@@ -0,0 +1,8 @@
+---
+sidebar: home_sidebar
+title: Install LineageOS on a21s
+folder: install
+permalink: /devices/a21s/install/
+device: a21s
+---
+{% include templates/device_install.md %}
diff --git a/pages/update/a21s.md b/pages/update/a21s.md
new file mode 100644
index 000000000..cf631439a
--- /dev/null
+++ b/pages/update/a21s.md
@@ -0,0 +1,8 @@
+---
+sidebar: home_sidebar
+title: Update LineageOS on a21s
+folder: update
+permalink: /devices/a21s/update/
+device: a21s
+---
+{% include templates/device_update.md %}
diff --git a/pages/upgrade/a21s.md b/pages/upgrade/a21s.md
new file mode 100644
index 000000000..4794f1036
--- /dev/null
+++ b/pages/upgrade/a21s.md
@@ -0,0 +1,8 @@
+---
+sidebar: home_sidebar
+title: Upgrade LineageOS on a21s
+folder: upgrade
+permalink: /devices/a21s/upgrade/
+device: a21s
+---
+{% include templates/device_upgrade.md %}
diff --git a/test/schema-06.yml b/test/schema-06.yml
index 8cc5ba512..f42a5a87c 100644
--- a/test/schema-06.yml
+++ b/test/schema-06.yml
@@ -367,6 +367,7 @@ definitions:
- Qualcomm SM8450 Snapdragon 8 Gen1
- Qualcomm SM8475 Snapdragon 8+ Gen1
- Qualcomm SM8550 Snapdragon 8 Gen2
+ - Samsung Exynos 850
- Samsung Exynos 4210
- Samsung Exynos 4412
- Samsung Exynos 5250