diff --git a/src/renderers/vulkan/tr_init.c b/src/renderers/vulkan/tr_init.c
index 3961cf6cde..519bbd56ab 100644
--- a/src/renderers/vulkan/tr_init.c
+++ b/src/renderers/vulkan/tr_init.c
@@ -80,6 +80,8 @@ cvar_t	*r_skipBackEnd;
 cvar_t	*r_greyscale;
 cvar_t	*r_dither;
 cvar_t	*r_presentBits;
+cvar_t	*r_outline;
+cvar_t	*r_outlineThreshold;
 
 static cvar_t *r_ignorehwgamma;
 
@@ -2591,10 +2593,12 @@ static void R_Register( void )
 	ri.Cvar_Get( "r_svgMaxFileBytes", "2097152", CVAR_ARCHIVE );
 	ri.Cvar_SetDescription( ri.Cvar_Get( "r_svgMaxFileBytes", "2097152", CVAR_ARCHIVE ),
 		"Maximum accepted SVG source file size in bytes." );
-	ri.Cvar_Get( "r_outline", "0", CVAR_ARCHIVE );
-	ri.Cvar_SetDescription( ri.Cvar_Get( "r_outline", "0", CVAR_ARCHIVE ), "Edge-detection outline strength (0 = off, 0.5 = subtle, 1.0 = strong)." );
-	ri.Cvar_Get( "r_outlineThreshold", "0.15", CVAR_ARCHIVE );
-	ri.Cvar_SetDescription( ri.Cvar_Get( "r_outlineThreshold", "0.15", CVAR_ARCHIVE ), "Luminance edge threshold for outline detection." );
+	r_outline = ri.Cvar_Get( "r_outline", "0", CVAR_ARCHIVE );
+	ri.Cvar_SetDescription( r_outline, "Edge-detection outline strength (0 = off, 0.5 = subtle, 1.0 = strong)." );
+	ri.Cvar_SetGroup( r_outline, CVG_RENDERER );
+	r_outlineThreshold = ri.Cvar_Get( "r_outlineThreshold", "0.15", CVAR_ARCHIVE );
+	ri.Cvar_SetDescription( r_outlineThreshold, "Luminance edge threshold for outline detection." );
+	ri.Cvar_SetGroup( r_outlineThreshold, CVG_RENDERER );
 	ri.Cvar_Get( "r_safeMode", "0", CVAR_ARCHIVE | CVAR_LATCH );
 	ri.Cvar_SetDescription( ri.Cvar_Get( "r_safeMode", "0", CVAR_ARCHIVE | CVAR_LATCH ), "Safe mode: disables post-processing, bloom, SSAO, volumetric fog. Use if the engine crashes on startup." );
 
diff --git a/src/renderers/vulkan/tr_local.h b/src/renderers/vulkan/tr_local.h
index 88a49757b6..1d7c033e06 100644
--- a/src/renderers/vulkan/tr_local.h
+++ b/src/renderers/vulkan/tr_local.h
@@ -1788,6 +1788,8 @@ extern	cvar_t	*r_skipBackEnd;
 extern	cvar_t	*r_greyscale;
 extern	cvar_t	*r_dither;
 extern	cvar_t	*r_presentBits;
+extern	cvar_t	*r_outline;
+extern	cvar_t	*r_outlineThreshold;
 
 extern	cvar_t	*r_ignoreGLErrors;
 
diff --git a/src/renderers/vulkan/vk_post_process_pipeline.c b/src/renderers/vulkan/vk_post_process_pipeline.c
index 9290703dd8..c7ad51d50e 100644
--- a/src/renderers/vulkan/vk_post_process_pipeline.c
+++ b/src/renderers/vulkan/vk_post_process_pipeline.c
@@ -364,12 +364,8 @@ void vk_create_post_process_pipeline( int program_index, uint32_t width, uint32_
 	frag_spec_data.film_grain = PostFX_GetFilmGrain();
 	frag_spec_data.postprocess_enabled = ( r_post && r_post->integer ) ? 1 : 0;
 	frag_spec_data.film_look = PostFX_GetFilmLook();
-	{
-		cvar_t *r_outline = ri.Cvar_Get( "r_outline", "0", CVAR_ARCHIVE );
-		cvar_t *r_outlineThreshold = ri.Cvar_Get( "r_outlineThreshold", "0.15", CVAR_ARCHIVE );
-		frag_spec_data.outline_strength = r_outline ? r_outline->value : 0.0f;
-		frag_spec_data.outline_threshold = r_outlineThreshold ? r_outlineThreshold->value : 0.15f;
-	}
+	frag_spec_data.outline_strength = r_outline ? r_outline->value : 0.0f;
+	frag_spec_data.outline_threshold = r_outlineThreshold ? r_outlineThreshold->value : 0.15f;
 	{
 		cvar_t *r_post_contrast = ri.Cvar_Get( "r_post_contrast", "1.0", CVAR_ARCHIVE_ND );
 		cvar_t *r_post_saturation = ri.Cvar_Get( "r_post_saturation", "1.0", CVAR_ARCHIVE_ND );
diff --git a/src/renderers/vulkan/vk_postfx_params.c b/src/renderers/vulkan/vk_postfx_params.c
index 51f57db0c0..b06a20dfbd 100644
--- a/src/renderers/vulkan/vk_postfx_params.c
+++ b/src/renderers/vulkan/vk_postfx_params.c
@@ -16,8 +16,6 @@ void vk_update_postfx_params( uint32_t cmd_index )
 	vec3_t shadowLift, midGamma, highlightGain, splitShadow, splitHighlight;
 	cvar_t *r_post_contrast;
 	cvar_t *r_post_saturation;
-	cvar_t *r_outline;
-	cvar_t *r_outlineThreshold;
 	cvar_t *r_autoExposure_target;
 	cvar_t *r_autoExposure_min;
 	cvar_t *r_autoExposure_max;
@@ -70,8 +68,6 @@ void vk_update_postfx_params( uint32_t cmd_index )
 	params.colorBalance[3] = ( r_pre_exposure_scale && r_pre_exposure_scale->value > 0.0f ) ? r_pre_exposure_scale->value : 1.0f;
 	r_post_contrast = ri.Cvar_Get( "r_post_contrast", "1.0", 0 );
 	r_post_saturation = ri.Cvar_Get( "r_post_saturation", "1.0", 0 );
-	r_outline = ri.Cvar_Get( "r_outline", "0", 0 );
-	r_outlineThreshold = ri.Cvar_Get( "r_outlineThreshold", "0.15", 0 );
 	params.colorGrade[0] = Com_Clamp( 0.0f, 3.0f, PostFX_GetGradeSaturation() );
 	params.colorGrade[1] = Com_Clamp( -1.0f, 1.0f, PostFX_GetGradeVibrance() );
 	params.colorGrade[2] = ( r_post_contrast && r_post_contrast->value > 0.0f ) ? r_post_contrast->value : 1.0f;
diff --git a/src/server/sv_ccmds.c b/src/server/sv_ccmds.c
index c3c99e8599..eda749e1c1 100644
--- a/src/server/sv_ccmds.c
+++ b/src/server/sv_ccmds.c
@@ -642,7 +642,7 @@ static void SV_BanNum_f( void ) {
 }
 
 #endif // USE_BANS
-#endif // !COM_STANDALONE
+#endif // !STANDALONE
 
 #ifdef USE_BANS
 /*