diff --git a/module/instance/config.php b/module/instance/config.php
index 2c79168cf4..5eb5e9e3b9 100644
--- a/module/instance/config.php
+++ b/module/instance/config.php
@@ -59,4 +59,4 @@ $config->instance->actions->view = array();
 $config->instance->actions->view['mainActions']   = array('visit', 'ajaxStart', 'ajaxStop', 'upgrade');
 $config->instance->actions->view['suffixActions'] = array('ajaxUninstall');
 
-$config->instance->devopsApps = array(89 => 'gitea', 58 => 'gitlab', 59 => 'jenkins', 60 => 'sonarqube', 118 => 'nexus');
+$config->instance->devopsApps = array('gitea', 'gitlab', 'jenkins', 'sonarqube', 'nexus');
diff --git a/module/instance/control.php b/module/instance/control.php
index b36c50cfeb..a17b9e4718 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -133,7 +133,7 @@ class instance extends control
         $customItems     = $this->cne->getCustomItems($instance);
 
         if($instance->status == 'running') $this->instanceZen->saveAuthInfo($instance);
-        if(in_array(strtolower($instance->appName), $this->config->instance->devopsApps))
+        if(in_array($instance->chart, $this->config->instance->devopsApps))
         {
             $url      = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
             $pipeline = $this->loadModel('pipeline')->getByUrl($url);
diff --git a/module/instance/model.php b/module/instance/model.php
index 68741b2754..45b0194f1d 100644
--- a/module/instance/model.php
+++ b/module/instance/model.php
@@ -589,7 +589,7 @@ class InstanceModel extends model
             $settingsMap->global->ingress->host    = $settingsMap->ingress->host;
         }
 
-        if(!empty($this->config->instance->devopsApps[$instance->appID]))
+        if(in_array($instance->chart, $this->config->instance->devopsApps))
         {
             $settingsMap->ci = new stdclass();
             $settingsMap->ci->enabled = true;
diff --git a/module/instance/zen.php b/module/instance/zen.php
index 4b56683c13..674eed1faa 100644
--- a/module/instance/zen.php
+++ b/module/instance/zen.php
@@ -21,7 +21,7 @@ class instanceZen extends instance
      */
     protected function saveAuthInfo(object $instance): void
     {
-        if(empty($this->config->instance->devopsApps[$instance->appID])) return;
+        if(!in_array($instance->chart, $this->config->instance->devopsApps)) return;
 
         $url      = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
         $pipeline = $this->loadModel('pipeline')->getByUrl($url);
@@ -31,7 +31,7 @@ class instanceZen extends instance
         if(empty($tempMappings)) return;
 
         $pipeline = new stdclass();
-        $instance->type        = $this->config->instance->devopsApps[$instance->appID];
+        $instance->type        = $instance->chart;
         $pipeline->type        = $instance->type;
         $pipeline->private     = md5(strval(rand(10,113450)));
         $pipeline->createdBy   = 'system';
diff --git a/module/space/js/createapplication.ui.js b/module/space/js/createapplication.ui.js
index c3fc0f1dde..23847cc9a6 100644
--- a/module/space/js/createapplication.ui.js
+++ b/module/space/js/createapplication.ui.js
@@ -88,6 +88,7 @@ function onChangeStoreAppType(event)
         }
     }
 
+    $('#createStoreAppForm').data('appid', storeApp);
     $('#createStoreAppForm').attr('action', $.createLink('instance', 'install', 'appID=' + storeApp));
 
     var storeAppName = apps[storeApp];
@@ -165,7 +166,8 @@ window.alertResource = function()
     {
         if(res)
         {
-            $('#createStoreAppForm').attr('action', $('#createStoreAppForm').attr('action') + '&checkResource=false');
+            var appID = $('#createStoreAppForm').data('appid');
+            $('#createStoreAppForm').attr('action', $.createLink('instance', 'install', 'appID=' + appID + '&checkResource=false'));
             $('#createStoreAppForm .form-row .toolbar button[type=submit]').trigger('click');
         }
     });