diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aba737cdf3f3cb5263759bc167d5c364d3e0f129..baf32e31aa4cc5ddd7e9a8b418ce57b122a2c7fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,8 +31,6 @@ cache:
 
 prepare:
   stage: prepare
-  tags:
-    - shared
   script:
     - if [[ ! -d node_modules ]]; then npm ci --force; fi
   except:
@@ -43,8 +41,6 @@ build:
   stage: build
   dependencies:
     - prepare
-  tags:
-    - shared
   script:
     - npm run build
   artifacts:
@@ -59,8 +55,6 @@ test:
   timeout: 30 minutes
   dependencies:
     - build
-  tags:
-    - shared
   services:
     - name: rabbitmq:3
       alias: rabbitmq
@@ -84,8 +78,6 @@ test:
 
 sonar:
   stage: sonar
-  tags:
-    - shared
   image:
     name: sonarsource/sonar-scanner-cli:5.0.1
     entrypoint: ['']
@@ -104,8 +96,6 @@ sonar:
 
 release:
   stage: release
-  tags:
-    - shared
   before_script:
     - apt-get update && apt-get install -y --no-install-recommends git-core ca-certificates libssl-dev
     - npm install -g semantic-release @semantic-release/gitlab @semantic-release/changelog @semantic-release/git
diff --git a/src/cli/data.ts b/src/cli/data.ts
index e6f34010493d2a39784bdce3ee9c851653711d8a..811138757e72ca6fb952419cf71864a1050a59dd 100644
--- a/src/cli/data.ts
+++ b/src/cli/data.ts
@@ -381,7 +381,7 @@ export default function register(services: Services, name = 'data') {
 
   utils.addDatastoreOptions(c, services);
 
-  c.option('-ids, --ids <ids...>', 'IDs to import in the file')
+  c.option('--ids <ids...>', 'IDs to import in the file')
     .addOption(
       new Option('--format <format>', 'Response format').choices([
         'json',
@@ -401,7 +401,7 @@ export default function register(services: Services, name = 'data') {
 
   utils.addDatastoreOptions(c, services);
 
-  c.option('-ids, --ids <ids...>', 'IDs to import in the file')
+  c.option('--ids <ids...>', 'IDs to import in the file')
     .addOption(
       new Option('--format <format>', 'Response format').choices([
         'json',
diff --git a/src/cli/index.ts b/src/cli/index.ts
index ee384da4b8c0b1d7442b45b3d97d78c5cfac647f..cad14a4c83ee58a2262a2bcc7e8704dca7e6ac87 100644
--- a/src/cli/index.ts
+++ b/src/cli/index.ts
@@ -102,7 +102,7 @@ function addDatastoreOptions(h: Command) {
   const dsNames = Array.from(datastores.keys());
 
   h.addOption(
-    new Option('-ds, --datastore <datastore>', 'Datastore to use')
+    new Option('--ds, --datastore <datastore>', 'Datastore to use')
       .default(dsNames[0] || 'default')
       .choices(dsNames.length === 0 ? ['default'] : dsNames),
   );
diff --git a/src/cli/utils.ts b/src/cli/utils.ts
index 514ff1d4cbfc66b94e318064e00b5a13ff6ae8e8..9f2fc8aa5a9ee5167fe72eab6fd26e6b01482661 100644
--- a/src/cli/utils.ts
+++ b/src/cli/utils.ts
@@ -37,7 +37,7 @@ export function addDatastoreOptions(program: Command, services: Services) {
   const dsNames = Array.from(services.datastores.keys());
 
   program.addOption(
-    new Option('-ds, --datastore <datastore>', 'Datastore to use')
+    new Option('--ds, --datastore <datastore>', 'Datastore to use')
       .default(dsNames[0] || 'default')
       .choices(dsNames.length === 0 ? ['default'] : dsNames),
   );
diff --git a/src/sdk/runner.ts b/src/sdk/runner.ts
index 9f30868a053477096358c281da573e6fab7826bd..6bf0df07f2f0f396856575ced4af3b56b0c31b4c 100644
--- a/src/sdk/runner.ts
+++ b/src/sdk/runner.ts
@@ -910,7 +910,7 @@ export default function register(name = 'runner') {
       null,
     )
     .option(
-      '-ptw, --processing-time-window <processing_time_window>',
+      '--ptw, --processing-time-window <processing_time_window>',
       'Event processing time window',
       (v) => parseInt(v, 10),
       Infinity,
@@ -922,7 +922,7 @@ export default function register(name = 'runner') {
       1_000,
     )
     .option(
-      '-ipr, --init-parallel-events <init_parallel_events>',
+      '--ipr, --init-parallel-events <init_parallel_events>',
       'Initial maximal parallel events for sampling',
       (v) => parseInt(v, 10),
       10,