diff --git a/roles/openvpn/base/tasks/main.yml b/roles/openvpn/base/tasks/main.yml
index 1b6d869386..28fe40ea50 100644
--- a/roles/openvpn/base/tasks/main.yml
+++ b/roles/openvpn/base/tasks/main.yml
@@ -15,7 +15,7 @@
   - openvpn
   tags:
   - packages
-  when: ansible_distribution_major_version|int > 22
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: Install certificate and key
   copy: src={{ private }}/files/vpn/openvpn/keys/ca.crt
diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml
index 668165fe40..c582e59308 100644
--- a/roles/openvpn/client/tasks/main.yml
+++ b/roles/openvpn/client/tasks/main.yml
@@ -17,7 +17,7 @@
   tags:
   - packages
   - openvpn
-  when: ansible_distribution_major_version|int > 22
+  when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined
 
 - name: Install configuration files
   copy: src={{ item.file }}