diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index d1d5cf4d6b8c08972920f1e4ab0b1212e5a14e77..63a4eff448d375ad5a064a894322c876e3b42af6 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -35,4 +35,34 @@
         quiet: true
       vars:
         molecule_service_jpq: '["valkey.service"]|[0]'
+
+    - name: Debug Valkey cloud service status
+      ansible.builtin.debug:
+        msg: "{{ ansible_facts.services | community.general.json_query(molecule_service_jpq) }}"
+        verbosity: 0
+      vars:
+        molecule_service_jpq: '["valkey-server@cloud.service"]|[0]'
+
+    - name: Check that Valkey server cloud is active
+      ansible.builtin.assert:
+        that:
+          - (ansible_facts.services | community.general.json_query(molecule_service_jpq)).state == "active"
+        quiet: true
+      vars:
+        molecule_service_jpq: '["valkey-server@cloud.service"]|[0]'
+
+    - name: Debug Valkey service wp status
+      ansible.builtin.debug:
+        msg: "{{ ansible_facts.services | community.general.json_query(molecule_service_jpq) }}"
+        verbosity: 0
+      vars:
+        molecule_service_jpq: '["valkey-server@wp.service"]|[0]'
+
+    - name: Check that Valkey server wp is active
+      ansible.builtin.assert:
+        that:
+          - (ansible_facts.services | community.general.json_query(molecule_service_jpq)).state == "active"
+        quiet: true
+      vars:
+        molecule_service_jpq: '["valkey-server@wp.service]|[0]'
 ...
diff --git a/tasks/instance_check.yml b/tasks/instance_check.yml
index 62b8ee9e3a9e9acd4c534751b1ce09e2f996c543..e13d886350dfa248d92050518acd8df6643d838a 100644
--- a/tasks/instance_check.yml
+++ b/tasks/instance_check.yml
@@ -28,6 +28,7 @@
     - name: Debug valkey_instance_info_server
       ansible.builtin.debug:
         var: valkey_instance_info_server
+        verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}0{% else %}1{% endif %}"
 
     - name: "Set a fact for the Valkey info for {{ valkey_instance.name }}"
       ansible.builtin.set_fact:
@@ -37,6 +38,7 @@
     - name: Debug valkey_instance_info
       ansible.builtin.debug:
         var: valkey_instance_info
+        verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}0{% else %}1{% endif %}"
       when: valkey_instance_info is defined
 
   tags:
diff --git a/tasks/instance_check_pass.yml b/tasks/instance_check_pass.yml
index 114d4f1913b62126d6705a4a098504026bdaf34c..85c2af5f41f5df2900c6a2ce178032797274230a 100644
--- a/tasks/instance_check_pass.yml
+++ b/tasks/instance_check_pass.yml
@@ -30,6 +30,7 @@
     - name: Debug valkey_instance_info_server
       ansible.builtin.debug:
         var: valkey_instance_info_server
+        verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}0{% else %}1{% endif %}"
 
     - name: "Set a fact for the Valkey info for {{ valkey_instance.name }}"
       ansible.builtin.set_fact:
@@ -39,6 +40,7 @@
     - name: Debug valkey_instance_info
       ansible.builtin.debug:
         var: valkey_instance_info
+        verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}0{% else %}1{% endif %}"
       when: valkey_instance_info is defined
 
   tags:
diff --git a/tasks/instance_present.yml b/tasks/instance_present.yml
index 59aa2b052b393122307cfb0e20b3d0123232370a..bfcc3c04b8de8289174846a8407e5d5f2ef7946f 100644
--- a/tasks/instance_present.yml
+++ b/tasks/instance_present.yml
@@ -125,6 +125,7 @@
         owner: valkey
         group: valkey
         mode: "0600"
+      diff_mode: false
       register: valkey_instance_config_templated
 
     - name: Debug valkey_instance_config_templated
@@ -160,7 +161,7 @@
         - name: Debug valkey_instance_started.status.ActiveState
           ansible.builtin.debug:
             var: valkey_instance_started.status.ActiveState
-            # verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}1{% else %}2{% endif %}"
+            verbosity: "{% if ansible_check_mode | bool or ansible_diff_mode | bool %}0{% else %}1{% endif %}"
           when: valkey_instance_started.status.ActiveState is defined
 
         - name: Check Valkey instance status
diff --git a/tasks/pkg.yml b/tasks/pkg.yml
index 791919a6fa1be0dcf4f3c946fd5bf5428dc946a9..0665cbaa73197d968f0a4c62b51fe9539b13397d 100644
--- a/tasks/pkg.yml
+++ b/tasks/pkg.yml
@@ -160,44 +160,6 @@
         ( ( valkey_apt_installed is defined ) and ( valkey_apt_installed.changed | bool ) ) or
         ( ( valkey_apt_removed is defined ) and ( valkey_apt_removed.changed | bool ) )
 
-    # TODO move to handlers
-    - name: Valkey service enabled and started
-      block:
-
-        - name: Valkey service enabled
-          ansible.builtin.systemd_service:
-            name: valkey-server
-            enabled: true
-          notify: Systemd daemon-reload
-
-        - name: Valkey service started
-          ansible.builtin.systemd_service:
-            name: valkey-server
-            state: started
-
-      when:
-        - ( "valkey-server" in valkey_pkgs_installed )
-        - valkey_enabled | bool
-
-    # TODO move to handlers
-    - name: Valkey service disabled and stopped
-      block:
-
-        - name: Valkey service disabled
-          ansible.builtin.systemd_service:
-            name: valkey-server
-            enabled: false
-          notify: Systemd daemon-reload
-
-        - name: Valkey service stopped
-          ansible.builtin.systemd_service:
-            name: valkey-server
-            state: stopped
-
-      when:
-        - ( "valkey-server" in valkey_pkgs_installed )
-        - not valkey_enabled | bool
-
   tags:
     - valkey
     - valkey_install