diff --git a/roles/customize_home/tasks/fix_env.yml b/roles/customize_home/tasks/fix_env.yml
index cee51381c..2839ba076 100644
--- a/roles/customize_home/tasks/fix_env.yml
+++ b/roles/customize_home/tasks/fix_env.yml
@@ -8,4 +8,4 @@
     path: "{{ ansible_user_dir }}/foreman/.env"
     regexp: '(.*)--public [a-zA-Z0-9-\.]*(.*)'
     replace: '\1--public {{ ansible_fqdn }}\2'
-  when: stat_result
+  when: stat_result is defined and stat_result | length > 0
diff --git a/roles/foreman_installer/tasks/main.yml b/roles/foreman_installer/tasks/main.yml
index c4d64eab8..0973a0020 100644
--- a/roles/foreman_installer/tasks/main.yml
+++ b/roles/foreman_installer/tasks/main.yml
@@ -5,10 +5,10 @@
   when: ansible_os_family == 'Debian'
 
 - include_tasks: module_prs.yml
-  when: (foreman_installer_module_prs|length > 0) or (foreman_installer_module_branches|length > 0)
+  when: (foreman_installer_module_prs|length > 0|bool) or (foreman_installer_module_branches|length > 0|bool)
 
 - include_tasks: custom_hiera.yml
-  when: foreman_installer_custom_hiera
+  when: (foreman_installer_custom_hiera | bool) and (foreman_installer_custom_hiera|length > 0|bool)
 
 - include_tasks: install.yml
   when: not foreman_installer_upgrade
diff --git a/roles/katello_devel/meta/main.yml b/roles/katello_devel/meta/main.yml
index c7f06fc54..130a77992 100644
--- a/roles/katello_devel/meta/main.yml
+++ b/roles/katello_devel/meta/main.yml
@@ -17,6 +17,7 @@ dependencies:
     foreman_installer_options_internal_use_only:
       - "--katello-devel-admin-password {{ foreman_installer_admin_password }}"
       - "{{ '--katello-devel-github-username=' + katello_devel_github_username if katello_devel_github_username is defined else '' }}"
-      - "--katello-devel-extra-plugins theforeman/foreman_rh_cloud"
-      - "--katello-devel-extra-plugins theforeman/foreman_virt_who_configure"
+      - "--katello-devel-foreman-scm-revision={{ (foreman_repositories_version is defined and foreman_repositories_version != 'nightly') | ternary(foreman_repositories_version + '-stable', 'develop') }}"
+      - "--katello-devel-katello-scm-revision={{ (katello_repositories_version is defined and katello_repositories_version != 'nightly') | ternary('KATELLO-' + katello_repositories_version, 'master') }}"
+      - "--katello-devel-rex-scm-revision={{ foreman_remote_execution_scm_version | default('master') }}"
   - role: customize_home
diff --git a/vagrant/boxes.d/00-debian.yaml b/vagrant/boxes.d/00-debian.yaml
index 6c412d50c..5c5243b57 100644
--- a/vagrant/boxes.d/00-debian.yaml
+++ b/vagrant/boxes.d/00-debian.yaml
@@ -10,6 +10,7 @@ boxes:
     scenarios:
       - foreman
   debian12:
+    memory: 2000
     box_name:   'debian/bookworm64'
     pty:        true
     scenarios:
diff --git a/vagrant/boxes.d/99-local.yaml.example b/vagrant/boxes.d/99-local.yaml.example
index 01bc0d8ee..82e5c64b8 100644
--- a/vagrant/boxes.d/99-local.yaml.example
+++ b/vagrant/boxes.d/99-local.yaml.example
@@ -1,4 +1,27 @@
 ---
+centos9-katello-413-devel:
+  primary: true
+  box: centos9-stream
+  hostname: centos9-katello-413-devel.example.com
+  ansible:
+    playbook: 'playbooks/katello_devel.yml'
+    group: 'devel'
+    variables:
+      ssh_forward_agent: true
+      foreman_devel_github_push_ssh: True
+      katello_devel_github_username: <REPLACE ME>
+      foreman_repositories_environment: staging
+      katello_repositories_environment: staging
+      foreman_repositories_version: "3.11"
+      foreman_client_repositories_version: "3.11"
+      katello_repositories_version: "4.13"
+      pulpcore_repositories_version: "3.49"
+      foreman_puppet_repositories_version: 7
+      foreman_remote_execution_scm_version: "v13.1.0"
+      foreman_installer_options:
+        - "--foreman-proxy-content-enable-ostree=true"
+        - "--katello-devel-modulestream-nodejs=18"
+
 centos9-katello-devel:
   primary: true
   box: centos9-stream
@@ -15,6 +38,8 @@ centos9-katello-devel:
       katello_repositories_version: nightly
       foreman_installer_options:
         - "--foreman-proxy-content-enable-ostree=true"
+        - "--katello-devel-extra-plugins theforeman/foreman_rh_cloud"
+        - "--katello-devel-extra-plugins theforeman/foreman_virt_who_configure"
         #- "--katello-devel-modulestream-nodejs=18"
 
 almalinux8-katello-devel:
diff --git a/vagrant/settings.yaml.example b/vagrant/settings.yaml.example
index 8f488557c..17870e75a 100644
--- a/vagrant/settings.yaml.example
+++ b/vagrant/settings.yaml.example
@@ -1,5 +1,5 @@
 ---
-memory: 4608
+memory: 12000
 cpus: 2
 scale_memory: 1
 scale_cpus: 1
@@ -24,3 +24,4 @@ google_json_key_location: "/path/to/your/private-key.json"
 boxes:
   exclude:
     - fips
+    - "^centos8-stream"