diff --git a/tasks/instance_check_pass.yml b/tasks/instance_check_pass.yml
index 31b962d008a0c11209d2eccb609364fb8677c6d7..9ff54c02ddb52469107e74de320deb1299fb9136 100644
--- a/tasks/instance_check_pass.yml
+++ b/tasks/instance_check_pass.yml
@@ -11,21 +11,22 @@
 - name: Valkey check using password
   block:
 
-    - name: "When active check Valkey info using REDISCLI_AUTH for {{ valkey_instance.name }}"
-      ansible.builtin.command: >-
-        valkey-cli
-        {% if valkey_instance.config.unixsocket is defined %}
-        -s {{ valkey_instance.config.unixsocket }}
-        {% else %}
-        -h localhost -p {{ valkey_instance.config.port }}
-        {% endif %}
-        INFO SERVER
-      environment:
-        REDISCLI_AUTH: "{{ valkey_instance.config.requirepass }}"
-      check_mode: false
-      changed_when: false
-      register: valkey_instance_info_server
-      when: valkey_instance.config.requirepass is defined
+    # TODO Add check for the socket file and check for the open ports before running valkey-cli
+    # - name: "When active check Valkey info using REDISCLI_AUTH for {{ valkey_instance.name }}"
+    #   ansible.builtin.command: >-
+    #     valkey-cli
+    #     {% if valkey_instance.config.unixsocket is defined %}
+    #     -s {{ valkey_instance.config.unixsocket }}
+    #     {% else %}
+    #     -h localhost -p {{ valkey_instance.config.port[0] }}
+    #     {% endif %}
+    #     INFO SERVER
+    #   environment:
+    #     REDISCLI_AUTH: "{{ valkey_instance.config.requirepass }}"
+    #   check_mode: false
+    #   changed_when: false
+    #   register: valkey_instance_info_server
+    #   when: valkey_instance.config.requirepass is defined
 
     - name: Debug valkey_instance_info_server
       ansible.builtin.debug:
diff --git a/tasks/instance_present.yml b/tasks/instance_present.yml
index 074e7992c0ae71e684e76fa8901b9a94e26e4dda..926bd850116e1895a5de660c9be9ceb34f3f20d4 100644
--- a/tasks/instance_present.yml
+++ b/tasks/instance_present.yml
@@ -218,20 +218,21 @@
           tags:
             - debug
 
-        - name: Check Valkey instance status
-          block:
+        # TODO
+        # - name: Check Valkey instance status
+        #   block:
 
-            - name: "Include valkey instance check using REDISCLI_AUTH for {{ valkey_instance.name }}"
-              ansible.builtin.include_tasks: instance_check_pass.yml
-              when: valkey_instance.config.requirepass is defined
+        #     - name: "Include valkey instance check using REDISCLI_AUTH for {{ valkey_instance.name }}"
+        #       ansible.builtin.include_tasks: instance_check_pass.yml
+        #       when: valkey_instance.config.requirepass is defined
 
-            - name: "Include valkey instance check for {{ valkey_instance.name }}"
-              ansible.builtin.include_tasks: instance_check_pass.yml
-              when: valkey_instance.config.requirepass is not defined
+        #     - name: "Include valkey instance check for {{ valkey_instance.name }}"
+        #       ansible.builtin.include_tasks: instance_check_pass.yml
+        #       when: valkey_instance.config.requirepass is not defined
 
-          when:
-            - valkey_instance_enabled.enabled | bool
-            - valkey_instance_started.status.ActiveState == "active"
+        #   when:
+        #     - valkey_instance_enabled.enabled | bool
+        #     - valkey_instance_started.status.ActiveState == "active"
 
       when: valkey_instance_config_file.stat.exists | bool
 
diff --git a/templates/valkey.conf.j2 b/templates/valkey.conf.j2
index 31e73f4c31ab71d8411d82ab6d0b69a18f8748ad..b5a4ebad94c34b9d0f4ae0e4e5f8470ba0e49529 100644
--- a/templates/valkey.conf.j2
+++ b/templates/valkey.conf.j2
@@ -20,8 +20,8 @@
 {%                 else %}
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} no
 {%                 endif %}
-{#             If the value in an empty string print a pair of double quotes #}
-{%             elif valkey_var_pair.value | length == 0 %}
+{#             If the value is not a interger and is an empty string print a pair of double quotes #}
+{%             elif valkey_var_pair.value | ansible.builtin.type_debug != "int" and valkey_var_pair.value | length == 0 %}
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} ""
 {%             else %}
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} {{ valkey_var_pair_value }}
@@ -36,7 +36,7 @@
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} no
 {%             endif %}
 {#         If the value in an empty string print a pair of double quotes #}
-{%         elif valkey_var_pair.value | length == 0 %}
+{%         elif valkey_var_pair.value | ansible.builtin.type_debug != "int" and valkey_var_pair.value | length == 0 %}
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} ""
 {%         else %}
 {{ valkey_var_pair.key | ansible.builtin.regex_replace('_', '-') }} {{ valkey_var_pair.value }}