diff --git a/packages/cli/src/benchmark.ts b/packages/cli/src/benchmark.ts
index 5f27032ff2c..db7c313f29a 100644
--- a/packages/cli/src/benchmark.ts
+++ b/packages/cli/src/benchmark.ts
@@ -62,6 +62,11 @@ const {
 	keyboardShortcutsOption,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 const getValidConcurrency = (cliConcurrency: number | string | null) => {
@@ -202,16 +207,11 @@ export const benchmarkCommand = async (
 	const {
 		inputProps,
 		envVariables,
-		proResProfile,
 		frameRange: defaultFrameRange,
-		everyNthFrame,
 		ffmpegOverride,
 		height,
 		width,
 		concurrency: unparsedConcurrency,
-		disableWebSecurity,
-		userAgent,
-		ignoreCertificateErrors,
 	} = getCliOptions({
 		isStill: false,
 		logLevel,
@@ -224,6 +224,19 @@ export const benchmarkCommand = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const everyNthFrame = everyNthFrameOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const proResProfile = proResProfileOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 
 	Log.verbose(
 		{indent: false, logLevel},
diff --git a/packages/cli/src/compositions.ts b/packages/cli/src/compositions.ts
index 1ead340f8d9..0f0deb39d8b 100644
--- a/packages/cli/src/compositions.ts
+++ b/packages/cli/src/compositions.ts
@@ -30,6 +30,9 @@ const {
 	experimentalClientSideRenderingOption,
 	keyboardShortcutsOption,
 	browserExecutableOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const listCompositionsCommand = async (
@@ -68,13 +71,7 @@ export const listCompositionsCommand = async (
 		reason,
 	);
 
-	const {
-		envVariables,
-		inputProps,
-		ignoreCertificateErrors,
-		userAgent,
-		disableWebSecurity,
-	} = getCliOptions({
+	const {envVariables, inputProps} = getCliOptions({
 		isStill: false,
 		logLevel,
 		indent: false,
@@ -83,6 +80,13 @@ export const listCompositionsCommand = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const publicPath = publicPathOption.getValue({commandLine: parsedCli}).value;
 	const timeoutInMilliseconds = delayRenderTimeoutInMillisecondsOption.getValue(
 		{
diff --git a/packages/cli/src/config/browser-executable.ts b/packages/cli/src/config/browser-executable.ts
deleted file mode 100644
index f5a3c796022..00000000000
--- a/packages/cli/src/config/browser-executable.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type {BrowserExecutable} from '@remotion/renderer';
-
-let currentBrowserExecutablePath: BrowserExecutable = null;
-
-export const setBrowserExecutable = (
-	newBrowserExecutablePath: BrowserExecutable,
-) => {
-	currentBrowserExecutablePath = newBrowserExecutablePath;
-};
-
-export const getBrowserExecutable = () => {
-	return currentBrowserExecutablePath;
-};
diff --git a/packages/cli/src/config/every-nth-frame.ts b/packages/cli/src/config/every-nth-frame.ts
deleted file mode 100644
index 8002d50a5e8..00000000000
--- a/packages/cli/src/config/every-nth-frame.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-let everyNthFrame = 1;
-
-export const setEveryNthFrame = (frame: number) => {
-	everyNthFrame = frame;
-};
-
-export const getEveryNthFrame = () => {
-	return everyNthFrame;
-};
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 4bd93e47209..3f9463fb34a 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,8 +1,4 @@
 import {getBrowser} from './browser';
-import {
-	getChromiumDisableWebSecurity,
-	getIgnoreCertificateErrors,
-} from './chromium-flags';
 import {getConcurrency} from './concurrency';
 import {getDotEnvLocation} from './env-file';
 import {getRange, setFrameRangeFromCli} from './frame-range';
@@ -17,7 +13,6 @@ import {
 	getRendererPortFromConfigFileAndCliFlag,
 	getStudioPort,
 } from './preview-server';
-import {getProResProfile} from './prores-profile';
 import {getStillFrame, setStillFrame} from './still-frame';
 import {getWebpackCaching} from './webpack-caching';
 
@@ -41,15 +36,9 @@ import {
 	getBufferStateDelayInMilliseconds,
 	setBufferStateDelayInMilliseconds,
 } from './buffer-state-delay-in-milliseconds';
-import {
-	setChromiumDisableWebSecurity,
-	setChromiumIgnoreCertificateErrors,
-} from './chromium-flags';
 import type {Concurrency} from './concurrency';
-import {setConcurrency} from './concurrency';
 import {getEntryPoint, setEntryPoint} from './entry-point';
 import {setDotEnvLocation} from './env-file';
-import {getEveryNthFrame, setEveryNthFrame} from './every-nth-frame';
 import {
 	getFfmpegOverrideFunction,
 	setFfmpegOverrideFunction,
@@ -63,8 +52,6 @@ import {setOutputLocation} from './output-location';
 import type {WebpackOverrideFn} from './override-webpack';
 import {overrideWebpackConfig} from './override-webpack';
 import {setPort, setRendererPort, setStudioPort} from './preview-server';
-import {setProResProfile} from './prores-profile';
-import {getChromiumUserAgent, setChromiumUserAgent} from './user-agent';
 import {setWebpackCaching} from './webpack-caching';
 import {
 	getWebpackPolling,
@@ -75,6 +62,7 @@ import {getWidth, overrideWidth} from './width';
 export type {Concurrency, WebpackConfiguration, WebpackOverrideFn};
 
 const {
+	concurrencyOption,
 	offthreadVideoCacheSizeInBytesOption,
 	x264Option,
 	audioBitrateOption,
@@ -122,8 +110,13 @@ const {
 	ipv4Option,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
 	stillImageFormatOption,
 	videoImageFormatOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 declare global {
@@ -665,13 +658,13 @@ export const Config: FlatConfig = {
 	setTimeoutInMilliseconds: delayRenderTimeoutInMillisecondsOption.setConfig,
 	setDelayRenderTimeoutInMilliseconds:
 		delayRenderTimeoutInMillisecondsOption.setConfig,
-	setChromiumDisableWebSecurity,
-	setChromiumIgnoreCertificateErrors,
+	setChromiumDisableWebSecurity: disableWebSecurityOption.setConfig,
+	setChromiumIgnoreCertificateErrors: ignoreCertificateErrorsOption.setConfig,
 	setChromiumHeadlessMode: headlessOption.setConfig,
 	setChromiumOpenGlRenderer: glOption.setConfig,
-	setChromiumUserAgent,
+	setChromiumUserAgent: userAgentOption.setConfig,
 	setDotEnvLocation,
-	setConcurrency,
+	setConcurrency: concurrencyOption.setConfig,
 	setChromiumMultiProcessOnLinux: enableMultiprocessOnLinuxOption.setConfig,
 	setChromiumDarkMode: darkModeOption.setConfig,
 	setQuality: () => {
@@ -692,7 +685,7 @@ export const Config: FlatConfig = {
 	setEncodingBufferSize: encodingBufferSizeOption.setConfig,
 	setFrameRange,
 	setScale: scaleOption.setConfig,
-	setEveryNthFrame,
+	setEveryNthFrame: everyNthFrameOption.setConfig,
 	setNumberOfGifLoops: numberOfGifLoopsOption.setConfig,
 	setMuted: mutedOption.setConfig,
 	setEnforceAudioTrack: enforceAudioOption.setConfig,
@@ -703,7 +696,7 @@ export const Config: FlatConfig = {
 	setCodec: videoCodecOption.setConfig,
 	setCrf: crfOption.setConfig,
 	setImageSequence,
-	setProResProfile,
+	setProResProfile: proResProfileOption.setConfig,
 	setX264Preset: x264Option.setConfig,
 	setAudioBitrate: audioBitrateOption.setConfig,
 	setVideoBitrate: videoBitrateOption.setConfig,
@@ -738,13 +731,9 @@ export const Config: FlatConfig = {
 export const ConfigInternals = {
 	getRange,
 	getBrowser,
-	getProResProfile,
 	getStudioPort,
 	getRendererPortFromConfigFile,
 	getRendererPortFromConfigFileAndCliFlag,
-	getChromiumDisableWebSecurity,
-	getIgnoreCertificateErrors,
-	getEveryNthFrame,
 	getConcurrency,
 	getStillFrame,
 	getShouldOutputImageSequence,
@@ -763,7 +752,6 @@ export const ConfigInternals = {
 	getEntryPoint,
 	getWebpackPolling,
 	getShouldOpenBrowser,
-	getChromiumUserAgent,
 	getBufferStateDelayInMilliseconds,
 	getOutputCodecOrUndefined: BrowserSafeApis.getOutputCodecOrUndefined,
 };
diff --git a/packages/cli/src/config/pixel-format.ts b/packages/cli/src/config/pixel-format.ts
deleted file mode 100644
index 8587bf12d5d..00000000000
--- a/packages/cli/src/config/pixel-format.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import type {PixelFormat} from '@remotion/renderer';
-import {RenderInternals} from '@remotion/renderer';
-
-let currentPixelFormat: PixelFormat = RenderInternals.DEFAULT_PIXEL_FORMAT;
-
-export const setPixelFormat = (format: PixelFormat) => {
-	if (!RenderInternals.validPixelFormats.includes(format)) {
-		throw new TypeError(`Value ${format} is not valid as a pixel format.`);
-	}
-
-	currentPixelFormat = format;
-};
-
-export const getPixelFormat = () => {
-	return currentPixelFormat;
-};
diff --git a/packages/cli/src/config/prores-profile.ts b/packages/cli/src/config/prores-profile.ts
deleted file mode 100644
index 63dfdc817d9..00000000000
--- a/packages/cli/src/config/prores-profile.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import type {_InternalTypes} from 'remotion';
-
-let proResProfile: _InternalTypes['ProResProfile'] | undefined;
-
-export const getProResProfile = ():
-	| _InternalTypes['ProResProfile']
-	| undefined => {
-	return proResProfile;
-};
-
-export const setProResProfile = (
-	profile: _InternalTypes['ProResProfile'] | undefined,
-) => {
-	proResProfile = profile;
-};
diff --git a/packages/cli/src/get-cli-options.ts b/packages/cli/src/get-cli-options.ts
index 6e54d4e276e..3a57a0ca11c 100644
--- a/packages/cli/src/get-cli-options.ts
+++ b/packages/cli/src/get-cli-options.ts
@@ -1,11 +1,13 @@
 import type {LogLevel} from '@remotion/renderer';
 import {RenderInternals} from '@remotion/renderer';
+import {BrowserSafeApis} from '@remotion/renderer/client';
 import fs from 'node:fs';
 import path from 'node:path';
 import {ConfigInternals} from './config';
 import {getEnvironmentVariables} from './get-env';
 import {getInputProps} from './get-input-props';
 import {Log} from './log';
+import {parsedCli} from './parsed-cli';
 
 const getAndValidateFrameRange = (logLevel: LogLevel, indent: boolean) => {
 	const frameRange = ConfigInternals.getRange();
@@ -47,12 +49,6 @@ export const getAndValidateAbsoluteOutputFile = (
 	return absoluteOutputFile;
 };
 
-const getProResProfile = () => {
-	const proResProfile = ConfigInternals.getProResProfile();
-
-	return proResProfile;
-};
-
 export const getCliOptions = (options: {
 	isStill: boolean;
 	logLevel: LogLevel;
@@ -64,15 +60,9 @@ export const getCliOptions = (options: {
 		? true
 		: ConfigInternals.getShouldOutputImageSequence(frameRange);
 
-	const proResProfile = getProResProfile();
-
-	const disableWebSecurity = ConfigInternals.getChromiumDisableWebSecurity();
-	const ignoreCertificateErrors = ConfigInternals.getIgnoreCertificateErrors();
-	const userAgent = ConfigInternals.getChromiumUserAgent();
-
-	const everyNthFrame = ConfigInternals.getEveryNthFrame();
-
-	const concurrency = ConfigInternals.getConcurrency();
+	const concurrency = BrowserSafeApis.options.concurrencyOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 
 	const height = ConfigInternals.getHeight();
 	const width = ConfigInternals.getWidth();
@@ -93,12 +83,7 @@ export const getCliOptions = (options: {
 			options.logLevel,
 			options.indent,
 		),
-		proResProfile,
-		everyNthFrame,
 		stillFrame: ConfigInternals.getStillFrame(),
-		userAgent,
-		disableWebSecurity,
-		ignoreCertificateErrors,
 		ffmpegOverride: ConfigInternals.getFfmpegOverrideFunction(),
 		height,
 		width,
diff --git a/packages/cli/src/get-render-defaults.ts b/packages/cli/src/get-render-defaults.ts
index 1283dae671a..a00f1993331 100644
--- a/packages/cli/src/get-render-defaults.ts
+++ b/packages/cli/src/get-render-defaults.ts
@@ -8,6 +8,7 @@ const {
 	x264Option,
 	audioBitrateOption,
 	offthreadVideoCacheSizeInBytesOption,
+	concurrencyOption,
 	offthreadVideoThreadsOption,
 	scaleOption,
 	jpegQualityOption,
@@ -32,6 +33,11 @@ const {
 	mediaCacheSizeInBytesOption,
 	darkModeOption,
 	pixelFormatOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 	publicLicenseKeyOption,
 	stillImageFormatOption,
 	videoImageFormatOption,
@@ -44,12 +50,13 @@ export const getRenderDefaults = (): RenderDefaults => {
 	const logLevel = logLevelOption.getValue({commandLine: parsedCli}).value;
 	const defaultCodec = ConfigInternals.getOutputCodecOrUndefined();
 	const concurrency = RenderInternals.resolveConcurrency(
-		ConfigInternals.getConcurrency(),
+		concurrencyOption.getValue({commandLine: parsedCli}).value,
 	);
 	const pixelFormat = pixelFormatOption.getValue({
 		commandLine: parsedCli,
 	}).value;
-	const proResProfile = ConfigInternals.getProResProfile() ?? null;
+	const proResProfile =
+		proResProfileOption.getValue({commandLine: parsedCli}).value ?? null;
 
 	const x264Preset = x264Option.getValue({
 		commandLine: parsedCli,
@@ -126,19 +133,25 @@ export const getRenderDefaults = (): RenderDefaults => {
 		commandLine: parsedCli,
 	}).value;
 
-	const everyNthFrame = ConfigInternals.getEveryNthFrame();
+	const everyNthFrame = everyNthFrameOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const stillImageFormat = stillImageFormatOption.getValue({
 		commandLine: parsedCli,
 	}).value;
 	const videoImageFormat = videoImageFormatOption.getValue({
 		commandLine: parsedCli,
 	}).value;
-	const disableWebSecurity = ConfigInternals.getChromiumDisableWebSecurity();
-	const ignoreCertificateErrors = ConfigInternals.getIgnoreCertificateErrors();
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const darkMode = darkModeOption.getValue({
 		commandLine: parsedCli,
 	}).value;
-	const userAgent = ConfigInternals.getChromiumUserAgent();
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
 	const metadata = ConfigInternals.getMetadata();
 	const outputLocation = ConfigInternals.getOutputLocation();
 
diff --git a/packages/cli/src/gpu.ts b/packages/cli/src/gpu.ts
index b62ad0668be..1774a3c6247 100644
--- a/packages/cli/src/gpu.ts
+++ b/packages/cli/src/gpu.ts
@@ -3,7 +3,6 @@ import {RenderInternals} from '@remotion/renderer';
 import {BrowserSafeApis} from '@remotion/renderer/client';
 import {defaultBrowserDownloadProgress} from './browser-download-bar';
 import {chalk} from './chalk';
-import {getCliOptions} from './get-cli-options';
 import {Log} from './log';
 import {parsedCli, quietFlagProvided} from './parsed-cli';
 
@@ -17,19 +16,22 @@ const {
 	chromeModeOption,
 	darkModeOption,
 	browserExecutableOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const gpuCommand = async (logLevel: LogLevel) => {
-	const {disableWebSecurity, ignoreCertificateErrors, userAgent} =
-		getCliOptions({
-			isStill: false,
-			logLevel,
-			indent: false,
-		});
-
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const enableMultiProcessOnLinux = enableMultiprocessOnLinuxOption.getValue({
 		commandLine: parsedCli,
 	}).value;
diff --git a/packages/cli/src/parse-command-line.ts b/packages/cli/src/parse-command-line.ts
index 9223bbd8159..9d8e5e62ce9 100644
--- a/packages/cli/src/parse-command-line.ts
+++ b/packages/cli/src/parse-command-line.ts
@@ -7,14 +7,13 @@ import type {
 } from '@remotion/renderer';
 import type {TypeOfOption} from '@remotion/renderer/client';
 import {BrowserSafeApis} from '@remotion/renderer/client';
-import type {_InternalTypes} from 'remotion';
 import {Config, ConfigInternals} from './config';
-import {Log} from './log';
 import {parsedCli} from './parsed-cli';
 
 const {
 	beepOnFinishOption,
 	colorSpaceOption,
+	concurrencyOption,
 	disallowParallelEncodingOption,
 	offthreadVideoCacheSizeInBytesOption,
 	encodingBufferSizeOption,
@@ -38,6 +37,11 @@ const {
 	ipv4Option,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export type CommandLineOptions = {
@@ -46,14 +50,18 @@ export type CommandLineOptions = {
 	>;
 	[pixelFormatOption.cliFlag]: TypeOfOption<typeof pixelFormatOption>;
 	['image-format']: VideoImageFormat | StillImageFormat;
-	['prores-profile']: _InternalTypes['ProResProfile'];
+	[proResProfileOption.cliFlag]: TypeOfOption<typeof proResProfileOption>;
 	[x264Option.cliFlag]: TypeOfOption<typeof x264Option>;
 	['bundle-cache']: string;
 	['env-file']: string;
-	['ignore-certificate-errors']: string;
+	[ignoreCertificateErrorsOption.cliFlag]: TypeOfOption<
+		typeof ignoreCertificateErrorsOption
+	>;
 	[darkModeOption.cliFlag]: TypeOfOption<typeof darkModeOption>;
-	['disable-web-security']: string;
-	['every-nth-frame']: number;
+	[disableWebSecurityOption.cliFlag]: TypeOfOption<
+		typeof disableWebSecurityOption
+	>;
+	[everyNthFrameOption.cliFlag]: TypeOfOption<typeof everyNthFrameOption>;
 	[numberOfGifLoopsOption.cliFlag]: TypeOfOption<typeof numberOfGifLoopsOption>;
 	[numberOfSharedAudioTagsOption.cliFlag]: TypeOfOption<
 		typeof numberOfSharedAudioTagsOption
@@ -68,7 +76,7 @@ export type CommandLineOptions = {
 	[beepOnFinishOption.cliFlag]: TypeOfOption<typeof beepOnFinishOption>;
 	version: string;
 	codec: Codec;
-	concurrency: number;
+	[concurrencyOption.cliFlag]: TypeOfOption<typeof concurrencyOption>;
 	timeout: number;
 	config: string;
 	['public-dir']: string;
@@ -112,7 +120,7 @@ export type CommandLineOptions = {
 	['no-open']: boolean;
 	['browser']: string;
 	['browser-args']: string;
-	['user-agent']: string;
+	[userAgentOption.cliFlag]: TypeOfOption<typeof userAgentOption>;
 	['out-dir']: string;
 	[audioLatencyHintOption.cliFlag]: AudioContextLatencyCategory;
 	[ipv4Option.cliFlag]: TypeOfOption<typeof ipv4Option>;
@@ -133,26 +141,6 @@ export const parseCommandLine = () => {
 		Config.setCachingEnabled(parsedCli['bundle-cache'] !== 'false');
 	}
 
-	if (parsedCli['disable-web-security']) {
-		Config.setChromiumDisableWebSecurity(true);
-	}
-
-	if (parsedCli['ignore-certificate-errors']) {
-		Config.setChromiumIgnoreCertificateErrors(true);
-	}
-
-	if (parsedCli[darkModeOption.cliFlag]) {
-		Config.setChromiumDarkMode(parsedCli[darkModeOption.cliFlag]);
-	}
-
-	if (parsedCli['user-agent']) {
-		Config.setChromiumUserAgent(parsedCli['user-agent']);
-	}
-
-	if (parsedCli.concurrency) {
-		Config.setConcurrency(parsedCli.concurrency);
-	}
-
 	if (parsedCli.height) {
 		Config.overrideHeight(parsedCli.height);
 	}
@@ -179,16 +167,6 @@ export const parseCommandLine = () => {
 		Config.setImageSequence(true);
 	}
 
-	if (parsedCli['every-nth-frame']) {
-		Config.setEveryNthFrame(parsedCli['every-nth-frame']);
-	}
-
-	if (parsedCli['prores-profile']) {
-		Config.setProResProfile(
-			String(parsedCli['prores-profile']) as _InternalTypes['ProResProfile'],
-		);
-	}
-
 	if (
 		parsedCli['license-key'] &&
 		parsedCli['license-key'].startsWith('rm_pub_')
@@ -196,31 +174,6 @@ export const parseCommandLine = () => {
 		Config.setPublicLicenseKey(parsedCli['license-key']);
 	}
 
-	if (parsedCli['public-license-key']) {
-		Config.setPublicLicenseKey(parsedCli['public-license-key']);
-	}
-
-	if (typeof parsedCli.quality !== 'undefined') {
-		Log.warn(
-			{indent: false, logLevel: 'info'},
-			'The --quality flag has been renamed to --jpeg-quality instead.',
-		);
-		Config.setJpegQuality(parsedCli.quality);
-	}
-
-	if (typeof parsedCli.scale !== 'undefined') {
-		Config.setScale(parsedCli.scale);
-	}
-
-	if (
-		typeof parsedCli['enable-experimental-client-side-rendering'] !==
-		'undefined'
-	) {
-		Config.setExperimentalClientSideRenderingEnabled(
-			parsedCli['enable-experimental-client-side-rendering'],
-		);
-	}
-
 	if (typeof parsedCli['webpack-poll'] !== 'undefined') {
 		Config.setWebpackPollingInMilliseconds(parsedCli['webpack-poll']);
 	}
diff --git a/packages/cli/src/parsed-cli.ts b/packages/cli/src/parsed-cli.ts
index 6f6761baa53..76a1675fcff 100644
--- a/packages/cli/src/parsed-cli.ts
+++ b/packages/cli/src/parsed-cli.ts
@@ -19,9 +19,9 @@ export const BooleanFlags = [
 	'enable-lambda-insights',
 	'yes',
 	'y',
-	'disable-web-security',
+	BrowserSafeApis.options.disableWebSecurityOption.cliFlag,
 	BrowserSafeApis.options.darkModeOption.cliFlag,
-	'ignore-certificate-errors',
+	BrowserSafeApis.options.ignoreCertificateErrorsOption.cliFlag,
 	'disable-headless',
 	'disable-keyboard-shortcuts',
 	'default-only',
diff --git a/packages/cli/src/render.tsx b/packages/cli/src/render.tsx
index a76148e5264..7bb02756631 100644
--- a/packages/cli/src/render.tsx
+++ b/packages/cli/src/render.tsx
@@ -50,6 +50,11 @@ const {
 	keyboardShortcutsOption,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const render = async (
@@ -95,14 +100,9 @@ export const render = async (
 		shouldOutputImageSequence,
 		inputProps,
 		envVariables,
-		everyNthFrame,
-		userAgent,
-		disableWebSecurity,
-		ignoreCertificateErrors,
 		height,
 		width,
 		ffmpegOverride,
-		proResProfile,
 	} = getCliOptions({
 		isStill: false,
 		logLevel,
@@ -115,6 +115,19 @@ export const render = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const everyNthFrame = everyNthFrameOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const proResProfile = proResProfileOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const x264Preset = x264Option.getValue({commandLine: parsedCli}).value;
 	const audioBitrate = audioBitrateOption.getValue({
 		commandLine: parsedCli,
diff --git a/packages/cli/src/still.ts b/packages/cli/src/still.ts
index 7bc43cc3389..da126daefaa 100644
--- a/packages/cli/src/still.ts
+++ b/packages/cli/src/still.ts
@@ -31,6 +31,9 @@ const {
 	experimentalClientSideRenderingOption,
 	keyboardShortcutsOption,
 	browserExecutableOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const still = async (
@@ -70,16 +73,7 @@ export const still = async (
 		process.exit(1);
 	}
 
-	const {
-		envVariables,
-		height,
-		inputProps,
-		stillFrame,
-		width,
-		disableWebSecurity,
-		ignoreCertificateErrors,
-		userAgent,
-	} = getCliOptions({
+	const {envVariables, height, inputProps, stillFrame, width} = getCliOptions({
 		isStill: true,
 		logLevel,
 		indent: false,
@@ -88,6 +82,13 @@ export const still = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 	const jpegQuality = jpegQualityOption.getValue({
 		commandLine: parsedCli,
 	}).value;
diff --git a/packages/cloudrun/src/cli/commands/render/index.ts b/packages/cloudrun/src/cli/commands/render/index.ts
index 395d9d2fb5f..76290749993 100644
--- a/packages/cloudrun/src/cli/commands/render/index.ts
+++ b/packages/cloudrun/src/cli/commands/render/index.ts
@@ -40,6 +40,11 @@ const {
 	darkModeOption,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const renderCommand = async (
@@ -83,13 +88,8 @@ export const renderCommand = async (
 		envVariables,
 		frameRange,
 		inputProps,
-		proResProfile,
-		everyNthFrame,
 		height,
 		width,
-		disableWebSecurity,
-		ignoreCertificateErrors,
-		userAgent,
 	} = CliInternals.getCliOptions({
 		isStill: false,
 		logLevel,
@@ -102,6 +102,21 @@ export const renderCommand = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: CliInternals.parsedCli,
 	}).value;
+	const everyNthFrame = everyNthFrameOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const proResProfile = proResProfileOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const userAgent = userAgentOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
 	const offthreadVideoCacheSizeInBytes =
 		offthreadVideoCacheSizeInBytesOption.getValue({
 			commandLine: CliInternals.parsedCli,
diff --git a/packages/cloudrun/src/cli/commands/still.ts b/packages/cloudrun/src/cli/commands/still.ts
index 4a7015b819c..cc152904e4b 100644
--- a/packages/cloudrun/src/cli/commands/still.ts
+++ b/packages/cloudrun/src/cli/commands/still.ts
@@ -25,6 +25,9 @@ const {
 	mediaCacheSizeInBytesOption,
 	darkModeOption,
 	browserExecutableOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const stillCommand = async (
@@ -48,9 +51,6 @@ export const stillCommand = async (
 		stillFrame,
 		height,
 		width,
-		userAgent,
-		disableWebSecurity,
-		ignoreCertificateErrors,
 	} = CliInternals.getCliOptions({
 		isStill: false,
 		logLevel,
@@ -60,6 +60,15 @@ export const stillCommand = async (
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: CliInternals.parsedCli,
 	}).value;
+	const userAgent = userAgentOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
 
 	let composition = args[1];
 
diff --git a/packages/docs/docs/cli/compositions.mdx b/packages/docs/docs/cli/compositions.mdx
index 8b7d42ad3f5..44d97d94e12 100644
--- a/packages/docs/docs/cli/compositions.mdx
+++ b/packages/docs/docs/cli/compositions.mdx
@@ -66,13 +66,11 @@ Not to be confused with the [`--timeout` flag when deploying a Lambda function](
 
 ### `--ignore-certificate-errors`
 
-Results in invalid SSL certificates in Chrome, such as self-signed ones, being ignored.
+<Options id="ignore-certificate-errors" />
 
 ### `--disable-web-security`
 
-_available since v2.6.5_
-
-This will most notably disable CORS in Chrome among other security features.
+<Options id="disable-web-security" />
 
 ### ~`--disable-headless`~
 
@@ -88,7 +86,7 @@ This will most notably disable CORS in Chrome among other security features.
 
 ### `--user-agent`<AvailableFrom v="3.3.83"/>
 
-Lets you set a custom user agent that the headless Chrome browser assumes.
+<Options id="user-agent" />
 
 ### `--media-cache-size-in-bytes`<AvailableFrom v="4.0.352"/>
 
diff --git a/packages/docs/docs/cli/render.mdx b/packages/docs/docs/cli/render.mdx
index 77a4cc4d364..2b3a9141682 100644
--- a/packages/docs/docs/cli/render.mdx
+++ b/packages/docs/docs/cli/render.mdx
@@ -41,7 +41,7 @@ Inline JSON string isn't supported on Windows shells because it removes the `"`
 
 ### `--concurrency`
 
-[How many CPU threads to use.](/docs/config#setconcurrency) Minimum 1. The maximum is the amount of threads you have (In Node.JS `os.cpus().length`). You can also provide a percentage value (e.g. `50%`).
+<Options id="concurrency" />
 
 ### `--pixel-format`
 
@@ -116,7 +116,7 @@ Sets the output file path, as an alternative to the `output-location` positional
 
 ### `--prores-profile`<AvailableFrom v="2.1.6" />
 
-[Set the ProRes profile](/docs/config#setproresprofile). This option is only valid if the [`codec`](#--codec) has been set to `prores`. Possible values: `4444-xq`, `4444`, `hq`, `standard`, `light`, `proxy`. See [here](https://video.stackexchange.com/a/14715) for explanation of possible values. Default: `hq`.
+<Options id="prores-profile" />
 
 ### `--x264-preset`<AvailableFrom v="4.2.2" />
 
@@ -148,7 +148,7 @@ If you enable [hardware acceleration](/docs/hardware-acceleration), you cannot s
 
 ### `--every-nth-frame`<AvailableFrom v="3.1.0" />
 
-[Render only every nth frame.](/docs/config#seteverynthframe) This option may only be set when rendering GIFs. This allows you to lower the FPS of the GIF.
+<Options id="every-nth-frame" />
 
 For example only every second frame, every third frame and so on. Only works for rendering GIFs. [See here for more details.](/docs/render-as-gif#reducing-frame-rate)
 
@@ -202,11 +202,11 @@ Not to be confused with the [`--timeout` flag when deploying a Lambda function](
 
 ### `--ignore-certificate-errors`<AvailableFrom v="2.6.5" />
 
-Results in invalid SSL certificates in Chrome, such as self-signed ones, being ignored.
+<Options id="ignore-certificate-errors" />
 
 ### `--disable-web-security`<AvailableFrom v="2.6.5" />
 
-This will most notably disable CORS in Chrome among other security features.
+<Options id="disable-web-security" />
 
 ### ~`--disable-headless`~<AvailableFrom v="2.6.5" />
 
@@ -222,7 +222,7 @@ This will most notably disable CORS in Chrome among other security features.
 
 ### `--user-agent`<AvailableFrom v="3.3.83"/>
 
-Lets you set a custom user agent that the headless Chrome browser assumes.
+<Options id="user-agent" />
 
 ### `--media-cache-size-in-bytes`<AvailableFrom v="4.0.352"/>
 
diff --git a/packages/docs/docs/cli/still.mdx b/packages/docs/docs/cli/still.mdx
index dce0c253754..7d8504149d3 100644
--- a/packages/docs/docs/cli/still.mdx
+++ b/packages/docs/docs/cli/still.mdx
@@ -98,11 +98,11 @@ Not to be confused with the [`--timeout` flag when deploying a Lambda function](
 
 ### `--ignore-certificate-errors`<AvailableFrom v="2.6.5" />
 
-Results in invalid SSL certificates in Chrome, such as self-signed ones, being ignored.
+<Options id="ignore-certificate-errors" />
 
 ### `--disable-web-security`<AvailableFrom v="2.6.5" />
 
-This will most notably disable CORS in Chrome among other security features.
+<Options id="disable-web-security" />
 
 ### ~`--disable-headless`~<AvailableFrom v="2.6.5" />
 
@@ -122,7 +122,7 @@ This will most notably disable CORS in Chrome among other security features.
 
 ### `--user-agent`<AvailableFrom v="3.3.83"/>
 
-Lets you set a custom user agent that the headless Chrome browser assumes.
+<Options id="user-agent" />
 
 ### `--media-cache-size-in-bytes`<AvailableFrom v="4.0.352"/>
 
diff --git a/packages/docs/docs/cloudrun/cli/render.mdx b/packages/docs/docs/cloudrun/cli/render.mdx
index ad6a27ecc13..9265804c6a8 100644
--- a/packages/docs/docs/cloudrun/cli/render.mdx
+++ b/packages/docs/docs/cloudrun/cli/render.mdx
@@ -75,7 +75,7 @@ Specify a specific bucket name to be used for the output. The resulting Google C
 
 ### `--concurrency`
 
-A number or a string describing how many browser tabs should be opened. Default "50%".
+<Options id="concurrency" />
 
 :::note
 Before v4.0.76, this was "100%" by default. It is now aligned to the other server-side rendering APIs.
@@ -163,7 +163,7 @@ You will be responsible for ensuring that the render ID is unique, otherwise it
 
 ### `--prores-profile`
 
-[Set the ProRes profile](/docs/config#setproresprofile). This option is only valid if the [`codec`](#--codec) has been set to `prores`. Possible values: `4444-xq`, `4444`, `hq`, `standard`, `light`, `proxy`. See [here](https://video.stackexchange.com/a/14715) for explanation of possible values. Default: `hq`.
+<Options id="prores-profile" />
 
 ### `--x264-preset`
 
@@ -179,7 +179,7 @@ You will be responsible for ensuring that the render ID is unique, otherwise it
 
 ### `--every-nth-frame`
 
-[Render only every nth frame.](/docs/config#seteverynthframe) This option may only be set when rendering GIFs. This allows you to lower the FPS of the GIF.
+<Options id="every-nth-frame" />
 
 For example only every second frame, every third frame and so on. Only works for rendering GIFs. [See here for more details.](/docs/render-as-gif)
 
diff --git a/packages/docs/docs/config.mdx b/packages/docs/docs/config.mdx
index f36e664acf8..348ddfa60c8 100644
--- a/packages/docs/docs/config.mdx
+++ b/packages/docs/docs/config.mdx
@@ -216,7 +216,7 @@ The [command line flag](/docs/cli/render#--timeout) `--timeout` will take preced
 
 ## `setChromiumDisableWebSecurity()`<AvailableFrom v="2.6.5" />
 
-This will most notably disable CORS among other security features during rendering.
+<Options id="disable-web-security" />
 
 ```tsx twoslash title="remotion.config.ts"
 import {Config} from '@remotion/cli/config';
@@ -241,7 +241,7 @@ Config.setChromiumDarkMode(true);
 
 ## `setChromiumIgnoreCertificateErrors()`<AvailableFrom v="2.6.5" />
 
-Results in invalid SSL certificates, such as self-signed ones, being ignored during rendering.
+<Options id="ignore-certificate-errors" />
 
 ```tsx twoslash title="remotion.config.ts"
 import {Config} from '@remotion/cli/config';
@@ -307,8 +307,7 @@ The [command line flag](/docs/cli/render#--gl) `--gl` will take precedence over
 
 ## `setConcurrency()`
 
-Sets how many Puppeteer instances will work on rendering your video in parallel.
-Default: `null`, meaning **half of the threads** available on your CPU.
+<Options id="concurrency" />
 
 ```ts twoslash title="remotion.config.ts"
 import {Config} from '@remotion/cli/config';
@@ -467,9 +466,7 @@ The [command line flag](/docs/cli/render#--env-file) `--env-file` will take prec
 
 ## `setEveryNthFrame()`
 
-This option may only be set when rendering GIFs. [It determines how many frames are rendered, while the other ones gets skipped in order to lower the FPS of the GIF.](/docs/render-as-gif)
-
-For example, if the `fps` is 30, and `everyNthFrame` is 2, the FPS of the GIF is `15`.
+<Options id="every-nth-frame" />
 
 ```ts twoslash title="remotion.config.ts"
 import {Config} from '@remotion/cli/config';
@@ -573,10 +570,7 @@ Refer to the [Encoding guide](/docs/encoding) to see defaults and supported comb
 
 ## `setProResProfile()`<AvailableFrom v="2.1.6" />
 
-Set the ProRes profile. This option is only valid if the codec has been set to `prores`.
-Possible values: `4444-xq`, `4444`, `hq`, `standard`, `light`, `proxy`.
-See [here](https://video.stackexchange.com/a/14715) for explanation of possible values.
-Default: `hq`
+<Options id="prores-profile" />
 
 ```ts twoslash title="remotion.config.ts"
 import {Config} from '@remotion/cli/config';
diff --git a/packages/docs/docs/lambda/cli/render.mdx b/packages/docs/docs/lambda/cli/render.mdx
index 9b41b953d9a..eddc8ed12f4 100644
--- a/packages/docs/docs/lambda/cli/render.mdx
+++ b/packages/docs/docs/lambda/cli/render.mdx
@@ -162,7 +162,7 @@ Renamed to `jpegQuality` in `v4.0.0`.
 
 ### `--prores-profile`
 
-[Set the ProRes profile](/docs/config#setproresprofile). This option is only valid if the [`codec`](#--codec) has been set to `prores`. Possible values: `4444-xq`, `4444`, `hq`, `standard`, `light`, `proxy`. See [here](https://video.stackexchange.com/a/14715) for explanation of possible values. Default: `hq`.
+<Options id="prores-profile" />
 
 ### `--x264-preset`
 
@@ -194,7 +194,7 @@ Specify a location for a dotenv file - Default `.env`. [Read about how environme
 
 ### `--every-nth-frame`<AvailableFrom v="3.1.0" />
 
-[Render only every nth frame.](/docs/config#seteverynthframe) This option may only be set when rendering GIFs. This allows you to lower the FPS of the GIF.
+<Options id="every-nth-frame" />
 
 For example only every second frame, every third frame and so on. Only works for rendering GIFs. [See here for more details.](/docs/render-as-gif)
 
diff --git a/packages/example/src/Lottie/Halloween/Balloons.tsx b/packages/example/src/Lottie/Halloween/Balloons.tsx
index b9aabd4de0e..bf86da7f02c 100644
--- a/packages/example/src/Lottie/Halloween/Balloons.tsx
+++ b/packages/example/src/Lottie/Halloween/Balloons.tsx
@@ -43,7 +43,7 @@ const Balloons = () => {
 				setError(err);
 				console.log('Animation failed to load', err);
 			});
-	}, [handle]);
+	}, [handle, continueRender]);
 
 	if (!animationData) {
 		return null;
diff --git a/packages/it-tests/src/rendering/frame-accuracy.test.ts b/packages/it-tests/src/rendering/frame-accuracy.test.ts
index aa2fa12870a..4f1675e6e57 100644
--- a/packages/it-tests/src/rendering/frame-accuracy.test.ts
+++ b/packages/it-tests/src/rendering/frame-accuracy.test.ts
@@ -8,7 +8,7 @@ test(
 		expect(missedFrames).toBeLessThanOrEqual(8);
 	},
 	{
-		timeout: 30000,
+		timeout: 60000,
 	},
 );
 
@@ -19,7 +19,7 @@ test(
 		expect(missedFrames).toBe(0);
 	},
 	{
-		timeout: 30000,
+		timeout: 60000,
 	},
 );
 
@@ -30,7 +30,7 @@ test(
 		expect(missedFrames).toBeLessThanOrEqual(8);
 	},
 	{
-		timeout: 30000,
+		timeout: 60000,
 	},
 );
 
@@ -41,6 +41,6 @@ test(
 		expect(missedFrames).toBe(0);
 	},
 	{
-		timeout: 30000,
+		timeout: 60000,
 	},
 );
diff --git a/packages/it-tests/src/rendering/test-utils.ts b/packages/it-tests/src/rendering/test-utils.ts
index da4b04a12fb..b18f4730bc3 100644
--- a/packages/it-tests/src/rendering/test-utils.ts
+++ b/packages/it-tests/src/rendering/test-utils.ts
@@ -152,6 +152,8 @@ async function saveSequenceInTempDir(id: string) {
 			'--image-format',
 			'png',
 			'--sequence',
+			'--concurrency',
+			'2',
 		],
 		{
 			cwd: path.join(process.cwd(), '..', 'example'),
diff --git a/packages/lambda/src/cli/commands/compositions/index.ts b/packages/lambda/src/cli/commands/compositions/index.ts
index 246afb30cc8..37ae33c364f 100644
--- a/packages/lambda/src/cli/commands/compositions/index.ts
+++ b/packages/lambda/src/cli/commands/compositions/index.ts
@@ -22,6 +22,9 @@ const {
 	delayRenderTimeoutInMillisecondsOption,
 	headlessOption,
 	darkModeOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const compositionsCommand = async ({
@@ -49,18 +52,21 @@ export const compositionsCommand = async ({
 		quit(1);
 	}
 
-	const {
-		envVariables,
-		inputProps,
-		ignoreCertificateErrors,
-		userAgent,
-		disableWebSecurity,
-	} = CliInternals.getCliOptions({
+	const {envVariables, inputProps} = CliInternals.getCliOptions({
 		isStill: false,
 		logLevel,
 		indent: false,
 	});
 
+	const userAgent = userAgentOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
 	const enableMultiProcessOnLinux = enableMultiprocessOnLinuxOption.getValue({
 		commandLine: CliInternals.parsedCli,
 	}).value;
diff --git a/packages/lambda/src/cli/commands/render/render.ts b/packages/lambda/src/cli/commands/render/render.ts
index 2922e30398e..f0f5e583736 100644
--- a/packages/lambda/src/cli/commands/render/render.ts
+++ b/packages/lambda/src/cli/commands/render/render.ts
@@ -58,6 +58,11 @@ const {
 	darkModeOption,
 	pixelFormatOption,
 	browserExecutableOption,
+	everyNthFrameOption,
+	proResProfileOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 export const renderCommand = async ({
@@ -88,22 +93,12 @@ export const renderCommand = async ({
 
 	const region = getAwsRegion();
 
-	const {
-		envVariables,
-		frameRange,
-		inputProps,
-		proResProfile,
-		everyNthFrame,
-		height,
-		width,
-		ignoreCertificateErrors,
-		userAgent,
-		disableWebSecurity,
-	} = CliInternals.getCliOptions({
-		isStill: false,
-		logLevel,
-		indent: false,
-	});
+	const {envVariables, frameRange, inputProps, height, width} =
+		CliInternals.getCliOptions({
+			isStill: false,
+			logLevel,
+			indent: false,
+		});
 
 	const pixelFormat = pixelFormatOption.getValue({
 		commandLine: CliInternals.parsedCli,
@@ -111,6 +106,21 @@ export const renderCommand = async ({
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: CliInternals.parsedCli,
 	}).value;
+	const everyNthFrame = everyNthFrameOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const proResProfile = proResProfileOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const userAgent = userAgentOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: CliInternals.parsedCli,
+	}).value;
 	const x264Preset = x264Option.getValue({
 		commandLine: CliInternals.parsedCli,
 	}).value;
diff --git a/packages/lambda/src/cli/commands/still.ts b/packages/lambda/src/cli/commands/still.ts
index bffe16f3cb6..103d45670d7 100644
--- a/packages/lambda/src/cli/commands/still.ts
+++ b/packages/lambda/src/cli/commands/still.ts
@@ -36,6 +36,9 @@ const {
 	mediaCacheSizeInBytesOption,
 	darkModeOption,
 	browserExecutableOption,
+	userAgentOption,
+	disableWebSecurityOption,
+	ignoreCertificateErrorsOption,
 } = BrowserSafeApis.options;
 
 const {
@@ -76,16 +79,7 @@ export const stillCommand = async ({
 		quit(1);
 	}
 
-	const {
-		envVariables,
-		inputProps,
-		stillFrame,
-		height,
-		width,
-		userAgent,
-		disableWebSecurity,
-		ignoreCertificateErrors,
-	} = getCliOptions({
+	const {envVariables, inputProps, stillFrame, height, width} = getCliOptions({
 		isStill: true,
 		logLevel,
 		indent: false,
@@ -94,6 +88,13 @@ export const stillCommand = async ({
 	const browserExecutable = browserExecutableOption.getValue({
 		commandLine: parsedCli,
 	}).value;
+	const userAgent = userAgentOption.getValue({commandLine: parsedCli}).value;
+	const disableWebSecurity = disableWebSecurityOption.getValue({
+		commandLine: parsedCli,
+	}).value;
+	const ignoreCertificateErrors = ignoreCertificateErrorsOption.getValue({
+		commandLine: parsedCli,
+	}).value;
 
 	const region = getAwsRegion();
 	let composition = args[1];
diff --git a/packages/renderer/src/client.ts b/packages/renderer/src/client.ts
index 7379e625515..3737bd2754e 100644
--- a/packages/renderer/src/client.ts
+++ b/packages/renderer/src/client.ts
@@ -36,6 +36,7 @@ import {
 import {validateOutputFilename} from './validate-output-filename';
 export {AvailableOptions, TypeOfOption} from './options';
 export {HardwareAccelerationOption} from './options/hardware-acceleration';
+export {ProResProfile} from './options/prores-profile';
 
 export const BrowserSafeApis = {
 	getFileExtensionFromCodec,
diff --git a/packages/renderer/src/index.ts b/packages/renderer/src/index.ts
index 90457f574ef..e2c96e88bf1 100644
--- a/packages/renderer/src/index.ts
+++ b/packages/renderer/src/index.ts
@@ -103,6 +103,7 @@ export {openBrowser} from './open-browser';
 export type {ChromiumOptions} from './open-browser';
 export {ChromeMode} from './options/chrome-mode';
 export {ColorSpace} from './options/color-space';
+export type {Concurrency} from './options/concurrency';
 export type {DeleteAfter} from './options/delete-after';
 export {OpenGlRenderer} from './options/gl';
 export {NumberOfGifLoops} from './options/number-of-gif-loops';
diff --git a/packages/renderer/src/options/concurrency.tsx b/packages/renderer/src/options/concurrency.tsx
new file mode 100644
index 00000000000..81314bd273d
--- /dev/null
+++ b/packages/renderer/src/options/concurrency.tsx
@@ -0,0 +1,46 @@
+import type {AnyRemotionOption} from './option';
+
+export type Concurrency = number | string | null;
+
+let currentConcurrency: Concurrency = null;
+
+const cliFlag = 'concurrency' as const;
+
+export const concurrencyOption = {
+	name: 'Concurrency',
+	cliFlag,
+	description: () => (
+		<>
+			How many CPU threads to use. Minimum 1. The maximum is the amount of
+			threads you have (In Node.JS <code>os.cpus().length</code>). You can also
+			provide a percentage value (e.g. <code>50%</code>).
+		</>
+	),
+	ssrName: 'concurrency' as const,
+	docLink: 'https://www.remotion.dev/docs/config#setconcurrency',
+	type: null as Concurrency,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: commandLine[cliFlag] as Concurrency,
+			};
+		}
+
+		if (currentConcurrency !== null) {
+			return {
+				source: 'config',
+				value: currentConcurrency,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: null,
+		};
+	},
+	setConfig: (value) => {
+		currentConcurrency = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<Concurrency>;
diff --git a/packages/renderer/src/options/disable-web-security.tsx b/packages/renderer/src/options/disable-web-security.tsx
new file mode 100644
index 00000000000..bb7a1342eb1
--- /dev/null
+++ b/packages/renderer/src/options/disable-web-security.tsx
@@ -0,0 +1,44 @@
+import type {AnyRemotionOption} from './option';
+
+let disableWebSecurity = false;
+
+const cliFlag = 'disable-web-security' as const;
+
+export const disableWebSecurityOption = {
+	name: 'Disable web security',
+	cliFlag,
+	description: () => (
+		<>
+			This will most notably disable CORS in Chrome among other security
+			features.
+		</>
+	),
+	ssrName: 'disableWebSecurity' as const,
+	docLink:
+		'https://www.remotion.dev/docs/chromium-flags#--disable-web-security',
+	type: false as boolean,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: Boolean(commandLine[cliFlag]),
+			};
+		}
+
+		if (disableWebSecurity) {
+			return {
+				source: 'config',
+				value: disableWebSecurity,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: false,
+		};
+	},
+	setConfig: (value) => {
+		disableWebSecurity = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<boolean>;
diff --git a/packages/renderer/src/options/every-nth-frame.tsx b/packages/renderer/src/options/every-nth-frame.tsx
new file mode 100644
index 00000000000..9670e433631
--- /dev/null
+++ b/packages/renderer/src/options/every-nth-frame.tsx
@@ -0,0 +1,47 @@
+import type {AnyRemotionOption} from './option';
+
+const DEFAULT_EVERY_NTH_FRAME = 1;
+
+let everyNthFrame = DEFAULT_EVERY_NTH_FRAME;
+
+const cliFlag = 'every-nth-frame' as const;
+
+export const everyNthFrameOption = {
+	name: 'Every nth frame',
+	cliFlag,
+	description: () => (
+		<>
+			This option may only be set when rendering GIFs. It determines how many
+			frames are rendered, while the other ones get skipped in order to lower
+			the FPS of the GIF. For example, if the <code>fps</code> is 30, and{' '}
+			<code>everyNthFrame</code> is 2, the FPS of the GIF is <code>15</code>.
+		</>
+	),
+	ssrName: 'everyNthFrame' as const,
+	docLink: 'https://www.remotion.dev/docs/config#seteverynthframe',
+	type: DEFAULT_EVERY_NTH_FRAME as number,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: commandLine[cliFlag] as number,
+			};
+		}
+
+		if (everyNthFrame !== DEFAULT_EVERY_NTH_FRAME) {
+			return {
+				source: 'config',
+				value: everyNthFrame,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: DEFAULT_EVERY_NTH_FRAME,
+		};
+	},
+	setConfig: (value) => {
+		everyNthFrame = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<number>;
diff --git a/packages/renderer/src/options/ignore-certificate-errors.tsx b/packages/renderer/src/options/ignore-certificate-errors.tsx
new file mode 100644
index 00000000000..e5756c88b50
--- /dev/null
+++ b/packages/renderer/src/options/ignore-certificate-errors.tsx
@@ -0,0 +1,44 @@
+import type {AnyRemotionOption} from './option';
+
+let ignoreCertificateErrors = false;
+
+const cliFlag = 'ignore-certificate-errors' as const;
+
+export const ignoreCertificateErrorsOption = {
+	name: 'Ignore certificate errors',
+	cliFlag,
+	description: () => (
+		<>
+			Results in invalid SSL certificates in Chrome, such as self-signed ones,
+			being ignored.
+		</>
+	),
+	ssrName: 'ignoreCertificateErrors' as const,
+	docLink:
+		'https://www.remotion.dev/docs/chromium-flags#--ignore-certificate-errors',
+	type: false as boolean,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: Boolean(commandLine[cliFlag]),
+			};
+		}
+
+		if (ignoreCertificateErrors) {
+			return {
+				source: 'config',
+				value: ignoreCertificateErrors,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: false,
+		};
+	},
+	setConfig: (value) => {
+		ignoreCertificateErrors = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<boolean>;
diff --git a/packages/renderer/src/options/index.tsx b/packages/renderer/src/options/index.tsx
index cae1339aa93..bb1e7dcb3f6 100644
--- a/packages/renderer/src/options/index.tsx
+++ b/packages/renderer/src/options/index.tsx
@@ -7,17 +7,20 @@ import {binariesDirectoryOption} from './binaries-directory';
 import {browserExecutableOption} from './browser-executable';
 import {chromeModeOption} from './chrome-mode';
 import {colorSpaceOption} from './color-space';
+import {concurrencyOption} from './concurrency';
 import {crfOption} from './crf';
 import {enableCrossSiteIsolationOption} from './cross-site-isolation';
 import {darkModeOption} from './dark-mode';
 import {deleteAfterOption} from './delete-after';
 import {disableGitSourceOption} from './disable-git-source';
+import {disableWebSecurityOption} from './disable-web-security';
 import {disallowParallelEncodingOption} from './disallow-parallel-encoding';
 import {enableLambdaInsights} from './enable-lambda-insights';
 import {enableMultiprocessOnLinuxOption} from './enable-multiprocess-on-linux';
 import {encodingBufferSizeOption} from './encoding-buffer-size';
 import {encodingMaxRateOption} from './encoding-max-rate';
 import {enforceAudioOption} from './enforce-audio';
+import {everyNthFrameOption} from './every-nth-frame';
 import {experimentalClientSideRenderingOption} from './experimental-client-side-rendering';
 import {folderExpiryOption} from './folder-expiry';
 import {forSeamlessAacConcatenationOption} from './for-seamless-aac-concatenation';
@@ -25,6 +28,7 @@ import {forceNewStudioOption} from './force-new-studio';
 import {glOption} from './gl';
 import {hardwareAccelerationOption} from './hardware-acceleration';
 import {headlessOption} from './headless';
+import {ignoreCertificateErrorsOption} from './ignore-certificate-errors';
 import {imageSequencePatternOption} from './image-sequence-pattern';
 import {ipv4Option} from './ipv4';
 import {isProductionOption} from './is-production';
@@ -44,6 +48,7 @@ import type {AnyRemotionOption} from './option';
 import {overwriteOption} from './overwrite';
 import {pixelFormatOption} from './pixel-format';
 import {preferLosslessAudioOption} from './prefer-lossless';
+import {proResProfileOption} from './prores-profile';
 import {publicDirOption} from './public-dir';
 import {publicLicenseKeyOption} from './public-license-key';
 import {publicPathOption} from './public-path';
@@ -53,6 +58,7 @@ import {separateAudioOption} from './separate-audio';
 import {stillImageFormatOption} from './still-image-format';
 import {throwIfSiteExistsOption} from './throw-if-site-exists';
 import {delayRenderTimeoutInMillisecondsOption} from './timeout';
+import {userAgentOption} from './user-agent';
 import {videoBitrateOption} from './video-bitrate';
 import {mediaCacheSizeInBytesOption} from './video-cache-size';
 import {videoCodecOption} from './video-codec';
@@ -63,12 +69,14 @@ import {x264Option} from './x264-preset';
 export const allOptions = {
 	audioCodecOption,
 	browserExecutableOption,
+	concurrencyOption,
 	scaleOption,
 	crfOption,
 	jpegQualityOption,
 	videoBitrateOption,
 	audioBitrateOption,
 	enforceAudioOption,
+	everyNthFrameOption,
 	mutedOption,
 	videoCodecOption,
 	offthreadVideoCacheSizeInBytesOption,
@@ -76,6 +84,7 @@ export const allOptions = {
 	webhookCustomDataOption,
 	colorSpaceOption,
 	deleteAfterOption,
+	disableWebSecurityOption,
 	disallowParallelEncodingOption,
 	folderExpiryOption,
 	enableMultiprocessOnLinuxOption,
@@ -88,6 +97,7 @@ export const allOptions = {
 	reproOption,
 	pixelFormatOption,
 	preferLosslessOption: preferLosslessAudioOption,
+	proResProfileOption,
 	x264Option,
 	logLevelOption,
 	delayRenderTimeoutInMillisecondsOption,
@@ -108,6 +118,7 @@ export const allOptions = {
 	licenseKeyOption,
 	audioLatencyHintOption,
 	enableCrossSiteIsolationOption,
+	ignoreCertificateErrorsOption,
 	imageSequencePatternOption,
 	mediaCacheSizeInBytesOption,
 	darkModeOption,
@@ -120,6 +131,7 @@ export const allOptions = {
 	numberOfSharedAudioTagsOption,
 	ipv4Option,
 	stillImageFormatOption,
+	userAgentOption,
 	videoImageFormatOption,
 };
 
diff --git a/packages/renderer/src/options/prores-profile.tsx b/packages/renderer/src/options/prores-profile.tsx
new file mode 100644
index 00000000000..0a57be5a274
--- /dev/null
+++ b/packages/renderer/src/options/prores-profile.tsx
@@ -0,0 +1,64 @@
+import type {AnyRemotionOption} from './option';
+
+export type ProResProfile =
+	| '4444-xq'
+	| '4444'
+	| 'hq'
+	| 'standard'
+	| 'light'
+	| 'proxy';
+
+const validProResProfiles: ProResProfile[] = [
+	'4444-xq',
+	'4444',
+	'hq',
+	'standard',
+	'light',
+	'proxy',
+];
+
+let proResProfile: ProResProfile | undefined;
+
+const cliFlag = 'prores-profile' as const;
+
+export const proResProfileOption = {
+	name: 'ProRes profile',
+	cliFlag,
+	description: () => (
+		<>
+			Set the ProRes profile. This option is only valid if the codec has been
+			set to <code>prores</code>. Possible values:{' '}
+			{validProResProfiles.map((p) => `"${p}"`).join(', ')}. Default:{' '}
+			<code>&quot;hq&quot;</code>. See{' '}
+			<a href="https://video.stackexchange.com/a/14715">here</a> for an
+			explanation of possible values.
+		</>
+	),
+	ssrName: 'proResProfile' as const,
+	docLink: 'https://www.remotion.dev/docs/config#setproresprofile',
+	type: undefined as ProResProfile | undefined,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: String(commandLine[cliFlag]) as ProResProfile,
+			};
+		}
+
+		if (proResProfile !== undefined) {
+			return {
+				source: 'config',
+				value: proResProfile,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: undefined,
+		};
+	},
+	setConfig: (value) => {
+		proResProfile = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<ProResProfile | undefined>;
diff --git a/packages/renderer/src/options/user-agent.tsx b/packages/renderer/src/options/user-agent.tsx
new file mode 100644
index 00000000000..f0dd2542de3
--- /dev/null
+++ b/packages/renderer/src/options/user-agent.tsx
@@ -0,0 +1,42 @@
+import type {AnyRemotionOption} from './option';
+
+let userAgent: string | null = null;
+
+const cliFlag = 'user-agent' as const;
+
+export const userAgentOption = {
+	name: 'User agent',
+	cliFlag,
+	description: () => (
+		<>
+			Lets you set a custom user agent that the headless Chrome browser assumes.
+		</>
+	),
+	ssrName: 'userAgent' as const,
+	docLink: 'https://www.remotion.dev/docs/chromium-flags#--user-agent',
+	type: null as string | null,
+	getValue: ({commandLine}) => {
+		if (commandLine[cliFlag] !== undefined) {
+			return {
+				source: 'cli',
+				value: commandLine[cliFlag] as string,
+			};
+		}
+
+		if (userAgent !== null) {
+			return {
+				source: 'config',
+				value: userAgent,
+			};
+		}
+
+		return {
+			source: 'default',
+			value: null,
+		};
+	},
+	setConfig: (value) => {
+		userAgent = value;
+	},
+	id: cliFlag,
+} satisfies AnyRemotionOption<string | null>;