diff --git a/roles/nodered/tasks/rpi_desk.yml b/roles/nodered/tasks/rpi_desk.yml
index bc61c971f..1686994e8 100644
--- a/roles/nodered/tasks/rpi_desk.yml
+++ b/roles/nodered/tasks/rpi_desk.yml
@@ -30,18 +30,21 @@
     - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-restart
     - https://raw.githubusercontent.com/node-red/raspbian-deb-package/master/resources/node-red-log
 
-- name: Create /home/pi/.node-red/ directory (rpi)
-  file:
-    path: /home/pi/.node-red
-    state: directory
-    owner: pi
-    group: pi
-    mode: 0775
+# 2022-06-08 #3245: Raspberry Pi OS recently removed the 'pi' user.  For now,
+# until converging on a longer-term strategy, let's comment out both stanzas.
 
-- name: Install /home/pi/.node-red/settings.js from template, with authentication (rpi)
-  template:
-    src: settings.js.j2
-    dest: /home/pi/.node-red/settings.js
-    owner: pi
-    group: pi
-    mode: 0755
+# - name: Create /home/pi/.node-red/ directory (rpi)
+#   file:
+#     path: /home/pi/.node-red
+#     state: directory
+#     owner: pi
+#     group: pi
+#     mode: 0775
+
+# - name: Install /home/pi/.node-red/settings.js from template, with authentication (rpi)
+#   template:
+#     src: settings.js.j2
+#     dest: /home/pi/.node-red/settings.js
+#     owner: pi
+#     group: pi
+#     mode: 0755