diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
index e538ab6c5e68e..f5bfa697036f3 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-main.yaml
@@ -50,17 +50,24 @@ resources:
       memory: 200Mi
 tests:
 - as: verify
-  commands: make XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache verify-modules
-    verify-gen verify-vendoring
+  commands: |
+    export XDG_DATA_HOME=/tmp/data
+    export XDG_CACHE_HOME=/tmp/cache
+    make verify-modules verify-gen verify-vendoring
   container:
     from: src
 - as: test
-  commands: make KUBEBUILDER_ASSETS_DIR=/tmp/data test
+  commands: |
+    export KUBEBUILDER_ASSETS_DIR=/tmp/data
+    make test
   container:
     from: src
 - as: test-openshift
-  commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data
-    verify test
+  commands: |
+    export XDG_DATA_HOME=/tmp/data
+    export XDG_CACHE_HOME=/tmp/cache
+    export KUBEBUILDER_ASSETS_DIR=/tmp/data
+    make -C openshift verify
   container:
     from: src
 - as: e2e-hypershift
diff --git a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
index 7b1025155b7c8..b627a7d4ba94e 100644
--- a/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
+++ b/ci-operator/config/openshift/cluster-api-provider-openstack/openshift-cluster-api-provider-openstack-release-4.22.yaml
@@ -50,17 +50,24 @@ resources:
       memory: 200Mi
 tests:
 - as: verify
-  commands: make XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache verify-modules
-    verify-gen verify-vendoring
+  commands: |
+    export XDG_DATA_HOME=/tmp/data
+    export XDG_CACHE_HOME=/tmp/cache
+    make verify-modules verify-gen verify-vendoring
   container:
     from: src
 - as: test
-  commands: make KUBEBUILDER_ASSETS_DIR=/tmp/data test
+  commands: |
+    export KUBEBUILDER_ASSETS_DIR=/tmp/data
+    make test
   container:
     from: src
 - as: test-openshift
-  commands: make -C openshift XDG_DATA_HOME=/tmp/data XDG_CACHE_HOME=/tmp/cache KUBEBUILDER_ASSETS_DIR=/tmp/data
-    verify test
+  commands: |
+    export XDG_DATA_HOME=/tmp/data
+    export XDG_CACHE_HOME=/tmp/cache
+    export KUBEBUILDER_ASSETS_DIR=/tmp/data
+    make -C openshift verify
   container:
     from: src
 - as: e2e-hypershift