diff --git a/.github/workflows/kubevirt-ipam-controller.yaml b/.github/workflows/kubevirt-ipam-controller.yaml
index d3e5ddf1f..bd5923588 100644
--- a/.github/workflows/kubevirt-ipam-controller.yaml
+++ b/.github/workflows/kubevirt-ipam-controller.yaml
@@ -17,6 +17,17 @@ jobs:
       with:
         go-version-file: 'go.mod'
 
+    - name: Free up disk space
+      run: |
+        sudo rm -rf /usr/local/lib/android/sdk
+        sudo apt-get update
+        sudo eatmydata apt-get purge --auto-remove -y \
+          azure-cli aspnetcore-* dotnet-* ghc-* firefox \
+          google-chrome-stable \
+          llvm-* microsoft-edge-stable mono-* \
+          msbuild mysql-server-core-* php-* php7* \
+          powershell temurin-* zulu-*
+
     - name: Run e2e tests
       env:
         KIND_ALLOW_SYSTEM_WRITES: true
diff --git a/automation/components-functests.setup.sh b/automation/components-functests.setup.sh
index 14a0a162e..2be5c9c5e 100644
--- a/automation/components-functests.setup.sh
+++ b/automation/components-functests.setup.sh
@@ -62,20 +62,20 @@ kind: NetworkAddonsConfig
 metadata:
   name: cluster
 spec:
-  linuxBridge: {}
   kubeMacPool:
    rangeStart: "02:00:00:00:00:00"
    rangeEnd: "02:00:00:00:00:0F"
-  ovs: {}
-  macvtap: {}
-  kubeSecondaryDNS: {}
   kubevirtIpamController: {}
   imagePullPolicy: Always
 EOF
 
   if [[ $USE_KUBEVIRTCI == true ]]; then
+    echo "  linuxBridge: {}" >> cr.yaml
     echo "  multus: {}" >> cr.yaml
     echo "  multusDynamicNetworks: {}" >> cr.yaml
+    echo "  ovs: {}" >> cr.yaml
+    echo "  macvtap: {}" >> cr.yaml
+    echo "  kubeSecondaryDNS: {}" >> cr.yaml
   fi
 
   cluster/kubectl.sh apply -f cr.yaml