diff --git a/app/models/clusters/applications/helm.rb b/app/models/clusters/applications/helm.rb
index c35db143205e4a76152ecb3f8436d616395648b6..77c0c61d968c77a9434b35d4680c352defbc465f 100644
--- a/app/models/clusters/applications/helm.rb
+++ b/app/models/clusters/applications/helm.rb
@@ -5,7 +5,7 @@ module Clusters
 
       NAME = 'helm'.freeze
 
-      include ::Clusters::Concerns::AppStatus
+      include ::Clusters::Concerns::ApplicationStatus
 
       belongs_to :cluster, class_name: 'Clusters::Cluster', foreign_key: :cluster_id
 
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb
index 4513dd426e252b71cce7541e122af52391b0d040..3fd8ffb6e92bb684057942ae09e8e4236a2d6dcc 100644
--- a/app/models/clusters/cluster.rb
+++ b/app/models/clusters/cluster.rb
@@ -51,6 +51,12 @@ module Clusters
       end
     end
 
+    def applications
+      [ 
+        application_helm || build_application_helm
+      ]
+    end
+
     def provider
       return provider_gcp if gcp?
     end
diff --git a/app/models/clusters/concerns/app_status.rb b/app/models/clusters/concerns/application_status.rb
similarity index 74%
rename from app/models/clusters/concerns/app_status.rb
rename to app/models/clusters/concerns/application_status.rb
index f6b817e9ce79bf5cab98b039483b014f67300203..e1f4c7fdda852e348209d6b6440fea3b4ddf7c2d 100644
--- a/app/models/clusters/concerns/app_status.rb
+++ b/app/models/clusters/concerns/application_status.rb
@@ -1,14 +1,15 @@
 module Clusters
   module Concerns
-    module AppStatus
+    module ApplicationStatus
       extend ActiveSupport::Concern
 
       included do
-        state_machine :status, initial: :scheduled do
+        state_machine :status, initial: :installable do
           state :errored, value: -1
-          state :scheduled, value: 0
-          state :installing, value: 1
-          state :installed, value: 2
+          state :installable, value: 0
+          state :scheduled, value: 1
+          state :installing, value: 2
+          state :installed, value: 3
 
           event :make_installing do
             transition any - [:installing] => :installing
diff --git a/app/presenters/clusters/cluster_presenter.rb b/app/presenters/clusters/cluster_presenter.rb
index 5e11dac3bd287f2d959485d4104eb8056af100ec..01cb59d0d445971b8b2e6b8c2fb9b3cbf79e3569 100644
--- a/app/presenters/clusters/cluster_presenter.rb
+++ b/app/presenters/clusters/cluster_presenter.rb
@@ -5,11 +5,5 @@ module Clusters
     def gke_cluster_url
       "https://console.cloud.google.com/kubernetes/clusters/details/#{provider.zone}/#{name}" if gcp?
     end
-
-    def applications
-      Clusters::Cluster::APPLICATIONS.map do |key, value|
-        value.find_by(cluster_id: id)
-      end.compact
-    end
   end
 end