diff --git a/Dockerfile b/Dockerfile
index 98fbc493..68877974 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,10 +42,10 @@ RUN pip3 install --no-cache-dir --upgrade pip==24.0 && \
       pyOpenSSL==24.1.0
 
 # Dive
-RUN curl -LO https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_{{ package_name }}.tar.gz && \
-    tar -xf dive_${DIVE_VERSION}_linux_{{ package_name }}.tar.gz && \
+RUN curl -LO https://github.com/wagoodman/dive/releases/download/v${DIVE_VERSION}/dive_${DIVE_VERSION}_linux_amd64.tar.gz && \
+    tar -xf dive_${DIVE_VERSION}_linux_amd64.tar.gz && \
     mv ./dive /usr/local/bin/dive && \
-    rm -rf dive_${DIVE_VERSION}_linux_{{ package_name }}.tar.gz
+    rm -rf dive_${DIVE_VERSION}_linux_amd64.tar.gz
 
 # Hadolint
 RUN curl -L "https://github.com/hadolint/hadolint/releases/download/v${HADOLINT_VERSION}/hadolint-Linux-x86_64" \
diff --git a/playbooks/fedora.yml b/playbooks/fedora.yml
index 6cae0d1d..f6b501d4 100644
--- a/playbooks/fedora.yml
+++ b/playbooks/fedora.yml
@@ -1,4 +1,7 @@
 ---
+- name: Include a playbook for including arch specifc vars
+  import_playbook: vars.yml
+
 - name: Fedora bootstrap
   hosts:
     - "{{ hosts_to_deploy | default('local') }}"
@@ -8,15 +11,10 @@
     # - debug:
     #     var: hostvars[inventory_hostname]
   roles:
-    - role: pkg_mgmt/flatpak
-      when: ansible_architecture == "x86_64"
-      import_vars: ./group_vars/x86_64.yml
-    - role: desktop/apps/google_chrome
-      when: ansible_architecture == "x86_64"
-    - role: desktop/apps/keeweb
-      when: ansible_architecture == "x86_64"
-    - role: apps/vagrant
-      when: ansible_architecture == "x86_64"
+    - pkg_mgmt/flatpak
+    - desktop/apps/google_chrome
+    - desktop/apps/keeweb
+    - apps/vagrant
     - pkg_mgmt/dnf
     - apps/docker
     - apps/qemu
@@ -28,7 +26,6 @@
     - desktop/fedora
     - apps/nordvpn
 
-
 - name: Include a playbook for generic-core provisioning
   import_playbook: generic-core.yml
 
diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
index 2c06a99d..c425fb36 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all.yml
@@ -1,5 +1,5 @@
 ---
-user_name: 'jakubpospieszny'
+user_name: 'mikee'
 # hostname: "mikeeMac19"
 
 git_modules_path: '/opt/git_modules'
@@ -89,6 +89,8 @@ snap_apps: []
 snap_classic_apps: []
   # - kubectl
   # - helm
+  # Slack and Skype are failing on Wayland Desktop mode
+  # - slack
   # - skype
   #### they are not working on fedora
   # - hollywood
diff --git a/playbooks/group_vars/x86_64.yml b/playbooks/group_vars/x86_64.yml
index 100e16b4..189f01ca 100644
--- a/playbooks/group_vars/x86_64.yml
+++ b/playbooks/group_vars/x86_64.yml
@@ -1,10 +1,4 @@
 ---
-user_name: 'jakubpospieszny'
-# hostname: "mikeeMac19"
-
-git_modules_path: '/opt/git_modules'
-rpms_dwnl_path: '/opt/rpms'
-
 # Flatpak is better for GUI applications
 flatpak_apps:
   # - name: com.valvesoftware.Steam
diff --git a/playbooks/vars.yml b/playbooks/vars.yml
new file mode 100644
index 00000000..bd8a1e3d
--- /dev/null
+++ b/playbooks/vars.yml
@@ -0,0 +1,7 @@
+---
+- name: Include architecture specifc group_vars
+  hosts:
+    - "{{ hosts_to_deploy | default('local') }}"
+  become: true
+  pre_tasks:
+    - include_vars: group_vars/{{ ansible_architecture }}.yml
diff --git a/roles/servers/apps/frigate/docker-compose.yml b/roles/servers/apps/frigate/docker-compose.yml
index 4fef8089..45be1e38 100644
--- a/roles/servers/apps/frigate/docker-compose.yml
+++ b/roles/servers/apps/frigate/docker-compose.yml
@@ -9,8 +9,8 @@ services:
     privileged: true # this may not be necessary for all setups
     restart: always
     # https://hub.docker.com/r/blakeblackshear/frigate
-    # 0.10.1-{{ package_name }}nvidia
-    image: blakeblackshear/frigate:0.10.1-{{ package_name }}
+    # 0.10.1-amd64nvidia
+    image: blakeblackshear/frigate:0.10.1-amd64
     shm_size: "64mb" # update for your cameras based on calculation above
     devices:
       # - /dev/bus/usb:/dev/bus/usb # passes the USB Coral, needs to be modified for other versions