diff --git a/roles/_init/tasks/main.yml b/roles/_init/tasks/main.yml
index f63bf4a7..f5fac276 100644
--- a/roles/_init/tasks/main.yml
+++ b/roles/_init/tasks/main.yml
@@ -138,7 +138,7 @@
     # @TODO: This can be removed later
     - name: Catching usage of the old 'deploy_code.keep' variable.
       ansible.builtin.set_fact:
-        keep_builds: "{{ deploy_code.keep|int }}"  # this will only ever exist in project variables
+        keep_builds: "{{ deploy_code.keep }}"  # this will only ever exist in project variables
       when: deploy_code.keep is defined
     - name: Deprecation warning for 'deploy_code.keep' variable.
       ansible.builtin.debug:
@@ -198,7 +198,7 @@
       ansible.builtin.set_fact:
         _build_numbers_to_delete: "{{ _build_numbers_to_delete + [item] }}"
       with_items: "{{ _build_numbers_clean }}"
-      when: _build_directory_index < (_build_directories.matched - keep_builds|default(10))
+      when: _build_directory_index < (_build_directories.matched - keep_builds|default(10)|int)
       loop_control:
         index_var: _build_directory_index