diff --git a/src/app/gitlab-ci/gitlab-ci.component.html b/src/app/gitlab-ci/gitlab-ci.component.html
index 246887099ca4acdd67d8d6c8c052bba600adc7ff..7eb85b2add77f6079e5a59dee0ef2dd635d58bb3 100644
--- a/src/app/gitlab-ci/gitlab-ci.component.html
+++ b/src/app/gitlab-ci/gitlab-ci.component.html
@@ -111,8 +111,8 @@
       ></i
     ></label>
   </div>
-  <!-- Gitlab instance -->
-  <div *ngIf="!isProjectMode()" class="input-group input-group-sm ms-4">
+  <!-- Gitlab server FQDN -->
+  <div *ngIf="options.includeMode == includeModes.remote" class="input-group input-group-sm ms-4">
     <label class="input-group-text" for="gitlab-host"
       >GitLab Host
       <i
@@ -180,7 +180,7 @@
           </div>
         </div>
         <div *ngSwitchCase="includeModes.component">
-          <pre>  - <span class="key">component</span>: "<span class="value">{{ serverHost }}/{{ template.project.path }}/{{ template.templateFile }}&#64;{{ template.project.getLatestVersion(options.versionMode) }}</span>"</pre>
+          <pre>  - <span class="key">component</span>: "<span class="value">$CI_SERVER_FQDN/{{ template.project.path }}/{{ template.templateFile }}&#64;{{ template.project.getLatestVersion(options.versionMode) }}</span>"</pre>
           <div [class.hide]="!hasInputs(template)">
             <pre>    <span class="key">inputs</span>:</pre>
             <div class="elements">
diff --git a/src/app/kicker.ts b/src/app/kicker.ts
index e1d5457c10d16787bb70081dd8eac743ff24cff5..5a0d6a357ce8eb782491b8da559cf126590a1ef7 100644
--- a/src/app/kicker.ts
+++ b/src/app/kicker.ts
@@ -453,7 +453,7 @@ export enum VersionMode {
 export class Options {
   showAdvanced = false;
   showStages = false;
-  includeMode = IncludeMode.project;
+  includeMode = IncludeMode.component;
   versionMode = VersionMode.minor;
   ext2enabled = new Map<string, boolean>();
 
diff --git a/src/assets/kicker-aggregated.json b/src/assets/kicker-aggregated.json
index 25e0a5ffae3b613c676f21f951f85d27adca070f..ae911b8a61f1fb39161678efe2e7851f11b721ae 100644
--- a/src/assets/kicker-aggregated.json
+++ b/src/assets/kicker-aggregated.json
@@ -2029,7 +2029,7 @@
           "variables": [
             {
               "name": "DBT_SQLFLUFF_LINT_ARGS",
-              "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/cli.html#sqlfluff-lint)",
+              "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/reference/cli.html#sqlfluff-lint)",
               "advanced": true
             },
             {
@@ -8186,7 +8186,7 @@
         },
         {
           "name": "SQLFLUFF_LINT_ARGS",
-          "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/cli.html#sqlfluff-lint)",
+          "description": "Lint [options and arguments](https://docs.sqlfluff.com/en/stable/reference/cli.html#sqlfluff-lint)",
           "advanced": true
         }
       ],