diff --git a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
index 4f2691e..84ceaa7 100644
--- a/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
+++ b/ansible/roles/poudriere/files/poudriere.d/currentznver4-default-framework-pkglist
@@ -17,6 +17,7 @@ devel/py-jmespath
 devel/py-ptvsd
 devel/py-yamllint
 devel/pyenv
+devel/rust-analyzer
 dns/coredns
 editors/emacs
 editors/mg
diff --git a/ansible/roles/rust/defaults/main.yaml b/ansible/roles/rust/defaults/main.yaml
index cd46847..4e10f54 100644
--- a/ansible/roles/rust/defaults/main.yaml
+++ b/ansible/roles/rust/defaults/main.yaml
@@ -1,2 +1,4 @@
 # Check that rust-analyzer is valid for date on https://rust-lang.github.io/rustup-components-history/
-rust_date: "2024-03-28"
+rust_date: "2024-04-29"
+# rust_analyzer_version: 2024-04-29
+rust_analyzer_version: package
diff --git a/ansible/roles/rust/tasks/freebsd.yaml b/ansible/roles/rust/tasks/freebsd.yaml
index e3a10c2..a120db6 100644
--- a/ansible/roles/rust/tasks/freebsd.yaml
+++ b/ansible/roles/rust/tasks/freebsd.yaml
@@ -4,7 +4,15 @@
       - rust-nightly
     state: present
 
+- name: Install packages
+  when: "rust_analyzer_version is defined and rust_analyzer_version == 'package'"
+  package:
+    name:
+      - rust-analyzer
+    state: present
+
 - name: Create directories
+  when: "rust_analyzer_version is defined and rust_analyzer_version != 'package'"
   file:
     name: "{{ item }}"
     state: directory
@@ -15,14 +23,16 @@
     - "/opt/rust-analyzer"
 
 - name: Clone rust-analyzer Source
+  when: "rust_analyzer_version is defined and rust_analyzer_version != 'package'"
   git:
     repo: "https://github.com/rust-lang/rust-analyzer.git"
     dest: /opt/rust-analyzer
-    version: "2024-04-01"
+    version: "{{ rust_analyzer_version }}"
     force: true
   diff: false
 
 - name: Build rust-analyzer
+  when: "rust_analyzer_version is defined and rust_analyzer_version != 'package'"
   command: "cargo build --release"
   args:
     creates: "/opt/rust-analyzer/target/release/rust-analyzer"