diff --git a/automation/roles/algo/tasks/main.yml b/automation/roles/algo/tasks/main.yml
index 0a3847e2..da4be0d4 100644
--- a/automation/roles/algo/tasks/main.yml
+++ b/automation/roles/algo/tasks/main.yml
@@ -58,5 +58,5 @@
 
     - include: algo_firewall.yml
   # Don't setup algo when in restore mode, bubble_restore_monitor.sh will set it up after the CA key has been restored
-  tags: post_restore
+  tags: algo_related
 
diff --git a/automation/roles/bubble/files/bubble_restore_monitor.sh b/automation/roles/bubble/files/bubble_restore_monitor.sh
index b996d210..878c152c 100755
--- a/automation/roles/bubble/files/bubble_restore_monitor.sh
+++ b/automation/roles/bubble/files/bubble_restore_monitor.sh
@@ -126,7 +126,7 @@ else
   cd "${ANSIBLE_DIR}" && \
     . ./venv/bin/activate && \
     bash -c \
-      "ansible-playbook ${SSH_OPTIONS} --tags 'post_restore,always' --inventory ./hosts ./playbook.yml 2>&1 >> ${LOG}" \
+      "ansible-playbook ${SSH_OPTIONS} --tags 'algo_related,always' --inventory ./hosts ./playbook.yml 2>&1 >> ${LOG}" \
   || die "Error running ansible in post-restore. journalctl -xe = $(journalctl -xe | tail -n 50)"
 fi
 
diff --git a/automation/roles/mitmproxy/tasks/main.yml b/automation/roles/mitmproxy/tasks/main.yml
index 7ca95385..38898d17 100644
--- a/automation/roles/mitmproxy/tasks/main.yml
+++ b/automation/roles/mitmproxy/tasks/main.yml
@@ -91,7 +91,7 @@
   service:
     name: dnscrypt-proxy
     state: restarted
-  tags: post_restore
+  tags: algo_related
 
 - name: restart supervisord
   service:
diff --git a/automation/roles/mitmproxy/tasks/route.yml b/automation/roles/mitmproxy/tasks/route.yml
index de5c3c05..879d0b25 100644
--- a/automation/roles/mitmproxy/tasks/route.yml
+++ b/automation/roles/mitmproxy/tasks/route.yml
@@ -58,4 +58,4 @@
     - name: save iptables v6 rules
       shell: ip6tables-save > /etc/iptables/rules.v6
       become: yes
-  tags: post_restore
+  tags: algo_related
diff --git a/bubble-server/src/main/resources/ansible/install_local.sh.hbs b/bubble-server/src/main/resources/ansible/install_local.sh.hbs
index 29992c3a..eca55ff3 100644
--- a/bubble-server/src/main/resources/ansible/install_local.sh.hbs
+++ b/bubble-server/src/main/resources/ansible/install_local.sh.hbs
@@ -51,7 +51,7 @@ SSH_OPTIONS="--ssh-extra-args '-o UserKnownHostsFile=/dev/null -o StrictHostKeyC
 
 SKIP_TAGS=""
 if [[ -n "{{restoreKey}}" ]] ; then
-  SKIP_TAGS="--skip-tags post_restore"
+  SKIP_TAGS="--skip-tags algo_related"
 fi
 
 cd "${ANSIBLE_DIR}" && \