diff --git a/github/ci/prow/files/config.yaml b/github/ci/prow/files/config.yaml
index eac7cd5d31..6802015cd7 100644
--- a/github/ci/prow/files/config.yaml
+++ b/github/ci/prow/files/config.yaml
@@ -68,6 +68,7 @@ tide:
     kubevirt/katacoda-scenarios: squash
     kubevirt/demo: squash
     kubevirt/ovs-cni: squash
+    kubevirt/macvtap-cni: squash
     kubevirt/cluster-network-addons-operator: squash
     kubevirt/bridge-marker: squash
     nmstate/kubernetes-nmstate: squash
@@ -101,6 +102,7 @@ tide:
     - kubevirt/containerized-data-importer
     - kubevirt/hostpath-provisioner
     - kubevirt/ovs-cni
+    - kubevirt/macvtap-cni
     - kubevirt/cluster-network-addons-operator
     - kubevirt/bridge-marker
     - nmstate/kubernetes-nmstate
@@ -180,6 +182,10 @@ branch-protection:
           branches:
             master:
               protect: true
+        macvtap-cni:
+          branches:
+            master:
+              protect: true
         common-templates:
           branches:
             master:
diff --git a/github/ci/prow/files/jobs/macvtap-cni/OWNERS b/github/ci/prow/files/jobs/macvtap-cni/OWNERS
new file mode 100644
index 0000000000..7093876a68
--- /dev/null
+++ b/github/ci/prow/files/jobs/macvtap-cni/OWNERS
@@ -0,0 +1,8 @@
+filters:
+  ".*":
+    reviewers:
+      - phoracek
+      - qinqon
+    approvers:
+      - phoracek
+      - qinqon
diff --git a/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-postsubmits.yaml b/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-postsubmits.yaml
new file mode 100644
index 0000000000..c61d0f4a19
--- /dev/null
+++ b/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-postsubmits.yaml
@@ -0,0 +1,26 @@
+postsubmits:
+  kubevirt/macvtap-cni:
+    - name: publish-macvtap-cni-latest
+      always_run: true
+      decorate: true
+      max_concurrency: 1
+      labels:
+        preset-dind-enabled: "true"
+        preset-docker-mirror: "true"
+        preset-kubevirtci-quay-credential: "true"
+      spec:
+        nodeSelector:
+          type: vm
+          zone: ci
+        containers:
+          - image: gcr.io/k8s-testimages/bootstrap:v20190516-c6832d9
+            command:
+              - "/usr/local/bin/runner.sh"
+              - "/bin/bash"
+              - "-c"
+              - "cat $QUAY_PASSWORD | docker login --username $(cat $QUAY_USER) --password-stdin=true quay.io && make docker-build docker-push"
+            # docker-in-docker needs privileged mode
+            securityContext:
+              privileged: true
+
+# TODO: Build new tagged image when there is a new tag
diff --git a/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-presubmits.yaml b/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-presubmits.yaml
new file mode 100644
index 0000000000..07c80be476
--- /dev/null
+++ b/github/ci/prow/files/jobs/macvtap-cni/macvtap-cni-presubmits.yaml
@@ -0,0 +1,63 @@
+presubmits:
+  kubevirt/macvtap-cni:
+    - name: pull-macvtap-cni-unit-test
+      skip_branches:
+        - release-\d+\.\d+
+      annotations:
+        fork-per-release: "true"
+      always_run: true
+      optional: false
+      decorate: true
+      decoration_config:
+        timeout: 3h
+        grace_period: 5m
+      max_concurrency: 6
+      labels:
+        preset-dind-enabled: "true"
+        preset-docker-mirror: "true"
+        preset-shared-images: "true"
+      spec:
+        nodeSelector:
+          type: vm
+          zone: ci
+        containers:
+          - image: gcr.io/k8s-testimages/bootstrap:v20190516-c6832d9
+            securityContext:
+              privileged: true
+            command:
+              - "/usr/local/bin/runner.sh"
+              - "/bin/sh"
+              - "-c"
+              - "automation/check-patch.unit-test.sh"
+
+    - name: pull-macvtap-cni-e2e-k8s
+      skip_branches:
+        - release-\d+\.\d+
+      annotations:
+        fork-per-release: "true"
+      always_run: true
+      optional: false
+      decorate: true
+      decoration_config:
+        timeout: 3h
+        grace_period: 5m
+      max_concurrency: 6
+      labels:
+        preset-dind-enabled: "true"
+        preset-docker-mirror: "true"
+        preset-shared-images: "true"
+      spec:
+        nodeSelector:
+          type: bare-metal-external
+        containers:
+          - image: gcr.io/k8s-testimages/bootstrap:v20190516-c6832d9
+            securityContext:
+              privileged: true
+            resources:
+              requests:
+                memory: "29Gi"
+            command:
+              - "/usr/local/bin/runner.sh"
+              - "/bin/sh"
+              - "-c"
+              - "automation/check-patch.e2e-k8s.sh"
diff --git a/github/ci/prow/files/plugins.yaml b/github/ci/prow/files/plugins.yaml
index 237877c236..99a2d82cea 100644
--- a/github/ci/prow/files/plugins.yaml
+++ b/github/ci/prow/files/plugins.yaml
@@ -66,6 +66,13 @@ plugins:
   - lgtm
   - approve
 
+  kubevirt/macvtap-cni:
+  - trigger
+  - owners-label
+  - lgtm
+  - approve
+  - release-note
+
   kubevirt/machine-remediation-operator:
   - trigger
   - lgtm