diff --git a/main.yml b/main.yml
index f549727..ba8edec 100755
--- a/main.yml
+++ b/main.yml
@@ -14,6 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Check for /run/ostree-booted
+  stat: path=/run/ostree-booted
+  register: ostree
+
 - include_role:
     name: arch
   when: ansible_distribution == 'Archlinux'
diff --git a/roles/fedora/tasks/main.yml b/roles/fedora/tasks/main.yml
index 02658e3..8e6d5c2 100644
--- a/roles/fedora/tasks/main.yml
+++ b/roles/fedora/tasks/main.yml
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 - import_tasks: packages-cli.yml
+  when: ostree.stat.exists == false
 - import_tasks: packages-gui.yml
-  when: gui == true
+  when: gui == true and ostree.stat.exists == false
 - import_tasks: modules.yml
 - import_tasks: ssh.yml
 - import_tasks: solokeys.yml
-- import_tasks: vscode.yml
-  when: gui == true
 - import_tasks: packagekit.yml
+  when: ostree.stat.exists == false