diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e3af851..bab2b0c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,6 +67,11 @@ jobs:
     with:
       build_main: ${{ github.event.inputs.build_main }}
 
+  openvpn:
+    uses: ./.github/workflows/openvpn.yml
+    with:
+      build_main: ${{ github.event.inputs.build_main }}
+
   wireshark:
     uses: ./.github/workflows/wireshark.yml
     with:
diff --git a/.github/workflows/openvpn.yml b/.github/workflows/openvpn.yml
new file mode 100644
index 0000000..292ba52
--- /dev/null
+++ b/.github/workflows/openvpn.yml
@@ -0,0 +1,56 @@
+name: Build & Test - openvpn
+
+on:
+  push:
+    branches: [ 'main' ]
+    paths: ['.github/workflows/openvpn.yml', 'openvpn/**']
+  pull_request:
+    branches: [ 'main' ]
+    paths: ['.github/workflows/openvpn.yml', 'openvpn/**']
+  workflow_call:
+    inputs:
+      build_main:
+        description: "Build using liboqs and oqsprovider main branches"
+        required: false
+        default: false
+        type: boolean
+
+env:
+  build-args: |
+    LIBOQS_TAG=main
+    OQSPROVIDER_TAG=main
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - linux/amd64
+          - linux/arm64
+    steps:
+      - uses: actions/checkout@v3
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build the Docker image
+        uses: docker/build-push-action@v6
+        with:
+          load: true
+          context: openvpn
+          platforms: ${{ matrix.platform }}
+          build-args: |
+            MAKE_DEFINES=-j4
+            ${{ (github.event.inputs.build_main == 'true') && env.build-args || null }}
+          tags: oqs-openvpn
+
+      - name: Test openvpn
+        working-directory: ./openvpn
+        run: |
+          sh ./test.sh dilithium5 p521_kyber1024