diff --git a/app/components/templates/templates.html b/app/components/templates/templates.html
index 633e9cf92..92664fad0 100644
--- a/app/components/templates/templates.html
+++ b/app/components/templates/templates.html
@@ -356,8 +356,8 @@
             <div class="form-group" style="margin-bottom: 0">
               <div class="boxselector_wrapper">
                 <div ng-click="updateCategories(templates, state.filters.Type)">
-                  <input type="radio" id="registry_quay" ng-model="state.filters.Type" value="stack">
-                  <label for="registry_quay">
+                  <input type="radio" id="template_stack" ng-model="state.filters.Type" value="stack">
+                  <label for="template_stack">
                     <div class="boxselector_header">
                       <i class="fa fa-th-list" aria-hidden="true" style="margin-right: 2px;"></i>
                       Stack
@@ -366,8 +366,8 @@
                   </label>
                 </div>
                 <div ng-click="updateCategories(templates, state.filters.Type)">
-                  <input type="radio" id="registry_custom" ng-model="state.filters.Type" value="container">
-                  <label for="registry_custom">
+                  <input type="radio" id="template_container" ng-model="state.filters.Type" value="container">
+                  <label for="template_container">
                     <div class="boxselector_header">
                       <i class="fa fa-server" aria-hidden="true" style="margin-right: 2px;"></i>
                       Container
diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js
index 0b03d76c5..142683224 100644
--- a/app/components/templates/templatesController.js
+++ b/app/components/templates/templatesController.js
@@ -246,7 +246,8 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer
     var endpointMode = $scope.applicationState.endpoint.mode;
     var apiVersion = $scope.applicationState.endpoint.apiVersion;
 
-    if (endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' && apiVersion >= 1.25) {
+    if (templatesKey !== 'linuxserver.io'
+      && endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' && apiVersion >= 1.25) {
       $scope.state.filters.Type = 'stack';
       $scope.state.showDeploymentSelector = true;
     }
diff --git a/app/models/api/templateLinuxServer.js b/app/models/api/templateLinuxServer.js
index d6c0d210b..0606ef526 100644
--- a/app/models/api/templateLinuxServer.js
+++ b/app/models/api/templateLinuxServer.js
@@ -1,4 +1,5 @@
 function TemplateLSIOViewModel(data) {
+  this.Type = data.type;
   this.Title = data.title;
   this.Note = data.description;
   this.Categories = data.category ? data.category : [];