diff --git a/dayz-experimental.kvp b/dayz-experimental.kvp
index 3039760..6cb93d9 100644
--- a/dayz-experimental.kvp
+++ b/dayz-experimental.kvp
@@ -14,7 +14,7 @@ Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
 Meta.ContainerPolicyReason=
-Meta.ExtraSetupStepsURI=https://discourse.cubecoders.com/t/dayz-server-guide/3454
+Meta.ExtraSetupStepsURI=https://discourse.cubecoders.com/docs?topic=3454?utm_source=ampcreate&utm_content=dayz
 Meta.Prerequsites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
@@ -27,7 +27,7 @@ App.ExecutableLinux=1042420/DayZServer
 App.WorkingDir=1042420
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} "-profiles={{$FullBaseDir}}DayZServerData" "-bepath={{$FullBaseDir}}battleye" -port={{$GamePort}} -config=serverDZ.cfg -dologs -adminlog -freezeCheck -ip={{$ApplicationIPBinding}} {{$FormattedArgs}} "{{CustomServerArgs}}"
+App.CommandLineArgs={{$PlatformArgs}} "-profiles={{$FullBaseDir}}DayZServerData" "-bepath={{$FullBaseDir}}battleye" -port={{$GamePort}} -config=serverDZ.cfg -dologs -adminlog -freezeCheck -ip={{$ApplicationIPBinding}} {{$FormattedArgs}} {{filePatching}}{{EnableLimitFPS}}"{{CustomServerArgs}}"
 App.UseLinuxIOREDIR=False
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"1024020"}
diff --git a/dayz-experimentalconfig.json b/dayz-experimentalconfig.json
index 3dcf081..d21ddfe 100644
--- a/dayz-experimentalconfig.json
+++ b/dayz-experimentalconfig.json
@@ -265,10 +265,12 @@
         "Keywords":"file,patching,filepatching",
         "FieldName":"filePatching",
         "InputType":"checkbox",
-        "IsFlagArgument":true,
+        "IsFlagArgument":false,
         "ParamFieldName":"filePatching",
-        "IncludeInCommandLine":true,
-        "DefaultValue":"-filePatching"
+        "IncludeInCommandLine":false,
+        "DefaultValue":"-filePatching ",
+            "False":"",
+            "True":"-filePatching "
     },
     {
         "DisplayName":"Allow Client File Patching",
@@ -303,17 +305,33 @@
         }
     },
     {
-        "DisplayName":"FPS Limit",
+        "DisplayName":"Enable FPS Limit",
         "Category":"DayZ Server Settings",
-        "Description":"Sets the limit for the server FPS, to lower CPU usage of low population servers",
-        "Keywords":"frames,fps,limitfps",
+        "Description":"If enabled, the server FPS will be limited to the value set under \"FPS Limit Value\". Disabling this setting can have a severe effect on server performance",
+        "Keywords":"enable,frames,fps,limitfps",
+        "FieldName":"EnableLimitFPS",
+        "InputType":"checkbox",
+        "IsFlagArgument":false,
+        "ParamFieldName":"EnableLimitFPS",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"-limitFPS={{limitFPS}} ",
+        "EnumValues":{
+            "False":"",
+            "True":"-limitFPS={{limitFPS}} "
+        }
+    },
+    {
+        "DisplayName":"FPS Limit Value",
+        "Category":"DayZ Server Settings",
+        "Description":"Sets the limit for the server FPS, to lower CPU usage of low population servers. Requires \"Enable FPS Limit\" to be set",
+        "Keywords":"frames,fps,value,limitfps",
         "FieldName":"limitFPS",
         "InputType":"number",
         "MinValue":"1",
         "MaxValue":"200",
         "IsFlagArgument":false,
         "ParamFieldName":"limitFPS",
-        "IncludeInCommandLine":true,
+        "IncludeInCommandLine":false,
         "DefaultValue":"200",
         "Placeholder":"200",
         "Suffix":"fps",
diff --git a/dayz-original.kvp b/dayz-original.kvp
index b73696e..63c42b2 100644
--- a/dayz-original.kvp
+++ b/dayz-original.kvp
@@ -14,7 +14,7 @@ Meta.SpecificDockerImage=
 Meta.DockerRequired=False
 Meta.ContainerPolicy=Supported
 Meta.ContainerPolicyReason=
-Meta.ExtraSetupStepsURI=https://discourse.cubecoders.com/t/dayz-server-guide/3454
+Meta.ExtraSetupStepsURI=https://discourse.cubecoders.com/docs?topic=3454?utm_source=ampcreate&utm_content=dayz
 Meta.Prerequsites=[]
 Meta.ExtraContainerPackages=[]
 Meta.ConfigReleaseState=NotSpecified
@@ -27,7 +27,7 @@ App.ExecutableLinux=
 App.WorkingDir=223350
 App.LinuxCommandLineArgs=
 App.WindowsCommandLineArgs=
-App.CommandLineArgs={{$PlatformArgs}} "-profiles={{$FullBaseDir}}DayZServerData" "-bepath={{$FullBaseDir}}battleye" -port={{$GamePort}} -config=serverDZ.cfg -dologs -adminlog -freezeCheck -ip={{$ApplicationIPBinding}} {{$FormattedArgs}} "{{CustomServerArgs}}"
+App.CommandLineArgs={{$PlatformArgs}} "-profiles={{$FullBaseDir}}DayZServerData" "-bepath={{$FullBaseDir}}battleye" -port={{$GamePort}} -config=serverDZ.cfg -dologs -adminlog -freezeCheck -ip={{$ApplicationIPBinding}} {{$FormattedArgs}} {{filePatching}}{{EnableLimitFPS}}"{{CustomServerArgs}}"
 App.UseLinuxIOREDIR=False
 App.AppSettings={}
 App.EnvironmentVariables={"LD_LIBRARY_PATH":"{{$FullBaseDir}}linux64:%LD_LIBRARY_PATH%","SteamAppId":"221100"}
diff --git a/dayz-originalconfig.json b/dayz-originalconfig.json
index b21ad19..a9df02e 100644
--- a/dayz-originalconfig.json
+++ b/dayz-originalconfig.json
@@ -265,10 +265,12 @@
         "Keywords":"file,patching,filepatching",
         "FieldName":"filePatching",
         "InputType":"checkbox",
-        "IsFlagArgument":true,
+        "IsFlagArgument":false,
         "ParamFieldName":"filePatching",
-        "IncludeInCommandLine":true,
-        "DefaultValue":"-filePatching"
+        "IncludeInCommandLine":false,
+        "DefaultValue":"-filePatching ",
+            "False":"",
+            "True":"-filePatching "
     },
     {
         "DisplayName":"Allow Client File Patching",
@@ -303,17 +305,33 @@
         }
     },
     {
-        "DisplayName":"FPS Limit",
+        "DisplayName":"Enable FPS Limit",
         "Category":"DayZ Server Settings",
-        "Description":"Sets the limit for the server FPS, to lower CPU usage of low population servers",
-        "Keywords":"frames,fps,limitfps",
+        "Description":"If enabled, the server FPS will be limited to the value set under \"FPS Limit Value\". Disabling this setting can have a severe effect on server performance",
+        "Keywords":"enable,frames,fps,limitfps",
+        "FieldName":"EnableLimitFPS",
+        "InputType":"checkbox",
+        "IsFlagArgument":false,
+        "ParamFieldName":"EnableLimitFPS",
+        "IncludeInCommandLine":false,
+        "DefaultValue":"-limitFPS={{limitFPS}} ",
+        "EnumValues":{
+            "False":"",
+            "True":"-limitFPS={{limitFPS}} "
+        }
+    },
+    {
+        "DisplayName":"FPS Limit Value",
+        "Category":"DayZ Server Settings",
+        "Description":"Sets the limit for the server FPS, to lower CPU usage of low population servers. Requires \"Enable FPS Limit\" to be set",
+        "Keywords":"frames,fps,value,limitfps",
         "FieldName":"limitFPS",
         "InputType":"number",
         "MinValue":"1",
         "MaxValue":"200",
         "IsFlagArgument":false,
         "ParamFieldName":"limitFPS",
-        "IncludeInCommandLine":true,
+        "IncludeInCommandLine":false,
         "DefaultValue":"200",
         "Placeholder":"200",
         "Suffix":"fps",