diff --git a/designate/upgrade/service_running.sls b/designate/upgrade/service_running.sls
index 4d5dcb1..9af69d0 100644
--- a/designate/upgrade/service_running.sls
+++ b/designate/upgrade/service_running.sls
@@ -1,20 +1,26 @@
-{%- from "designate/map.jinja" import server, pool_manager, agent with context %}
+{%- from "designate/map.jinja" import server, worker, pool_manager, agent with context %}
 
 designate_task_service_running:
   test.show_notification:
     - name: "dump_message_service_running_designate"
     - text: "Running designate.upgrade.service_running"
 
+{%- set dservices = [] %}
+
 {%- if server.get('enabled', false) %}
-  {%- set dservices = server.services %}
+  {%- do dservices.extend(server.services) %}
 {%- endif %}
 
 {%- if pool_manager.get('enabled', false) %}
-  {%- do dservices.append(pool_manager.services) %}
+  {%- do dservices.extend(pool_manager.services) %}
+{%- endif %}
+
+{%- if worker.get('enabled', false) %}
+  {%- do dservices.extend(worker.services) %}
 {%- endif %}
 
 {%- if agent.get('enabled', false) %}
-  {%- do dservices.append(agent.services) %}
+  {%- do dservices.extend(agent.services) %}
 {%- endif %}
 
 {%- for dservice in dservices %}
diff --git a/designate/upgrade/service_stopped.sls b/designate/upgrade/service_stopped.sls
index 83cee90..8f0d981 100644
--- a/designate/upgrade/service_stopped.sls
+++ b/designate/upgrade/service_stopped.sls
@@ -1,20 +1,26 @@
-{%- from "designate/map.jinja" import server, pool_manager, agent with context %}
+{%- from "designate/map.jinja" import server, worker, pool_manager, agent with context %}
 
 designate_task_service_stopped:
   test.show_notification:
     - name: "dump_message_service_stopped_designate"
     - text: "Running dsignate.upgrade.service_stopped"
 
+{%- set dservices = [] %}
+
 {%- if server.get('enabled', false) %}
-  {%- set dservices = server.services %}
+  {%- do dservices.extend(server.services) %}
 {%- endif %}
 
 {%- if pool_manager.get('enabled', false) %}
-  {%- do dservices.append(pool_manager.services) %}
+  {%- do dservices.extend(pool_manager.services) %}
+{%- endif %}
+
+{%- if worker.get('enabled', false) %}
+  {%- do dservices.extend(worker.services) %}
 {%- endif %}
 
 {%- if agent.get('enabled', false) %}
-  {%- do dservices.append(agent.services) %}
+  {%- do dservices.extend(agent.services) %}
 {%- endif %}
 
 {%- for dservice in dservices %}
diff --git a/designate/upgrade/verify/_api.sls b/designate/upgrade/verify/_api.sls
new file mode 100644
index 0000000..927f4e1
--- /dev/null
+++ b/designate/upgrade/verify/_api.sls
@@ -0,0 +1,41 @@
+{%- from "designate/map.jinja" import server with context %}
+
+designate_upgrade_verify_api:
+  test.show_notification:
+    - name: "dump_message_verify_api"
+    - text: "Running designate.upgrade.verify.api"
+
+{%- if server.get('role', 'primary') == 'primary' %}
+{% set Designate_Test_Zone = 'upgradetest.tld.' %}
+designatev2_zone_present:
+  designatev2.zone_present:
+  - cloud_name: admin_identity
+  - name: {{ Designate_Test_Zone }}
+  - email: 'example@doc.com'
+
+designatev2_zone_list:
+  module.run:
+    - name: designatev2.zone_list
+    - kwargs:
+        cloud_name: admin_identity
+
+designatev2_zone_get_details:
+  module.run:
+    - name: designatev2.zone_get_details
+    - kwargs:
+        cloud_name: admin_identity
+        zone_id: {{ Designate_Test_Zone }}
+
+designatev2_zone_get_name_servers:
+  module.run:
+    - name: designatev2.zone_get_name_servers
+    - kwargs:
+        cloud_name: admin_identity
+        zone_id: {{ Designate_Test_Zone }}
+
+
+designatev2_zone_absent:
+  designatev2.zone_absent:
+  - cloud_name: admin_identity
+  - name: {{ Designate_Test_Zone }}
+{%- endif %}
\ No newline at end of file
diff --git a/designate/upgrade/verify/api.sls b/designate/upgrade/verify/api.sls
deleted file mode 100644
index 810026c..0000000
--- a/designate/upgrade/verify/api.sls
+++ /dev/null
@@ -1,7 +0,0 @@
-designate_upgrade_verify_api:
-  test.show_notification:
-    - name: "dump_message_verify_api"
-    - text: "Running designate.upgrade.verify.api"
-
-#TODO: comprehensive designate module should be created to have
-#      a chanse perform managment and monitor actions
diff --git a/designate/upgrade/verify/init.sls b/designate/upgrade/verify/init.sls
new file mode 100644
index 0000000..1afebd4
--- /dev/null
+++ b/designate/upgrade/verify/init.sls
@@ -0,0 +1,2 @@
+include:
+ - designate.upgrade.verify._api