diff --git a/roles/mrlesmithjr.ansible-manage-lvm/tasks/create_fs.yml b/roles/mrlesmithjr.ansible-manage-lvm/tasks/create_fs.yml
index 0e842f95..1fffca17 100644
--- a/roles/mrlesmithjr.ansible-manage-lvm/tasks/create_fs.yml
+++ b/roles/mrlesmithjr.ansible-manage-lvm/tasks/create_fs.yml
@@ -45,6 +45,7 @@
     - lv.create|bool
     - lv.filesystem is defined
     - lv.filesystem != 'None'
+    - lv.filesystem != 'swap'
     - lv.filesystem != 'xfs'
 
 - name: create_fs | creating new xfs filesystem on new LVM logical volume(s)
diff --git a/roles/mrlesmithjr.ansible-manage-lvm/tasks/debian.yml b/roles/mrlesmithjr.ansible-manage-lvm/tasks/debian.yml
index ccc8779d..1ca87ec8 100644
--- a/roles/mrlesmithjr.ansible-manage-lvm/tasks/debian.yml
+++ b/roles/mrlesmithjr.ansible-manage-lvm/tasks/debian.yml
@@ -1,4 +1,10 @@
 ---
+- name: debian | Updating Apt Cache
+  apt:
+    update_cache: true
+    cache_valid_time: 3600
+  become: true
+
 - name: debian | installing pre-reqs
   apt:
     name:
diff --git a/roles/mrlesmithjr.ansible-manage-lvm/tasks/main.yml b/roles/mrlesmithjr.ansible-manage-lvm/tasks/main.yml
index c69013d5..f964122c 100644
--- a/roles/mrlesmithjr.ansible-manage-lvm/tasks/main.yml
+++ b/roles/mrlesmithjr.ansible-manage-lvm/tasks/main.yml
@@ -4,8 +4,9 @@
   set_fact:
     rescan_scsi_command: "/sbin/rescan-scsi-bus"
   when:
-    - ansible_distribution | replace(' ','') | lower == 'debian'
-    - ansible_distribution_major_version is version(10, '<=')
+    - ansible_facts.distribution | replace(' ','') | lower == 'debian'
+    - ansible_facts.distribution_release not in ('bookworm', 'sid')
+    - ansible_facts.distribution_major_version is version(10, '<=')
 
 - include_tasks: debian.yml
   when: ansible_facts.os_family == "Debian"