diff --git a/module/space/config.php b/module/space/config.php
index 71eee353ce..9f20a472ed 100644
--- a/module/space/config.php
+++ b/module/space/config.php
@@ -1,4 +1,3 @@
 <?php
 $config->space = new stdclass();
-$config->space->zentaoApps = array('GitLab', 'GitFox', 'Gitea', 'Gogs', 'Jenkins', 'SonarQube');
-
+$config->space->zentaoApps = array('GitLab', 'Gitea', 'Gogs', 'Jenkins', 'SonarQube');
diff --git a/module/space/control.php b/module/space/control.php
index 50d760f3af..e2b0255bf8 100644
--- a/module/space/control.php
+++ b/module/space/control.php
@@ -73,7 +73,6 @@ class space extends control
 
         $this->app->loadLang('sonarqube');
         $this->app->loadLang('jenkins');
-        $this->app->loadLang('gitfox');
 
         $apps       = array();
         $defaultApp = '';
diff --git a/module/space/js/createapplication.ui.js b/module/space/js/createapplication.ui.js
index 153b1a02b0..52e96aa6a4 100644
--- a/module/space/js/createapplication.ui.js
+++ b/module/space/js/createapplication.ui.js
@@ -16,7 +16,7 @@ function onChangeType(event)
     }
 }
 
-function onChangeAppType(event)
+window.onChangeAppType = function(event)
 {
     const appType = $(event.target).val();
 
@@ -51,11 +51,6 @@ function onChangeAppType(event)
             $('#url').attr('placeholder', gitlabUrlTips);
             $('#token').attr('placeholder', gitlabTokenTips);
             break;
-        case 'gitfox':
-            $('#createAppForm').attr('action', $.createLink('gitfox', 'create'));
-            $('#url').attr('placeholder', gitfoxUrlTips);
-            $('#token').attr('placeholder', gitfoxTokenTips);
-            break;
         case 'gitea':
             $('#createAppForm').attr('action', $.createLink('gitea', 'create'));
             break;
diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php
index 828ad0991c..7e398a854e 100644
--- a/module/space/ui/createapplication.html.php
+++ b/module/space/ui/createapplication.html.php
@@ -10,7 +10,7 @@ declare(strict_types=1);
  */
 namespace zin;
 
-$service     = strtolower(key($lang->space->appType));
+$service     = key($lang->space->appType);
 $showVersion = getenv('ALLOW_SELECT_VERSION') && (strtolower(getenv('ALLOW_SELECT_VERSION')) == 'true' || strtolower(getenv('ALLOW_SELECT_VERSION')) == '1');
 $dbTypeItems = array();
 foreach($lang->instance->dbTypes as $type => $db) $dbTypeItems[] = array('text' => $db, 'value' => $type);
@@ -19,8 +19,6 @@ $colWidth = isInModal() ? 'full' : '2/3';
 
 jsVar('gitlabUrlTips', $lang->gitlab->placeholder->url);
 jsVar('gitlabTokenTips', $lang->gitlab->placeholder->token);
-jsVar('gitfoxUrlTips', $lang->gitfox->placeholder->url);
-jsVar('gitfoxTokenTips', $lang->gitfox->placeholder->token);
 jsVar('sonarqubeUrlTips', $lang->sonarqube->placeholder->url);
 jsVar('jenkinsTokenTips', $lang->jenkins->tokenFirst);
 jsVar('jenkinsPasswordTips', $lang->jenkins->tips);
@@ -167,18 +165,6 @@ if($config->inQuickon)
     );
 }
 
-$typeList = array();
-foreach($lang->space->appType as $type => $typeName)
-{
-    $item = array('text' => $typeName, 'value' => $type);
-    if($type == 'gitfox')
-    {
-        $item['content'] = array('html' => "<div class='flex clip'>{$typeName}</div><label class='label bg-primary-50 text-primary ml-2 flex-none'>{$this->lang->recommend}</label>", 'class' => 'w-full flex nowrap');
-    }
-
-    $typeList[] = $item;
-}
-
 formPanel
 (
     $config->inQuickon ? setClass('externalPanel hidden') : setClass('externalPanel'),
@@ -191,8 +177,9 @@ formPanel
         set::width($colWidth),
         set::label($lang->app->common),
         set::name('appType'),
-        set::items($typeList),
+        set::items($lang->space->appType),
         set::required(true),
+        set::control(array('type' => 'picker', 'id' => 'appType')),
         on::change('onChangeAppType')
     ),
     $config->inQuickon ? formGroup