diff --git a/azure-pipelines/azure-pipelines.yml b/azure-pipelines/azure-pipelines.yml
index 7b20f3e6d..0113a095f 100644
--- a/azure-pipelines/azure-pipelines.yml
+++ b/azure-pipelines/azure-pipelines.yml
@@ -76,3 +76,12 @@ jobs:
   pool: RPI-64
   steps:
     - template: pi64-dmx.yml
+
+- job: RK3399_64bit
+  strategy:
+    matrix:
+      rockpro64-64bit:
+        platform: 'RK3399'
+  pool: RockPro64
+  steps:
+    - template: rk3399.yml
\ No newline at end of file
diff --git a/azure-pipelines/pi64-dmx.yml b/azure-pipelines/pi64-dmx.yml
index 4440c3a63..b7fc8ae62 100644
--- a/azure-pipelines/pi64-dmx.yml
+++ b/azure-pipelines/pi64-dmx.yml
@@ -1,4 +1,4 @@
-# RPI4, SDL2, 64-bit
+# RPI4, DMX, 64-bit
 steps:
   - checkout: self
     submodules: true
diff --git a/azure-pipelines/rk3399.yml b/azure-pipelines/rk3399.yml
new file mode 100644
index 000000000..641d854b6
--- /dev/null
+++ b/azure-pipelines/rk3399.yml
@@ -0,0 +1,46 @@
+# RK3399, SDL2, 64-bit
+steps:
+  - checkout: self
+    submodules: true
+    clean: true
+  
+  - script: VERSION_TAG=`git describe --abbrev=0` && echo "##vso[task.setvariable variable=VERSION_TAG]$VERSION_TAG"
+    displayName: Set the tag name as an environment variable
+
+  - script: |
+      cd external/capsimg
+      ./bootstrap.fs
+      ./configure.fs
+      make -f Makefile.fs
+      cp capsimg.so $(Build.SourcesDirectory)
+      cd $(Build.SourcesDirectory)
+      make -j4 PLATFORM=n2
+      mkdir amiberry-RK3399-sdl2-64bit
+    displayName: 'Compile for RK3399 SDL2 64-bit'
+  
+  - task: CopyFiles@2
+    inputs:
+     Contents: |
+        amiberry
+        capsimg.so
+        abr/**
+        conf/**
+        controllers/**
+        data/**
+        kickstarts/**
+        savestates/**
+        screenshots/**
+        whdboot/**
+     TargetFolder: amiberry-RK3399-sdl2-64bit
+  
+  - task: ArchiveFiles@2
+    displayName: 'Archive RK3399_release'
+    inputs:
+      rootFolderOrFile: 'amiberry-RK3399-sdl2-64bit'
+      includeRootFolder: true
+      archiveFile: '$(Build.ArtifactStagingDirectory)/amiberry-$(VERSION_TAG)-rk3399-sdl2-64bit.zip'
+
+  - task: PublishBuildArtifacts@1
+    inputs:
+     PathtoPublish: $(Build.ArtifactStagingDirectory)
+     ArtifactName: RK3399_sdl2_release
\ No newline at end of file