diff --git a/infrastructure/roles/acme/tasks/main.yml b/infrastructure/roles/acme/tasks/main.yml
index 11947c0..6593553 100644
--- a/infrastructure/roles/acme/tasks/main.yml
+++ b/infrastructure/roles/acme/tasks/main.yml
@@ -44,6 +44,18 @@
   register: acme_list
   changed_when: false
 
+- name: Remove stale upper-case NAMECOM_ entries from acme.sh account.conf
+  ansible.builtin.lineinfile:
+    path: "{{ acme_install_dir }}/account.conf"
+    regexp: "^{{ item }}="
+    state: absent
+  loop:
+    - NAMECOM_Username
+    - NAMECOM_Token
+    - SAVED_NAMECOM_Username
+    - SAVED_NAMECOM_Token
+  no_log: true
+
 - name: Store name.com credentials in acme.sh account.conf
   ansible.builtin.lineinfile:
     path: "{{ acme_install_dir }}/account.conf"
@@ -54,8 +66,8 @@
     group: root
     mode: "0600"
   loop:
-    - { key: SAVED_NAMECOM_Username, value: "{{ acme_namecom_username }}" }
-    - { key: SAVED_NAMECOM_Token, value: "{{ acme_namecom_token }}" }
+    - { key: SAVED_Namecom_Username, value: "{{ acme_namecom_username }}" }
+    - { key: SAVED_Namecom_Token, value: "{{ acme_namecom_token }}" }
   no_log: true
 
 - name: Issue certs via DNS-01 (name.com) — skip if already issued
@@ -66,8 +78,8 @@
     --home {{ acme_install_dir }}
     --server letsencrypt
   environment:
-    NAMECOM_Username: "{{ acme_namecom_username }}"
-    NAMECOM_Token: "{{ acme_namecom_token }}"
+    Namecom_Username: "{{ acme_namecom_username }}"
+    Namecom_Token: "{{ acme_namecom_token }}"
   loop: "{{ acme_certs }}"
   register: acme_issue
   changed_when: "'Cert success' in acme_issue.stdout"