diff --git a/hosts b/hosts
index 91f7d34..81e2681 100644
--- a/hosts
+++ b/hosts
@@ -30,6 +30,7 @@ registry_url=localhost
 registry_user=
 registry_pass=
 bitcoin_version=26.0
+bitcoin_rpcuser=n0xb0x
 bitcoin_rpcpassword=rVhfmriXjB8uFekmn7sLvnUiY610JaOx
 electrs_version=0.10.2
 zerotier_network=
diff --git a/roles/apps/handlers/main.yml b/roles/apps/handlers/main.yml
index 7e9f7de..7292fa6 100644
--- a/roles/apps/handlers/main.yml
+++ b/roles/apps/handlers/main.yml
@@ -1,6 +1,12 @@
 ---
 # handlers file for build
 #
+- name: restart_bitcoin
+  ansible.builtin.systemd_service:
+    name: bitcoin-node.service
+    scope: user
+    state: restarted
+
 - name: rebuild_bitcoin
   ansible.builtin.shell:
     chdir: ~/Containers/bitcoin
diff --git a/roles/apps/tasks/bitcoin.yml b/roles/apps/tasks/bitcoin.yml
index 618e702..ac53ee7 100644
--- a/roles/apps/tasks/bitcoin.yml
+++ b/roles/apps/tasks/bitcoin.yml
@@ -10,6 +10,7 @@
       - "4224:4224"
       - "127.0.0.1:8332:8332"
       - "8333:8333"
+      - "9735:9735"
 
 - name: bitcoin - Create bitcoin data / conf directory
   ansible.builtin.file:
@@ -26,7 +27,9 @@
   ansible.builtin.template:
     src: bitcoin/bitcoin-node.container.j2
     dest: /home/{{ ansible_user }}/.config/containers/systemd/bitcoin-node.container
-  notify: reload_systemctl
+  notify: 
+    - reload_systemctl
+    - restart_bitcoin
 
 - name: bitcoin - Create Containers/bitcoin Dir
   ansible.builtin.file:
@@ -54,8 +57,8 @@
   notify: rebuild_bitcoin
 
 - name: bitcoin - Copy btc_oneshot
-  ansible.builtin.copy:
-    src: bitcoin/bin/btc_oneshot
+  ansible.builtin.template:
+    src: bitcoin/bin/btc_oneshot.j2
     dest: ~/Containers/bitcoin/bin/btc_oneshot
   notify: rebuild_bitcoin
   
diff --git a/roles/apps/files/bitcoin/bin/btc_oneshot b/roles/apps/templates/bitcoin/bin/btc_oneshot.j2
similarity index 75%
rename from roles/apps/files/bitcoin/bin/btc_oneshot
rename to roles/apps/templates/bitcoin/bin/btc_oneshot.j2
index 690f447..bc19ff2 100644
--- a/roles/apps/files/bitcoin/bin/btc_oneshot
+++ b/roles/apps/templates/bitcoin/bin/btc_oneshot.j2
@@ -10,7 +10,7 @@ btc_init
 if [ $# -eq 0 ]; then
     # If IPv6 is in the container do both:
     #set -- '-rpcbind=[::]:8332' '-rpcallowip=::/0' '-rpcallowip=0.0.0.0/0'
-    set -- '-rpcbind=:8332' '-rpcallowip=0.0.0.0/0'
+    set -- '-rpcbind=:8332' '-rpcallowip=0.0.0.0/0' '-rpcuser={{bitcoin_rpcuser}}' '-rpcpassword={{bitcoin_rpcpassword}}'
 fi
 
 exec bitcoind "$@"
diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml
index 9c9cef1..b5a21bd 100644
--- a/roles/config/tasks/main.yml
+++ b/roles/config/tasks/main.yml
@@ -116,11 +116,11 @@
       strategy = "periodic"
 
       [updates.periodic]
-      time_zone={{ update_schedule_timezone }}
+      time_zone="{{ update_schedule_timezone }}"
 
       [[updates.periodic.window]]
       days = {{ update_schedule_days }}
-      start_time = {{ update_schedule_starttime }}
+      start_time = "{{ update_schedule_starttime }}"
       length_minutes = {{ update_schedule_length }}