diff --git a/.github/workflows/e2e_run_all.yaml b/.github/workflows/e2e_run_all.yaml
index a75c434a2..b166ea57b 100644
--- a/.github/workflows/e2e_run_all.yaml
+++ b/.github/workflows/e2e_run_all.yaml
@@ -151,10 +151,7 @@ jobs:
   # Run libvirt e2e tests if pull request labeled 'test_e2e_libvirt'
   libvirt:
     name: libvirt
-    if: |
-      github.event_name == 'schedule' ||
-      github.event_name == 'workflow_dispatch' ||
-      contains(github.event.pull_request.labels.*.name, 'test_e2e_libvirt')
+    if: false
     needs: [podvm, image, prep_install]
     strategy:
       fail-fast: false
diff --git a/.github/workflows/podvm_binaries.yaml b/.github/workflows/podvm_binaries.yaml
index 42baadfee..48339f7b5 100644
--- a/.github/workflows/podvm_binaries.yaml
+++ b/.github/workflows/podvm_binaries.yaml
@@ -32,6 +32,7 @@ jobs:
           - amd64
           - s390x
         include:
+          - os: ubuntu
           - os: fedora
             arch: amd64
     steps:
diff --git a/.github/workflows/test_docker.yml b/.github/workflows/test_docker.yml
new file mode 100644
index 000000000..c645a03fe
--- /dev/null
+++ b/.github/workflows/test_docker.yml
@@ -0,0 +1,13 @@
+---
+name: test docker
+
+on:
+  workflow_dispatch:
+
+jobs:
+  e2e:
+    uses: ./.github/workflows/e2e_docker.yaml
+    with:
+      podvm_image: ghcr.io/wainersm/cc-cloud-api-adaptor/podvm-docker-image
+      caa_image: ghcr.io/confidential-containers/cloud-api-adaptor
+    secrets: inherit
\ No newline at end of file
diff --git a/.github/workflows/test_fedora.yml b/.github/workflows/test_fedora.yml
new file mode 100644
index 000000000..75e5090e0
--- /dev/null
+++ b/.github/workflows/test_fedora.yml
@@ -0,0 +1,38 @@
+# Copyright Confidential Containers Contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+# Build and push the pod VM images.
+---
+    name: test fedora
+    on:
+      workflow_dispatch:
+    
+    jobs:
+      podvm_builder:
+        uses: ./.github/workflows/podvm_builder.yaml
+        with:
+          registry: "ghcr.io/wainersm"
+          git_ref: ${{ github.sha }}
+#          image_tag: ${{ github.sha }}
+          image_tag: latest
+        secrets: inherit
+    
+      podvm_binaries:
+        needs: [podvm_builder]
+        uses: ./.github/workflows/podvm_binaries.yaml
+        with:
+          registry: "ghcr.io/wainersm"
+          git_ref: ${{ github.sha }}
+#          image_tag: ${{ github.sha }}
+          image_tag: latest
+        secrets: inherit
+
+      podvm:
+        needs: [podvm_binaries]
+        uses: ./.github/workflows/podvm.yaml
+        with:
+          registry: "ghcr.io/wainersm"
+          git_ref: ${{ github.sha }}
+#          image_tag: ${{ github.sha }}
+          image_tag: latest
+        secrets: inherit
\ No newline at end of file