diff --git a/completion/fish/task.fish b/completion/fish/task.fish
index d4629000..836a6f2a 100644
--- a/completion/fish/task.fish
+++ b/completion/fish/task.fish
@@ -101,20 +101,16 @@ complete -c $GO_TASK_PROGNAME -s v -l verbose                   -d 'verbose outp
 complete -c $GO_TASK_PROGNAME      -l version                   -d 'show version'
 complete -c $GO_TASK_PROGNAME -s w -l watch                     -d 'watch mode, re-run on changes'
 complete -c $GO_TASK_PROGNAME -s y -l yes                       -d 'assume yes to all prompts'
+complete -c $GO_TASK_PROGNAME      -l offline                   -d 'use only local or cached Taskfiles'
+complete -c $GO_TASK_PROGNAME      -l timeout                   -d 'timeout for remote Taskfile downloads'
+complete -c $GO_TASK_PROGNAME      -l expiry                    -d 'cache expiry duration'
+complete -c $GO_TASK_PROGNAME      -l remote-cache-dir          -d 'directory to cache remote Taskfiles' -xa "(__fish_complete_directories)"
+complete -c $GO_TASK_PROGNAME      -l cacert                    -d 'custom CA certificate for TLS' -r
+complete -c $GO_TASK_PROGNAME      -l cert                      -d 'client certificate for mTLS' -r
+complete -c $GO_TASK_PROGNAME      -l cert-key                  -d 'client certificate private key' -r
+complete -c $GO_TASK_PROGNAME      -l download                  -d 'download remote Taskfile'
+complete -c $GO_TASK_PROGNAME      -l clear-cache               -d 'clear remote Taskfile cache'
 
 # Experimental flags (dynamically checked at completion time via -n condition)
 # GentleForce experiment
 complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled GENTLE_FORCE" -l force-all -d 'force execution of task and all dependencies'
-
-# RemoteTaskfiles experiment - Options
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l offline          -d 'use only local or cached Taskfiles'
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l timeout          -d 'timeout for remote Taskfile downloads'
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l expiry           -d 'cache expiry duration'
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l remote-cache-dir -d 'directory to cache remote Taskfiles' -xa "(__fish_complete_directories)"
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l cacert           -d 'custom CA certificate for TLS' -r
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l cert             -d 'client certificate for mTLS' -r
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l cert-key         -d 'client certificate private key' -r
-
-# RemoteTaskfiles experiment - Operations
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l download    -d 'download remote Taskfile'
-complete -c $GO_TASK_PROGNAME -n "__task_is_experiment_enabled REMOTE_TASKFILES" -l clear-cache -d 'clear remote Taskfile cache'
diff --git a/completion/ps/task.ps1 b/completion/ps/task.ps1
index 71b58b88..dd5ed32c 100644
--- a/completion/ps/task.ps1
+++ b/completion/ps/task.ps1
@@ -63,7 +63,16 @@ Register-ArgumentCompleter -CommandName $cmdNames -ScriptBlock {
 			[CompletionResult]::new('-w', '-w', [CompletionResultType]::ParameterName, 'watch mode'),
 			[CompletionResult]::new('--watch', '--watch', [CompletionResultType]::ParameterName, 'watch mode'),
 			[CompletionResult]::new('-y', '-y', [CompletionResultType]::ParameterName, 'assume yes'),
-			[CompletionResult]::new('--yes', '--yes', [CompletionResultType]::ParameterName, 'assume yes')
+			[CompletionResult]::new('--yes', '--yes', [CompletionResultType]::ParameterName, 'assume yes'),
+			[CompletionResult]::new('--offline', '--offline', [CompletionResultType]::ParameterName, 'use cached Taskfiles'),
+			[CompletionResult]::new('--timeout', '--timeout', [CompletionResultType]::ParameterName, 'download timeout'),
+			[CompletionResult]::new('--expiry', '--expiry', [CompletionResultType]::ParameterName, 'cache expiry'),
+			[CompletionResult]::new('--remote-cache-dir', '--remote-cache-dir', [CompletionResultType]::ParameterName, 'cache directory'),
+			[CompletionResult]::new('--cacert', '--cacert', [CompletionResultType]::ParameterName, 'custom CA certificate'),
+			[CompletionResult]::new('--cert', '--cert', [CompletionResultType]::ParameterName, 'client certificate'),
+			[CompletionResult]::new('--cert-key', '--cert-key', [CompletionResultType]::ParameterName, 'client private key'),
+			[CompletionResult]::new('--download', '--download', [CompletionResultType]::ParameterName, 'download remote Taskfile'),
+			[CompletionResult]::new('--clear-cache', '--clear-cache', [CompletionResultType]::ParameterName, 'clear cache')
 		)
 
 		# Experimental flags (dynamically added based on enabled experiments)
@@ -73,20 +82,6 @@ Register-ArgumentCompleter -CommandName $cmdNames -ScriptBlock {
 			$completions += [CompletionResult]::new('--force-all', '--force-all', [CompletionResultType]::ParameterName, 'force all dependencies')
 		}
 
-		if ($experiments -match '\* REMOTE_TASKFILES:.*on') {
-			# Options
-			$completions += [CompletionResult]::new('--offline', '--offline', [CompletionResultType]::ParameterName, 'use cached Taskfiles')
-			$completions += [CompletionResult]::new('--timeout', '--timeout', [CompletionResultType]::ParameterName, 'download timeout')
-			$completions += [CompletionResult]::new('--expiry', '--expiry', [CompletionResultType]::ParameterName, 'cache expiry')
-			$completions += [CompletionResult]::new('--remote-cache-dir', '--remote-cache-dir', [CompletionResultType]::ParameterName, 'cache directory')
-			$completions += [CompletionResult]::new('--cacert', '--cacert', [CompletionResultType]::ParameterName, 'custom CA certificate')
-			$completions += [CompletionResult]::new('--cert', '--cert', [CompletionResultType]::ParameterName, 'client certificate')
-			$completions += [CompletionResult]::new('--cert-key', '--cert-key', [CompletionResultType]::ParameterName, 'client private key')
-			# Operations
-			$completions += [CompletionResult]::new('--download', '--download', [CompletionResultType]::ParameterName, 'download remote Taskfile')
-			$completions += [CompletionResult]::new('--clear-cache', '--clear-cache', [CompletionResultType]::ParameterName, 'clear cache')
-		}
-
 		return $completions.Where{ $_.CompletionText.StartsWith($commandName) }
 	}
 
diff --git a/completion/zsh/_task b/completion/zsh/_task
index ba163f45..adafe812 100755
--- a/completion/zsh/_task
+++ b/completion/zsh/_task
@@ -120,6 +120,14 @@ _task() {
         '(-v --verbose)'{-v,--verbose}'[verbose mode]'
         '(-w --watch)'{-w,--watch}'[watch-mode for given tasks, re-run when inputs change]'
         '(-y --yes)'{-y,--yes}'[assume yes to all prompts]'
+		'(--offline --clear-cache)--download[download remote Taskfile]'
+		'(--offline --download)--offline[use only local or cached Taskfiles]'
+		'(--timeout)--timeout[timeout for remote Taskfile downloads]:duration: '
+		'(--expiry)--expiry[cache expiry duration]:duration: '
+		'(--remote-cache-dir)--remote-cache-dir[directory to cache remote Taskfiles]:cache dir:_dirs'
+		'(--cacert)--cacert[custom CA certificate for TLS]:file:_files'
+		'(--cert)--cert[client certificate for mTLS]:file:_files'
+		'(--cert-key)--cert-key[client certificate private key]:file:_files'
     )
 
     # Experimental flags (dynamically added based on enabled experiments)
@@ -128,18 +136,6 @@ _task() {
         standard_args+=('(--force-all)--force-all[force execution of task and all dependencies]')
     fi
 
-    if __task_is_experiment_enabled "REMOTE_TASKFILES"; then
-        standard_args+=(
-            '(--offline --download)--offline[use only local or cached Taskfiles]'
-            '(--timeout)--timeout[timeout for remote Taskfile downloads]:duration: '
-            '(--expiry)--expiry[cache expiry duration]:duration: '
-            '(--remote-cache-dir)--remote-cache-dir[directory to cache remote Taskfiles]:cache dir:_dirs'
-            '(--cacert)--cacert[custom CA certificate for TLS]:file:_files'
-            '(--cert)--cert[client certificate for mTLS]:file:_files'
-            '(--cert-key)--cert-key[client certificate private key]:file:_files'
-        )
-    fi
-
     operation_args=(
         # Task names completion (can be specified multiple times)
         '(operation)*: :__task_list'
@@ -150,17 +146,8 @@ _task() {
             '(*)'{-i,--init}'[create new Taskfile.yml]'
             '(- *)'{-h,--help}'[show help]'
             '(- *)--version[show version and exit]'
-    )
-
-    # Experimental operations (dynamically added based on enabled experiments)
-    if __task_is_experiment_enabled "REMOTE_TASKFILES"; then
-        standard_args+=(
-            '(--offline --clear-cache)--download[download remote Taskfile]'
-        )
-        operation_args+=(
             '(* --download)--clear-cache[clear remote Taskfile cache]'
-        )
-    fi
+    )
 
     _arguments -S $standard_args $operation_args
 }