diff --git a/.github/workflows/ubuntu_22_and_test.yml b/.github/workflows/ubuntu_22_and_test.yml
index a9e1f1bd..51debf56 100644
--- a/.github/workflows/ubuntu_22_and_test.yml
+++ b/.github/workflows/ubuntu_22_and_test.yml
@@ -71,6 +71,19 @@ jobs:
           echo ${{ env.FABRIC_SLIVER_PUBKEY }} | base64 --decode > ${{ github.workspace }}/creds/sliver.pub
           echo ${{ env.SENSE_SLIVER_KEY }} | base64 --decode > ${{ github.workspace }}/creds/sense
 
+      - name: Test Fabric FacilityPort
+        if: ${{ env.RUN_FABRIC_AWS_SEND == 'false' || env.RUN_FABRIC_AWS_SEND == false }} 
+        run: |
+          session=cicd-fabric-facility-port
+          echo "vlan: 3102" > $session-varfile.yml
+          ${{ github.workspace }}/cicd/run-fabfed.sh cicd/test_configs/fabric_facility_port $session $session-varfile.yml
+
+      - name: Test L2VPN with nodes.
+        if: ${{ env.RUN_FABRIC_AWS_SEND == 'false' || env.RUN_FABRIC_AWS_SEND == false }} 
+        run: |
+          ${{ github.workspace }}/cicd/run-fabfed.sh cicd/test_configs/fabric_l2_vpn cicd-fabric-l2-vpn
+
       - name: Test SENSE/AWS.
+        if: ${{ env.RUN_FABRIC_AWS_SEND == 'true' || env.RUN_FABRIC_AWS_SEND == true  }} 
         run: |
           ${{ github.workspace }}/cicd/run-fabfed.sh cicd/test_configs/fabric_sense_aws cicd-sense-aws