diff --git a/.ci/runner.py b/.ci/runner.py
index 96f98be..b20bd9f 100755
--- a/.ci/runner.py
+++ b/.ci/runner.py
@@ -252,8 +252,12 @@ def runHPCJoin( self, tests ) :
     stepDict = {
                   "submit_options" : 
                   {
-                    "submission" : hpcSubmit[0],
-                    "timelimit"  : maxTimelimitStr
+                    self.globalOpts_.forceFQDN :
+                    {
+                      # Make this a host-specific so that it has priority
+                      "submission" : hpcSubmit[0],
+                      "timelimit"  : maxTimelimitStr
+                    }
                   },
                   "command"   : ABS_FILEPATH,
                   "arguments" : args