diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml
index d7c2706f..051ed155 100644
--- a/.github/workflows/build-gluon.yml
+++ b/.github/workflows/build-gluon.yml
@@ -557,6 +557,38 @@ jobs:
           name: ramips-rt305x_output
           path: output
 
+  rockchip-armv8:
+    name: rockchip-armv8
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/cache@v2
+        id: cache-dl
+        with:
+          path: dl_target
+          key: openwrt-dl-rockchip-armv8-${{ hashFiles('modules') }}
+      - name: Prepare download cache
+        if: steps.cache-dl.outputs.cache-hit == 'true'
+        run: mkdir -p openwrt/dl; mv dl_target/* openwrt/dl/; ls openwrt/dl
+      - name: Install Dependencies
+        run: sudo contrib/actions/install-dependencies.sh
+      - name: Build
+        run: contrib/actions/run-build.sh rockchip-armv8
+      - name: Create cache to save
+        if: steps.cache-dl.outputs.cache-hit != 'true'
+        run: mkdir dl_target; mv openwrt/dl/* dl_target/; find dl_target/ -size +20M -delete
+      - name: Archive build logs
+        if: ${{ !cancelled() }}
+        uses: actions/upload-artifact@v1
+        with:
+          name: rockchip-armv8_logs
+          path: openwrt/logs
+      - name: Archive build output
+        uses: actions/upload-artifact@v1
+        with:
+          name: rockchip-armv8_output
+          path: output
+
   sunxi-cortexa7:
     name: sunxi-cortexa7
     runs-on: ubuntu-latest
diff --git a/targets/rockchip-armv8 b/targets/rockchip-armv8
new file mode 100644
index 00000000..23ec9611
--- /dev/null
+++ b/targets/rockchip-armv8
@@ -0,0 +1,9 @@
+defaults {
+	factory = false,
+	sysupgrade = '-ext4-sysupgrade',
+	sysupgrade_ext = '.img.gz',
+}
+
+
+device('friendlyarm-nanopi-r2s', 'friendlyarm_nanopi-r2s')
+
diff --git a/targets/targets.mk b/targets/targets.mk
index 501b3245..2585d430 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -17,6 +17,7 @@ $(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
 $(eval $(call GluonTarget,ramips,mt76x8))
 $(eval $(call GluonTarget,ramips,rt305x))
+$(eval $(call GluonTarget,rockchip,armv8))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))