diff --git a/barbican/upgrade/upgrade/init.sls b/barbican/upgrade/upgrade/init.sls
index db53259..954c399 100644
--- a/barbican/upgrade/upgrade/init.sls
+++ b/barbican/upgrade/upgrade/init.sls
@@ -6,8 +6,12 @@
     - text: "Running barbican.upgrade.upgrade"
 
 include:
+{%- if server.get('enabled', False) %}
  - barbican.upgrade.service_stopped
+{%- endif %}
  - barbican.upgrade.pkgs_latest
+{%- if server.get('enabled', False) %}
  - barbican.upgrade.render_config
  - barbican.db.offline_sync
  - barbican.upgrade.service_running
+{%- endif %}
diff --git a/barbican/upgrade/verify/_api.sls b/barbican/upgrade/verify/_api.sls
index ab3b237..ab7be63 100644
--- a/barbican/upgrade/verify/_api.sls
+++ b/barbican/upgrade/verify/_api.sls
@@ -5,7 +5,7 @@
     - name: "dump_message_verify_api_barbican"
     - text: "Running barbican.upgrade.verify.api"
 
-{%- if server.enabled %}
+{%- if server.get('enabled', False) %}
   {%- set secret_name = 'api_verify_secret_test' %}
   {%- set secret_payload = salt['hashutil.base64_b64encode']('My_SaltTest_Payload') %}
 
diff --git a/barbican/upgrade/verify/init.sls b/barbican/upgrade/verify/init.sls
index f459c58..4dbca6e 100644
--- a/barbican/upgrade/verify/init.sls
+++ b/barbican/upgrade/verify/init.sls
@@ -1,8 +1,12 @@
+{%- from "barbican/map.jinja" import server, client with context %}
+
 barbican_upgrade_verify:
   test.show_notification:
     - name: "dump_message_upgrade_barbican_verify"
     - text: "Running barbican.upgrade.verify"
 
+{%- if server.get('enabled', False) %}
 include:
  - barbican.upgrade.verify._api
  - barbican.upgrade.verify._service
+{%- endif %}