diff --git a/environments/.stackhpc/inventory/extra_groups b/environments/.stackhpc/inventory/extra_groups
index 0d7fb53b5..b6cb02651 100644
--- a/environments/.stackhpc/inventory/extra_groups
+++ b/environments/.stackhpc/inventory/extra_groups
@@ -40,3 +40,6 @@ cluster
 
 [compute_init:children]
 compute
+
+[topology:children]
+compute
diff --git a/environments/common/inventory/group_vars/all/openondemand.yml b/environments/common/inventory/group_vars/all/openondemand.yml
index 4337e0d89..1191250d9 100644
--- a/environments/common/inventory/group_vars/all/openondemand.yml
+++ b/environments/common/inventory/group_vars/all/openondemand.yml
@@ -158,7 +158,9 @@ openondemand_apps_desktop_default:
       native:
         - <%= "--nodes=1" %>
         - <%= "--ntasks=#{num_cores}" %>
+        <% if node != '' %>
         - <%= "--nodelist=#{node}" %>
+        <% end %>
         <% if gres != 'none' %>
         - <%= "--gres=#{gres}:#{gres_count}" %>
         <% end %>
@@ -218,7 +220,9 @@ openondemand_apps_jupyter_default:
       native:
         - <%= "--nodes=1" %>
         - <%= "--ntasks=#{num_cores}" %>
+        <% if node != '' %>
         - <%= "--nodelist=#{node}" %>
+        <% end %>
         <% if gres != 'none' %>
         - <%= "--gres=#{gres}:#{gres_count}" %>
         <% end %>