diff --git a/docs/Agent/user-guide/man_page.md b/docs/Agent/user-guide/man_page.md
index dec5e86642..8e33b7ed27 100644
--- a/docs/Agent/user-guide/man_page.md
+++ b/docs/Agent/user-guide/man_page.md
@@ -35,21 +35,25 @@
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-clear-results` - clears the result directory
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-clear-results [OPTIONS]`
 
-**DESCRIPTION**  
-This command clears the results directory from `/var/lib/pbench-agent` directory.
+**DESCRIPTION**
+
+This command clears the results directories from `/var/lib/pbench-agent` directory.
+
+**OPTIONS**
 
-**OPTIONS**  
- `-C`, `--config PATH`  
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -58,30 +62,34 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-clear-tools` - clear registered tools by name or group
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-clear-tools [OPTIONS]`
 
-**DESCRIPTION**  
+**DESCRIPTION**
+
 Clear all tools which are registered and can filter by name of the group.
 
-**OPTIONS**  
-`-C`, `--config PATH`  
+**OPTIONS**
+
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`-n`, `--name`, `--names <name>`  
+[`-n`, `--name`, `--names`] `<name>`\
 Clear only the `<name>` tool.
 
-`-g`, `--group`, `--groups <group>`  
+[`-g`, `--group`, `--groups`] `<group>`\
 Clear the tools in the `<group>`. If no group is specified, the `default` group is assumed.
 
-`-r`, `--remote`, `--remotes STR[,STR...]`  
+[`-r`, `--remote`, `--remotes`] `<host>[,<host>]...`\
 Clear the tool(s) only on the specified remote(s). Multiple remotes may be specified as a comma-separated list. If no remote is specified, all remotes are cleared.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -90,42 +98,48 @@ Show this message and exit.
 
 ---
 
-**NAME**  
-`pbench-copy-results` - copy result tarball to the 0.69 Pbench Server
+**NAME**
+
+`pbench-copy-results` - copy result tarball to a 0.69 Pbench Server
+
+**SYNOPSIS**
 
-**SYNOPSIS**  
 `pbench-copy-results --user=<user> [OPTIONS]`
 
-**DESCRIPTION**  
-Push the benchmark result to the Pbench Server without removing it from the local host. This command requires `/opt/pbench-agent/id_rsa` file with the private SSH key, when pushing to a 0.69 Pbench Server.
+**DESCRIPTION**
 
-**OPTIONS**  
-`--user <user>`  
+Push the benchmark result to a 0.69 Pbench Server without removing it from the
+local host. This command requires an `/opt/pbench-agent/id_rsa` file containing
+a private SSH key for the 0.69 Pbench Server `pbench` account.
+
+**OPTIONS**
+
+`--user <user>`\
 This option value is required if not provided by the
 `PBENCH_USER` environment variable; otherwise, a value provided
 on the command line will override any value provided by the
 environment.
 
-`--controller <controller>`  
+`--controller <controller>`\
 This option may be used to override the value
 provided by the `PBENCH_CONTROLLER` environment variable; if
 neither value is available, the result of `hostname -f` is used.
 (If no value is available, the command will exit with an error.)
 
-`--prefix <prefix>`  
+`--prefix <prefix>`\
 This option allows the user to specify an optional
 directory-path hierarchy to be used when displaying the result
 files on the 0.69 Pbench Server.
 
-`--show-server`  
+`--show-server`\
 This will not move any results but will resolve and
 then display the pbench server destination for results.
 
-`--xz-single-threaded`  
+`--xz-single-threaded`\
 This will force the use of a single
 thread for locally compressing the result files.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -134,30 +148,34 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-list-tools` - list all the registered tools optionally filtered by name or group
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-list-tools [OPTIONS]`
 
-**DESCRIPTION**  
+**DESCRIPTION**
+
 List tool registrations, optionally filtered by tool name or tool group.
 
-**OPTIONS**  
- `-C`, `--config PATH`  
+**OPTIONS**
+
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`-n`, `--name <name>`  
+[`-n`, `--name`] `<name>`\
 List the tool groups in which tool `<name>` is registered.
 
-`-g`, `--group <group>`  
+[`-g`, `--group`] `<group>`\
 List all the tools registered in the `<group>`.
 
-`-o`, `--with-option`  
+`-o`, `--with-option`\
 List the options with each tool.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -166,24 +184,28 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-list-triggers` - list the registered triggers by group
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-list-triggers [OPTIONS]`
 
-**DESCRIPTION**  
+**DESCRIPTION**
+
 This command will list all the registered triggers by `group-name`.
 
-**OPTIONS**  
- `-C`, `--config PATH`  
+**OPTIONS**
+
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`-g`, `--group`, `--groups <group>`  
+[`-g`, `--group`, `--groups`] `<group>`\
 List all the triggers registered in the `<group>`.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -192,42 +214,49 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-move-results` - move all results to 0.69 Pbench Server
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-move-results [OPTIONS]`
 
-**DESCRIPTION**  
-Push the benchmark result to the 0.69 Pbench Server. Requires a `/opt/pbench-agent/id_rsa` file with the private SSH key of the server's pbench account. On a successful push, this command removes the results from the local host.
+**DESCRIPTION**
+
+Push the benchmark result to a 0.69 Pbench Server. This command requires an
+`/opt/pbench-agent/id_rsa` file containing a private SSH key for the 0.69
+Pbench Server `pbench` account. On a successful push, this command removes the
+results from the local host.
 
-**OPTIONS**  
-`--user <user>`  
+**OPTIONS**
+
+`--user <user>`\
 This option value is required if not provided by the
 `PBENCH_USER` environment variable; otherwise, a value provided
 on the command line will override any value provided by the
 environment.
 
-`--controller <controller>`  
+`--controller <controller>`\
 This option may be used to override the value
 provided by the `PBENCH_CONTROLLER` environment variable; if
 neither value is available, the result of `hostname -f` is used.
 (If no value is available, the command will exit with an error.)
 
-`--prefix <prefix>`  
+`--prefix <prefix>`\
 This option allows the user to specify an optional
 directory-path hierarchy to be used when displaying the result
 tar balls on the pbench server.
 
-`--show-server`  
+`--show-server`\
 This will not move any results but will resolve and
 then display the pbench server destination for results.
 
-`--xz-single-threaded`  
+`--xz-single-threaded`\
 This will force the use of a single
 thread for locally compressing the result files.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -236,14 +265,17 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-register-tool` - registers the specified tool
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-register-tool --name=<tool-name> [OPTIONS] [-- <tool-specific-options>]`
 
-**DESCRIPTION**  
-Register the specified tool.  
+**DESCRIPTION**
+
+Register the specified tool.
 List of available tools:
 
 **Transient**
@@ -298,26 +330,40 @@ For a list of tool-specific options, run:
 
 > `/opt/pbench-agent/tool-scripts/<tool-name> --help`
 
-**OPTIONS**  
-`--name <tool-name>`  
+**OPTIONS**
+
+`--name <tool-name>`\
 `<tool-name>` specifies the name of the tool to be registered.
 
-`-g`, `--group`, `--groups <group>`    
-Register the tool in `<group>`. If no group is specified, the `default` group is assumed.
+[`-g`, `--group`, `--groups`] `<group>`\
+Register the tool in `<group>`. If no group is specified, the `default` group
+is assumed.
 
-`[--persistent | --transient]`  
-For tools which can be run as either "transient" (where they are started and stopped on each iteration) or as "persistent" (where they are started before the first iteration and run continuously over all iterations), these options determine how the tool will be run. (Most tools are configured to run as either one the other, so these options are not necessary in those cases, and specifying the wrong one will produce an error.)
+`[--persistent | --transient]`\
+For tools which can be run as either "transient" (where they are started and
+stopped on each iteration) or as "persistent" (where they are started before
+the first iteration and run continuously over all iterations), these options
+determine how the tool will be run.
 
-`--no-install`  
+Most tools can be run only in one mode, so these options are necessary only
+when a tool (such as `pcp`) can be run in either mode. Specifying a mode the
+tool does not support will produce an error.
+
+`--no-install`\
 [To be supplied]
 
-`--labels=<label>[,<label>]]`  
+`--labels=<label>[,<label>]...`\
 Where the list of labels must match the list of remotes.
 
-`-remotes STR[,STR]...`
-Single remote host, a list of remote hosts (comma-separated, no spaces) or an "at" sign (`@`) followed by a filename. In this last case, the file should contain a list of hosts and their (optional) labels. Each line of the file should contain a hostname, optionally followed by a label separated by a comma (`,`); empty lines are ignored, and comments are denoted by a leading hash (`#`), character.
+`--remotes <host>[,<host>]... | @<file>`\
+A single remote host, a list of remote hosts (comma-separated, no spaces) or an
+"at" sign (`@`) followed by a filename. In this last case, the file should
+contain a list of hosts and their (optional) labels. Each line of the file
+should contain a hostname, optionally followed by a label separated by a comma
+(`,`); empty lines are ignored, and comments are denoted by a leading hash
+(`#`), character.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -326,13 +372,16 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-register-tool-set` - register the specified toolset
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-register-tool-set [OPTIONS] <tool-set>`
 
-**DESCRIPTION**  
+**DESCRIPTION**
+
 Register all the tools in the specified toolset.
 
 Available `<tool-set>` from /opt/pbench-agent/config/pbench-agent.cfg:
@@ -342,23 +391,29 @@ Available `<tool-set>` from /opt/pbench-agent/config/pbench-agent.cfg:
 - light
 - medium
 
-**OPTIONS**  
-`-remotes STR[,STR]...`
-Single remote host, a list of remote hosts (comma-separated, no spaces) or an "at" sign (`@`) followed by a filename. In this last case, the file should contain a list of hosts and their (optional) labels. Each line of the file should contain a hostname, optionally followed by a label separated by a comma (`,`); empty lines are ignored, and comments are denoted by a leading hash (`#`), character.
+**OPTIONS**
+
+`--remotes <host>[,<host>]... | @<file>`\
+Single remote host, a list of remote hosts (comma-separated, no spaces) or an
+"at" sign (`@`) followed by a filename. In this last case, the file should
+contain a list of hosts and their (optional) labels. Each line of the file
+should contain a hostname, optionally followed by a label separated by a comma
+(`,`); empty lines are ignored, and comments are denoted by a leading hash
+(`#`), character.
 
-`-g`, `--group <group>`  
+[`-g`, `--group`] `<group>`\
 Register the toolset in `<group>`. If no group is specified, the `default` group is assumed.
 
-`--labels=<label>[,<label>]]`  
+`--labels=<label>[,<label>]...`\
 Where the list of labels must match the list of remotes.
 
-`--interval=<INT>`  
+`--interval=<interval>`\
 [To be supplied]
 
-`--no-install`  
+`--no-install`\
 [To be supplied]
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -367,30 +422,35 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-register-tool-trigger` - register the tool trigger
 
-**SYNOPSIS**  
+**SYNOPSIS**
+
 `pbench-register-tool-trigger [OPTIONS]`
 
-**DESCRIPTION**  
+**DESCRIPTION**
+
 Register triggers which start and stop data collection for the given tool group.
 
-**OPTIONS**  
- `-C`, `--config PATH`  
+**OPTIONS**
+
+[ `-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
-This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
+This option is required if not provided by the `_PBENCH_AGENT_CONFIG`
+environment variable.
 
-`-g`, `--group`, `--groups <group>`  
+[`-g`, `--group`, `--groups`] `<group>`\
 Registers the trigger in the `<group>`. If no group is specified, the `default` group is assumed.
 
-`--start-trigger STR`  
+`--start-trigger <string>`\
 [To be supplied]
 
-`--stop-trigger STR`  
+`--stop-trigger <string>`\
 [To be supplied]
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -399,33 +459,63 @@ Show this message and exit.
 
 ---
 
-**NAME**  
-`pbench-results-move` - move results directories to the server to a 1.0 Pbench Server
+**NAME**
+
+`pbench-results-move` - move results directories to a 1.0 Pbench Server
+
+**SYNOPSIS**
 
-**SYNOPSIS**  
 `pbench-results-move [OPTIONS]`
 
-**DESCRIPTION**  
-This command uploads one or more result directories to the configured v1.0 Pbench Server. The specified API Key is used to authenticate the user and to establish ownership of the data on the server. Once the upload is complete, the result directories are, by default, removed from the local system.
+**DESCRIPTION**
+
+This command uploads one or more result directories to a 1.0 Pbench Server.
+
+Two modes are supported:
+
+1. The results are pushed directly to a Pbench Server using the API Key
+authentication token specified by `--token`, and will be owned by that user.
+The Pbench Server URI can be specified with `--server`, or will be defaulted
+from the active configuration file.
+2. The results are pushed to a Relay server, which may be anywhere reachable
+both from the Pbench Agent host executing the command and a 1.0 Pbench Server.
+The command will report a URI, which can be presented to a 1.0 Pbench Server
+through the `relay` API or from the Pbench Dashboard to cause the server to
+pull the results from the Relay server.
+
+Once the upload is complete, the result directories
+are, by default, removed from the local system.
+
+**OPTIONS**
 
-**OPTIONS**  
- `-C`, `--config PATH`  
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`--controller <controller>`  
+`--relay <relay>`\
+Instead of pushing results directly to a Pbench Server, push them to a Relay
+server at the specified URI. For example, `https://myrelay.example.com`.
+
+`--server <server>`\
+Override the default server path in the Pbench Agent configuration file and
+push results to the specified Pbench Server URI. For example,
+`https://pbench.example.com`. This is especially useful in a containerized
+Pbench Agent to push results without mapping a customized Pbench Agent
+configuration file into the container.
+
+`--controller <controller>`\
 Override the default controller name.
 
-`--token <token>`  
-Pbench Server API key [required].
+`--token <token>`\
+Pbench Server API key [required unless `--relay` is specified].
 
-`--delete` | `--no-delete`  
+`--delete` | `--no-delete`\
 Remove local data after successful copy [default: `delete`]
 
-`--xz-single-threaded`  
+`--xz-single-threaded`\
 Use single-threaded compression with `xz`.
 
-`--help`  
+`--help`\
 Show this message and exit.
 
 ---
@@ -434,13 +524,16 @@ Show this message and exit.
 
 ---
 
-**NAME**  
+**NAME**
+
 `pbench-user-benchmark` - run a workload and collect performance data
 
-**SYNOPSIS**  
-`pbench-user-benchmark [OPTIONS] -- <command-to-run>`
+**SYNOPSIS**
+
+`pbench-user-benchmark [OPTIONS] <command-to-run>`
+
+**DESCRIPTION**
 
-**DESCRIPTION**  
 Collects data from the registered tools while running a user-specified action. This can be a specific synthetic benchmark workload, a real workload, or simply a delay to measure system activity.
 
 Invoking `pbench-user-benchmark` with a workload generator as an argument will perform the following steps:
@@ -450,44 +543,51 @@ Invoking `pbench-user-benchmark` with a workload generator as an argument will p
 - Stop the collection tools on all the hosts.
 - Gather the data from all the remote hosts and generate a `result.txt` file by running the tools' post-processing on the collected data.
 
-`<command-to-run>`
+`<command-to-run>`\
 A script, executable, or shell command to run while gathering tool data. Use `--`
 to stop processing of `pbench-user-benchmark` options if your command includes
 options, like
 
 > `pbench-user-benchmark --config string -- fio --bs 16k`
 
-**OPTIONS**  
-`-C`, `--config PATH`  
+**OPTIONS**
+
+[`-C`, `--config`] `<path>`\
 Path to the Pbench Agent configuration file.
 This option is required if not provided by the `_PBENCH_AGENT_CONFIG` environment variable.
 
-`--tool-group STR`  
+`--tool-group <tool-group>`\
 The tool group to use for data collection.
 
-`--iteration-list STR`  
-A file containing a list of iterations to run for the provided script;
-the file should contain one iteration per line. With a leading hash (`#`) character used for comments and blank lines are ignored.
-Each iteration line should use alpha-numeric characters before the first space to name the iteration, with the rest of the line provided as arguments to the script.  
+`--iteration-list <file>`\
+A file containing a list of iterations to run for the provided script. The file
+must contain one iteration per line. Blank lines are ignored, and you can use a
+leading hash (`#`) character for comments. Each iteration line should use
+alpha-numeric characters before the first space to name the iteration, with the
+rest of the line provided as arguments to the script.
 _NOTE: --iteration-list is not compatible with --use-tool-triggers_
 
-`--sysinfo STR[,STR...]`  
-Comma-separated values of system information to be collected; available: `default`, `none`, `all`, `ara`, `block`, `insights`, `kernel_config`, `libvirt`, `security_mitigations`, `sos`, `stockpile`, `topology`
+`--sysinfo STR[,STR]...`\
+Comma-separated values of system information to be collected; available:
+`default`, `none`, `all`, `ara`, `block`, `insights`, `kernel_config`,
+`libvirt`, `security_mitigations`, `sos`, `stockpile`, `topology`
 
-`--pbench-pre STR`  
-Path to the script which will be executed before tools are started.  
+`--pbench-pre <pre-script>`\
+Path to the script which will be executed before tools are started.
 _NOTE: --pbench-pre is not compatible with --use-tool-triggers_
 
-`--pbench-post STR`  
-Path to the script which will be executed after tools are stopped and postprocessing is complete.  
+`--pbench-post <post-script>`\
+Path to the script which will be executed after tools are stopped and
+postprocessing is complete.
 _NOTE: --pbench-post is not compatible with --use-tool-triggers_
 
-`--use-tool-triggers`  
-Use tool triggers instead of normal start/stop around script.  
-_NOTE: --use-tool-triggers is not compatible with --iteration-list,--pbench-pre, or --pbench-post_
+`--use-tool-triggers`\
+Use tool triggers instead of normal start/stop around script.
+_NOTE: --use-tool-triggers is not compatible with --iteration-list,
+--pbench-pre, or --pbench-post_
 
-`--no-stderr-capture`  
+`--no-stderr-capture`\
 Do not capture the standard error output of the script in the `result.txt` file
 
-`--help`  
+`--help`\
 Show this message and exit.
diff --git a/lib/pbench/agent/results.py b/lib/pbench/agent/results.py
index 39bb822e38..179372e1e2 100644
--- a/lib/pbench/agent/results.py
+++ b/lib/pbench/agent/results.py
@@ -1,16 +1,20 @@
 import collections
 import datetime
+from functools import partial
+import hashlib
+from io import BytesIO, IOBase
+import json
 from logging import Logger
 import os
 from pathlib import Path
 import shutil
 import subprocess
-from typing import List, Optional
-import urllib.parse
+from typing import Any, List, Optional
 
 import requests
 
 from pbench.agent import PbenchAgentConfig
+from pbench.cli import CliContext
 from pbench.common import MetadataLog
 from pbench.common.exceptions import BadMDLogFormat
 from pbench.common.utils import md5sum, validate_hostname
@@ -278,7 +282,7 @@ def make_result_tb(self, single_threaded: bool = False) -> TarballRecord:
         return TarballRecord(name=tarball, length=tar_len, md5=tar_md5)
 
 
-class CopyResultTb:
+class CopyResult:
     """Interfaces for copying result tar balls remotely using the server's HTTP
     PUT method for uploads.
     """
@@ -289,93 +293,144 @@ class FileUploadError(Exception):
         pass
 
     def __init__(
-        self,
-        tarball: str,
-        tarball_len: int,
-        tarball_md5: str,
-        config: PbenchAgentConfig,
-        logger: Logger,
+        self, logger: Logger, access: Optional[str], metadata: Optional[List[str]]
     ):
-        """Constructor for object representing tar ball to be copied remotely.
-
-        Raises
-            FileNotFoundError   if the given tar ball does not exist
-        """
-        self.tarball = Path(tarball)
-        if not self.tarball.exists():
-            raise FileNotFoundError(f"Tar ball '{self.tarball}' does not exist")
-        self.tarball_len = tarball_len
-        self.tarball_md5 = tarball_md5
-        server_rest_url = config.get("results", "server_rest_url")
-        tbname = urllib.parse.quote(self.tarball.name)
-        self.upload_url = f"{server_rest_url}/upload/{tbname}"
+        """Constructor for object representing a tar ball destination"""
         self.logger = logger
+        self.uri = None
+        self.headers = {}
+        self.params: dict[str, Any] = {"access": access} if access else {}
+        if metadata:
+            self.params["metadata"] = metadata
+
+    def push(self, tarball: Path, tarball_md5: str) -> requests.Response:
+        raise NotImplementedError()
 
-    def copy_result_tb(
-        self, token: str, access: Optional[str] = None, metadata: Optional[List] = None
+    @staticmethod
+    def create(
+        config: PbenchAgentConfig,
+        logger: Logger,
+        relay: Optional[str],
+        server: Optional[str],
+        token: Optional[str],
+        access: Optional[str],
+        metadata: Optional[list[str]],
+    ) -> "CopyResult":
+        if relay:
+            return CopyResultToRelay(logger, relay, access, metadata)
+        else:
+            return CopyResultToServer(config, logger, server, token, access, metadata)
+
+    @classmethod
+    def cli_create(
+        cls, context: CliContext, config: PbenchAgentConfig, logger: Logger
+    ) -> "CopyResult":
+        return cls.create(
+            config,
+            logger,
+            context.relay,
+            context.server,
+            context.token,
+            context.access,
+            context.metadata,
+        )
+
+    def _put(
+        self,
+        stream: IOBase,
+        uri: str,
+        headers: dict[str, Any] = {},
+        query: dict[str, Any] = {},
     ) -> requests.Response:
-        """Copies the tar ball from the agent to the configured server using upload
-        API.
+        try:
+            return requests.put(uri, data=stream, headers=headers, params=query)
+        except requests.exceptions.ConnectionError as exc:
+            raise RuntimeError(f"Cannot connect to '{uri}': {exc}")
+        except Exception as exc:
+            raise self.FileUploadError(
+                f"Pbench Server file upload to {uri!r} failed: {str(exc)!r}"
+            )
 
-        Args:
-            token: a token which establishes that the caller is
-                authorized to make the PUT request on behalf of a
-                specific user.
-            access: keyword that identifies whether a dataset needs
-                to be published public or private.  Optional:  if omitted
-                the result will be the server default.
-            metadata: list of metadata keys to be sent on PUT. (Optional)
-                Format: key:value
-
-        Returns:
-            response from the PUT request
 
-        Raises:
-            RuntimeError     if a connection to the server fails
-            FileUploadError  if the tar ball failed to upload properly
+class CopyResultToServer(CopyResult):
+    def __init__(
+        self,
+        config: PbenchAgentConfig,
+        logger: Logger,
+        server: Optional[str],
+        token: Optional[str],
+        access: Optional[str],
+        metadata: Optional[list[str]],
+    ):
+        super().__init__(logger, access, metadata)
+        if server:
+            path = config.get("results", "rest_endpoint")
+            uri = f"{server}/{path}"
+        else:
+            uri = config.get("results", "server_rest_url")
+        self.uri = f"{uri}/upload/{{name}}"
+        self.headers.update(
+            {
+                "content-type": "application/octet-stream",
+                "Authorization": f"Bearer {token}",
+            }
+        )
 
-        """
-        params = {"access": access} if access else {}
-        if metadata:
-            params["metadata"] = metadata
+    def push(self, tarball: Path, tarball_md5: str) -> requests.Response:
+        if not tarball.exists():
+            raise FileNotFoundError(f"Tar ball '{tarball}' does not exist")
+        self.headers["Content-MD5"] = tarball_md5
+        tar_uri = self.uri.format(name=tarball.name)
+        with tarball.open("rb") as f:
+            r = self._put(f, tar_uri, self.headers, self.params)
+            return r
 
-        headers = {
-            "Content-MD5": self.tarball_md5,
-            "Authorization": f"Bearer {token}",
-        }
-        with self.tarball.open("rb") as f:
-            try:
-                request = requests.Request(
-                    "PUT", self.upload_url, data=f, headers=headers, params=params
-                ).prepare()
-
-                # Per RFC 2616, a request must not contain both
-                # Content-Length and Transfer-Encoding headers; however,
-                # the server would like to receive the Content-Length
-                # header, but the requests package may opt to generate
-                # the Transfer-Encoding header instead...so, check that
-                # we got what we want before we send the request.  Also,
-                # confirm that the contents of the Content-Length header
-                # is what we expect.
-                assert (
-                    "Transfer-Encoding" not in request.headers
-                ), "Upload request unexpectedly contains a `Transfer-Encoding` header"
-                assert (
-                    "Content-Length" in request.headers
-                ), "Upload request unexpectedly missing a `Content-Length` header"
-                assert request.headers["Content-Length"] == str(self.tarball_len), (
-                    "Upload request `Content-Length` header contains {} -- "
-                    "expected {}".format(
-                        request.headers["Content-Length"], self.tarball_len
-                    )
-                )
 
-                return requests.Session().send(request)
-            except requests.exceptions.ConnectionError as exc:
-                raise RuntimeError(f"Cannot connect to '{self.upload_url}': {exc}")
-            except Exception as exc:
-                raise self.FileUploadError(
-                    "There was something wrong with the file upload request: "
-                    f"file: '{self.tarball}', URL: '{self.upload_url}';"
-                    f" error: '{exc}'"
+class CopyResultToRelay(CopyResult):
+    def __init__(
+        self,
+        logger: Logger,
+        relay: Optional[str],
+        access: Optional[str],
+        metadata: Optional[list[str]],
+    ):
+        super().__init__(logger, access, metadata)
+        self.uri = f"{relay}/{{sha256}}"
+
+    def push(self, tarball: Path, tarball_md5: str) -> requests.Response:
+        if not tarball.exists():
+            raise FileNotFoundError(f"Tar ball '{tarball!s}' does not exist")
+        try:
+            with tarball.open("rb") as f:
+                d = hashlib.sha256(usedforsecurity=False)
+                for buf in iter(partial(f.read, 2**20), b""):
+                    d.update(buf)
+                tar_uri = self.uri.format(sha256=d.hexdigest())
+                self.logger.debug("Relay tarball %s", tar_uri)
+
+                f.seek(0)  # rewind since re-opening doesn't work
+                r = self._put(
+                    f, tar_uri, headers={"content-type": "application/octet-stream"}
                 )
+                if not r.ok:
+                    return r
+            self.params.update(
+                {"name": tarball.name, "uri": tar_uri, "md5": tarball_md5}
+            )
+            manifest = bytes(json.dumps(self.params, sort_keys=True), encoding="utf-8")
+            d = hashlib.sha256(manifest, usedforsecurity=False)
+            manifest_uri = self.uri.format(sha256=d.hexdigest())
+            self.logger.debug(
+                "Uploading manifest %s as %s to relay",
+                manifest.decode("utf-8"),
+                manifest_uri,
+            )
+            r = self._put(
+                BytesIO(manifest),
+                manifest_uri,
+                headers={"content-type": "application/octet-stream"},
+            )
+            return r
+        except Exception as e:
+            self.logger.exception("Problem relaying tarball: %s", str(e))
+            raise
diff --git a/lib/pbench/cli/agent/commands/results/move.py b/lib/pbench/cli/agent/commands/results/move.py
index b9b8ef8355..7ba429bf21 100644
--- a/lib/pbench/cli/agent/commands/results/move.py
+++ b/lib/pbench/cli/agent/commands/results/move.py
@@ -8,7 +8,7 @@
 import requests
 
 from pbench.agent.base import BaseCommand
-from pbench.agent.results import CopyResultTb, MakeResultTb
+from pbench.agent.results import CopyResult, MakeResultTb
 from pbench.cli import CliContext, pass_cli_context, sort_click_command_parameters
 from pbench.cli.agent.commands.results.results_options import results_common_options
 from pbench.cli.agent.options import common_options
@@ -36,6 +36,7 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
         runs_copied = 0
         failures = 0
         no_of_tb = 0
+        crt = CopyResult.cli_create(self.context, self.config, self.logger)
 
         with tempfile.TemporaryDirectory(
             dir=self.config.pbench_tmp, prefix="pbench-results-move."
@@ -51,7 +52,7 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
 
                 try:
                     mrt = MakeResultTb(
-                        result_dir,
+                        str(result_dir),
                         temp_dir,
                         self.context.controller,
                         self.config,
@@ -73,7 +74,7 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
                     continue
 
                 try:
-                    result_tb_name, result_tb_len, result_tb_md5 = mrt.make_result_tb(
+                    result_tb_name, _, result_tb_md5 = mrt.make_result_tb(
                         single_threaded=single_threaded
                     )
                 except BadMDLogFormat as exc:
@@ -98,24 +99,17 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
                     continue
 
                 try:
-                    crt = CopyResultTb(
-                        result_tb_name,
-                        result_tb_len,
-                        result_tb_md5,
-                        self.config,
-                        self.logger,
-                    )
-                    res = crt.copy_result_tb(
-                        self.context.token, self.context.access, self.context.metadata
-                    )
+                    res = crt.push(result_tb_name, result_tb_md5)
+                    if res.ok and self.context.relay:
+                        click.echo(f"RELAY {result_tb_name.name}: {res.url}")
                     if not res.ok:
                         try:
                             msg = res.json()["message"]
                         except requests.exceptions.JSONDecodeError:
                             msg = res.text if res.text else res.reason
-                        raise CopyResultTb.FileUploadError(msg)
+                        raise CopyResult.FileUploadError(msg)
                 except Exception as exc:
-                    if isinstance(exc, (CopyResultTb.FileUploadError, RuntimeError)):
+                    if isinstance(exc, (CopyResult.FileUploadError, RuntimeError)):
                         msg = "Error uploading file"
                     else:
                         msg = "Unexpected error occurred copying tar ball remotely"
@@ -204,13 +198,6 @@ def execute(self, single_threaded: bool, delete: bool = True) -> int:
     is_flag=True,
     help="Use single threaded compression with 'xz'",
 )
-@click.option(
-    "--show-server",
-    help=(
-        "Display information about the pbench server where the result(s) will"
-        " be moved (Not implemented)"
-    ),
-)
 @pass_cli_context
 def main(
     context: CliContext,
@@ -220,7 +207,8 @@ def main(
     delete: bool,
     metadata: List,
     xz_single_threaded: bool,
-    show_server: str,
+    server: str,
+    relay: str,
 ):
     """Move result directories to the configured Pbench server."""
     clk_ctx = click.get_current_context()
@@ -237,19 +225,23 @@ def main(
                 err=True,
             )
             clk_ctx.exit(1)
+
+    if relay and server:
+        click.echo("Cannot use both relay and Pbench Server destination.", err=True)
+        clk_ctx.exit(2)
+
     if validate_hostname(controller) != 0:
         # We check once to avoid having to deal with a bad controller each
         # time we try to copy the results.
         click.echo(f"Controller, {controller!r}, is not a valid host name")
         clk_ctx.exit(1)
-    context.controller = controller
 
+    context.controller = controller
     context.access = access
     context.token = token
     context.metadata = metadata
-
-    if show_server:
-        click.echo("WARNING -- Option '--show-server' is not implemented", err=True)
+    context.server = server
+    context.relay = relay
 
     try:
         rv = MoveResults(context).execute(xz_single_threaded, delete=delete)
diff --git a/lib/pbench/cli/agent/commands/results/push.py b/lib/pbench/cli/agent/commands/results/push.py
index 186405ad07..2e27cf297d 100644
--- a/lib/pbench/cli/agent/commands/results/push.py
+++ b/lib/pbench/cli/agent/commands/results/push.py
@@ -6,7 +6,7 @@
 import requests
 
 from pbench.agent.base import BaseCommand
-from pbench.agent.results import CopyResultTb
+from pbench.agent.results import CopyResult
 from pbench.cli import CliContext, pass_cli_context, sort_click_command_parameters
 from pbench.cli.agent.commands.results.results_options import results_common_options
 from pbench.cli.agent.options import common_options
@@ -18,17 +18,13 @@ def __init__(self, context: CliContext):
         super().__init__(context)
 
     def execute(self) -> int:
-        tarball_len, tarball_md5 = md5sum(self.context.result_tb_name)
-        crt = CopyResultTb(
-            self.context.result_tb_name,
-            tarball_len,
-            tarball_md5,
-            self.config,
-            self.logger,
-        )
-        res = crt.copy_result_tb(
-            self.context.token, self.context.access, self.context.metadata
-        )
+        tarball = Path(self.context.result_tb_name)
+        _, tarball_md5 = md5sum(tarball)
+        crt = CopyResult.cli_create(self.context, self.config, self.logger)
+        res = crt.push(tarball, tarball_md5)
+
+        if res.ok and self.context.relay:
+            click.echo(f"RELAY {tarball.name}: {res.url}")
 
         # success
         if res.status_code == HTTPStatus.CREATED:
@@ -73,6 +69,8 @@ def main(
     token: str,
     access: str,
     metadata: List,
+    server: str,
+    relay: str,
 ):
     """Push a result tar ball to the configured Pbench server.
 
@@ -83,10 +81,18 @@ def main(
     the backslash-escaped letters are formatting directives; this
     parenthetical text will not appear in the help output.)
     """
+    clk_ctx = click.get_current_context()
+
     context.result_tb_name = result_tb_name
     context.token = token
     context.access = access
     context.metadata = metadata
+    context.server = server
+    context.relay = relay
+
+    if relay and server:
+        click.echo("Cannot use both relay and Pbench Server destination.", err=True)
+        clk_ctx.exit(2)
 
     try:
         rv = ResultsPush(context).execute()
diff --git a/lib/pbench/cli/agent/commands/results/results_options.py b/lib/pbench/cli/agent/commands/results/results_options.py
index 43d87487c8..187456f033 100644
--- a/lib/pbench/cli/agent/commands/results/results_options.py
+++ b/lib/pbench/cli/agent/commands/results/results_options.py
@@ -6,6 +6,11 @@
 def results_common_options(f):
     """Common options for results command"""
 
+    def server_token_required(ctx, param, value):
+        if not ctx.params.get("relay") and value is None:
+            raise click.BadParameter("Pbench Server connection requires '--token'")
+        return value
+
     options = [
         click.option(
             "-a",
@@ -27,11 +32,20 @@ def results_common_options(f):
                 " Format: key:value"
             ),
         ),
+        click.option(
+            "--server",
+            help=("Specify the Pbench Server 1.0 host as https://host[:port]"),
+        ),
+        click.option(
+            "--relay",
+            help=("Specify a relay server host as http[s]://host[:port]"),
+        ),
         click.option(
             "--token",
-            required=True,
+            required=False,
             envvar="PBENCH_ACCESS_TOKEN",
             prompt=False,
+            callback=server_token_required,
             help="pbench server authentication token",
         ),
     ]
diff --git a/lib/pbench/test/unit/agent/task/test_copy_result_tb.py b/lib/pbench/test/unit/agent/task/test_copy_result_tb.py
index 8137b1c15f..0ba29f0c9c 100644
--- a/lib/pbench/test/unit/agent/task/test_copy_result_tb.py
+++ b/lib/pbench/test/unit/agent/task/test_copy_result_tb.py
@@ -1,5 +1,7 @@
+import hashlib
 from http import HTTPStatus
 import io
+import json
 import os
 from pathlib import Path
 from typing import Callable
@@ -9,17 +11,17 @@
 import responses
 
 from pbench.agent import PbenchAgentConfig
-from pbench.agent.results import CopyResultTb
+from pbench.agent.results import CopyResult, CopyResultToRelay, CopyResultToServer
 
 
 class TestCopyResults:
     @pytest.fixture(autouse=True)
     def config(self):
         # Setup the configuration
-        self.config = PbenchAgentConfig(os.environ["_PBENCH_AGENT_CONFIG"])
+        TestCopyResults.config = PbenchAgentConfig(os.environ["_PBENCH_AGENT_CONFIG"])
         yield
         # Teardown the setup
-        self.config = None
+        TestCopyResults.config = None
 
     @staticmethod
     def get_path_exists_mock(path: str, result: bool) -> Callable:
@@ -48,23 +50,25 @@ def test_tarball_nonexistent(self, monkeypatch, agent_logger):
             )
 
             with pytest.raises(FileNotFoundError) as excinfo:
-                CopyResultTb(
-                    bad_tarball_name,
-                    0,
-                    "ignoremd5",
+                CopyResultToServer(
                     self.config,
                     agent_logger,
-                )
+                    "http://example.com",
+                    "token",
+                    "private",
+                    None,
+                ).push(Path(bad_tarball_name), "ignoremd5")
 
         assert str(excinfo.value).endswith(
             expected_error_message
         ), f"expected='...{expected_error_message}', found='{str(excinfo.value)}'"
 
     @responses.activate
+    @pytest.mark.parametrize("server", (None, "http://test.foo.example.com"))
     @pytest.mark.parametrize("access", ("public", "private", None))
-    def test_with_access(self, access: str, monkeypatch, agent_logger):
+    def test_with_access(self, monkeypatch, agent_logger, server: str, access: str):
         tb_name = "test_tarball.tar.xz"
-        tb_contents = "I'm a result!"
+        tb_contents = b"I'm a result!"
 
         def request_callback(request: requests.Request):
             if access is None:
@@ -74,29 +78,22 @@ def request_callback(request: requests.Request):
                 assert request.params["access"] == access
             return HTTPStatus.CREATED, {}, ""
 
+        api = self.config.get("results", "rest_endpoint")
+        rest_uri = self.config.get("results", "server_rest_url")
+        mock_uri = f"{server}/{api}" if server else rest_uri
         responses.add_callback(
-            responses.PUT,
-            f"{self.config.get('results', 'server_rest_url')}/upload/{tb_name}",
-            callback=request_callback,
+            responses.PUT, f"{mock_uri}/upload/{tb_name}", callback=request_callback
         )
 
         with monkeypatch.context() as m:
             m.setattr(Path, "exists", self.get_path_exists_mock(tb_name, True))
             m.setattr(
-                Path, "open", self.get_path_open_mock(tb_name, io.StringIO(tb_contents))
+                Path, "open", self.get_path_open_mock(tb_name, io.BytesIO(tb_contents))
             )
 
-            crt = CopyResultTb(
-                tb_name,
-                len(tb_contents),
-                "someMD5",
-                self.config,
-                agent_logger,
-            )
-            if access is None:
-                res = crt.copy_result_tb("token")
-            else:
-                res = crt.copy_result_tb("token", access)
+            res = CopyResultToServer(
+                self.config, agent_logger, server, None, access, None
+            ).push(Path(tb_name), "someMD5")
 
         assert res.status_code == HTTPStatus.CREATED
 
@@ -107,7 +104,6 @@ def request_callback(request: requests.Request):
     def test_with_metadata(self, metadata, monkeypatch, agent_logger):
         tb_name = "test_tarball.tar.xz"
         tb_contents = "I'm a result!"
-        access = "private"
 
         def request_callback(request: requests.Request):
             if metadata:
@@ -117,10 +113,9 @@ def request_callback(request: requests.Request):
                 assert "metadata" not in request.params
             return HTTPStatus.CREATED, {}, ""
 
+        uri = self.config.get("results", "server_rest_url")
         responses.add_callback(
-            responses.PUT,
-            f"{self.config.get('results', 'server_rest_url')}/upload/{tb_name}",
-            callback=request_callback,
+            responses.PUT, f"{uri}/upload/{tb_name}", callback=request_callback
         )
 
         with monkeypatch.context() as m:
@@ -129,17 +124,56 @@ def request_callback(request: requests.Request):
                 Path, "open", self.get_path_open_mock(tb_name, io.StringIO(tb_contents))
             )
 
-            crt = CopyResultTb(
-                tb_name,
-                len(tb_contents),
-                "someMD5",
-                self.config,
-                agent_logger,
+            res = CopyResultToServer(
+                self.config, agent_logger, None, "token", "private", metadata
+            ).push(Path(tb_name), "someMD5")
+
+        assert res.status_code == HTTPStatus.CREATED
+
+    @responses.activate
+    @pytest.mark.parametrize("access", ("public", "private", None))
+    def test_relay(self, access: str, monkeypatch, agent_logger):
+        tb_name = "test_tarball.tar.xz"
+        tb_contents = b"I'm a result!"
+        metadata = ["dataset.name:foo", "global.server:FOO"]
+        sha256 = hashlib.sha256(tb_contents, usedforsecurity=False).hexdigest()
+        md5 = hashlib.md5(tb_contents, usedforsecurity=False).hexdigest()
+        uri = "http://relay.example.com"
+
+        manifest = {
+            "metadata": metadata,
+            "name": tb_name,
+            "uri": f"{uri}/{sha256}",
+            "md5": md5,
+        }
+        if access:
+            manifest["access"] = access
+
+        serialized = bytes(json.dumps(manifest, sort_keys=True), encoding="utf-8")
+        man_sha256 = hashlib.sha256(serialized, usedforsecurity=False).hexdigest()
+
+        def man_callback(request: requests.PreparedRequest):
+            assert json.load(fp=request.body) == manifest
+            return HTTPStatus.CREATED, {}, ""
+
+        def tar_callback(request: requests.PreparedRequest):
+            assert request.headers["content-length"] == str(len(tb_contents))
+            return HTTPStatus.CREATED, {}, ""
+
+        responses.add_callback(
+            responses.PUT, f"{uri}/{man_sha256}", callback=man_callback
+        )
+        responses.add_callback(responses.PUT, f"{uri}/{sha256}", callback=tar_callback)
+
+        with monkeypatch.context() as m:
+            m.setattr(Path, "exists", self.get_path_exists_mock(tb_name, True))
+            m.setattr(
+                Path, "open", self.get_path_open_mock(tb_name, io.BytesIO(tb_contents))
+            )
+
+            res = CopyResultToRelay(agent_logger, uri, access, metadata).push(
+                Path(tb_name), md5
             )
-            if metadata is None:
-                res = crt.copy_result_tb("token")
-            else:
-                res = crt.copy_result_tb("token", access, metadata)
 
         assert res.status_code == HTTPStatus.CREATED
 
@@ -147,7 +181,8 @@ def request_callback(request: requests.Request):
     def test_connection_error(self, monkeypatch, agent_logger):
         tb_name = "test_tarball.tar.xz"
         tb_contents = "I'm a result!"
-        upload_url = f"{self.config.get('results', 'server_rest_url')}/upload/{tb_name}"
+        uri = self.config.get("results", "server_rest_url")
+        upload_url = f"{uri}/upload/{tb_name}"
         expected_error_message = f"Cannot connect to '{upload_url}'"
         responses.add(
             responses.PUT, upload_url, body=requests.exceptions.ConnectionError("uh-oh")
@@ -160,14 +195,9 @@ def test_connection_error(self, monkeypatch, agent_logger):
             )
 
             with pytest.raises(RuntimeError) as excinfo:
-                crt = CopyResultTb(
-                    tb_name,
-                    len(tb_contents),
-                    "someMD5",
-                    self.config,
-                    agent_logger,
-                )
-                crt.copy_result_tb("token")
+                CopyResultToServer(
+                    self.config, agent_logger, None, None, None, None
+                ).push(Path(tb_name), "someMD5")
 
         assert str(excinfo.value).startswith(
             expected_error_message
@@ -177,7 +207,8 @@ def test_connection_error(self, monkeypatch, agent_logger):
     def test_unexpected_error(self, monkeypatch, agent_logger):
         tb_name = "test_tarball.tar.xz"
         tb_contents = "I'm a result!"
-        upload_url = f"{self.config.get('results', 'server_rest_url')}/upload/{tb_name}"
+        uri = self.config.get("results", "server_rest_url")
+        upload_url = f"{uri}/upload/{tb_name}"
 
         responses.add(responses.PUT, upload_url, body=RuntimeError("uh-oh"))
 
@@ -187,14 +218,9 @@ def test_unexpected_error(self, monkeypatch, agent_logger):
                 Path, "open", self.get_path_open_mock(tb_name, io.StringIO(tb_contents))
             )
 
-            with pytest.raises(CopyResultTb.FileUploadError) as excinfo:
-                crt = CopyResultTb(
-                    tb_name,
-                    len(tb_contents),
-                    "someMD5",
-                    self.config,
-                    agent_logger,
-                )
-                crt.copy_result_tb("token")
+            with pytest.raises(CopyResult.FileUploadError) as excinfo:
+                CopyResultToServer(
+                    self.config, agent_logger, None, None, None, None
+                ).push(Path(tb_name), "someMD5")
 
-        assert "something wrong" in str(excinfo.value)
+        assert f"{upload_url!r} failed:" in str(excinfo.value)
diff --git a/lib/pbench/test/unit/agent/task/test_results_move.py b/lib/pbench/test/unit/agent/task/test_results_move.py
index 28a98738de..51f5c1095c 100644
--- a/lib/pbench/test/unit/agent/task/test_results_move.py
+++ b/lib/pbench/test/unit/agent/task/test_results_move.py
@@ -1,5 +1,7 @@
 import datetime
+import json
 import logging
+import re
 
 from click.testing import CliRunner
 import responses
@@ -43,11 +45,13 @@ class TestMoveResults:
     DELY_SWITCH = "--delete"
     DELN_SWITCH = "--no-delete"
     XZST_SWITCH = "--xz-single-threaded"
-    SWSR_SWITCH = "--show-server"
+    RELAY_SWITCH = "--relay"
+    SRVR_SWITCH = "--server"
     CTRL_TEXT = "ctrl"
     TOKN_TEXT = "what is a token but 139 characters of gibberish"
     ACCESS_TEXT = "private"
-    SWSR_TEXT = None
+    RELAY_TEXT = "http://relay.example.com"
+    SRVR_TEXT = "http://pbench.test.example.com"
     META_SWITCH = "--metadata"
     META_TEXT_FOO = "pbench.sat:FOO"
     META_TEXT_TEST = "pbench.test:TEST"
@@ -78,8 +82,8 @@ def test_args():
                 TestMoveResults.TOKN_TEXT,
                 TestMoveResults.DELY_SWITCH,
                 TestMoveResults.XZST_SWITCH,
-                TestMoveResults.SWSR_SWITCH,
-                TestMoveResults.SWSR_TEXT,
+                TestMoveResults.SRVR_SWITCH,
+                TestMoveResults.SRVR_TEXT,
                 TestMoveResults.ACCESS_SWITCH,
                 TestMoveResults.ACCESS_TEXT,
             ],
@@ -108,8 +112,6 @@ def test_metadata_args():
                 TestMoveResults.TOKN_TEXT,
                 TestMoveResults.DELY_SWITCH,
                 TestMoveResults.XZST_SWITCH,
-                TestMoveResults.SWSR_SWITCH,
-                TestMoveResults.SWSR_TEXT,
                 TestMoveResults.ACCESS_SWITCH,
                 TestMoveResults.ACCESS_TEXT,
                 TestMoveResults.META_SWITCH,
@@ -122,6 +124,29 @@ def test_metadata_args():
         ), f"Expected exit code of 2: exit_code = {result.exit_code:d}, stderr: {result.stderr}, stdout: {result.stdout}"
         assert "Error: Got unexpected extra argument (pbench.sat:FOO)" in result.stderr
 
+    @staticmethod
+    @responses.activate
+    def test_server_relay():
+        """Test metadata with conflicting server and relay"""
+        runner = CliRunner(mix_stderr=False)
+        result = runner.invoke(
+            main,
+            args=[
+                TestMoveResults.CTRL_SWITCH,
+                TestMoveResults.CTRL_TEXT,
+                TestMoveResults.DELY_SWITCH,
+                TestMoveResults.XZST_SWITCH,
+                TestMoveResults.SRVR_SWITCH,
+                TestMoveResults.SRVR_TEXT,
+                TestMoveResults.RELAY_SWITCH,
+                TestMoveResults.RELAY_TEXT,
+            ],
+        )
+        assert (
+            result.exit_code == 2
+        ), f"Expected exit code of 2: exit_code = {result.exit_code:d}, stderr: {result.stderr}, stdout: {result.stdout}"
+        assert "Cannot use both relay and Pbench Server destination." in result.stderr
+
     @staticmethod
     @responses.activate
     def test_multiple_metadata_args():
@@ -136,8 +161,6 @@ def test_multiple_metadata_args():
                 TestMoveResults.TOKN_TEXT,
                 TestMoveResults.DELY_SWITCH,
                 TestMoveResults.XZST_SWITCH,
-                TestMoveResults.SWSR_SWITCH,
-                TestMoveResults.SWSR_TEXT,
                 TestMoveResults.ACCESS_SWITCH,
                 TestMoveResults.ACCESS_TEXT,
                 TestMoveResults.META_SWITCH,
@@ -178,12 +201,6 @@ def test_results_move(monkeypatch, caplog, setup):
 
         caplog.set_level(logging.DEBUG)
 
-        responses.add(
-            responses.GET,
-            "http://pbench.example.com/api/v1/host_info",
-            status=200,
-            body="pbench@pbench-server:/srv/pbench/pbench-move-results-receive/fs-version-002",
-        )
         responses.add(
             responses.PUT,
             f"http://pbench.example.com/api/v1/upload/{script}_{config}_{date}.tar.xz",
@@ -250,3 +267,128 @@ def test_results_move(monkeypatch, caplog, setup):
             result.stdout
             == "Status: total # of result directories considered 1, successfully moved 1, encountered 0 failures\n"
         )
+
+    @staticmethod
+    @responses.activate
+    def test_results_move_server(monkeypatch, caplog, setup):
+        monkeypatch.setenv("_pbench_full_hostname", "localhost")
+        monkeypatch.setattr(datetime, "datetime", MockDatetime)
+
+        # In order for a pbench tar ball to be moved/copied to a pbench-server
+        # the run directory has to have one file in it, a "metadata.log" file.
+        # We make a run directory and populate it with our test specific
+        # information.
+        pbrun = setup["tmp"] / "var" / "lib" / "pbench-agent"
+        script = "pbench-user-benchmark"
+        config = "test-results-move"
+        date = "YYYY.MM.DDTHH.MM.SS"
+        name = f"{script}_{config}_{date}"
+        res_dir = pbrun / name
+        res_dir.mkdir(parents=True, exist_ok=True)
+        mlog = res_dir / "metadata.log"
+        mlog.write_text(mdlog_tmpl.format(**locals()))
+
+        caplog.set_level(logging.DEBUG)
+
+        responses.add(
+            responses.PUT,
+            f"{TestMoveResults.SRVR_TEXT}/api/v1/upload/{script}_{config}_{date}.tar.xz",
+            status=200,
+        )
+
+        runner = CliRunner(mix_stderr=False)
+
+        # Test --no-delete
+        result = runner.invoke(
+            main,
+            args=[
+                TestMoveResults.CTRL_SWITCH,
+                TestMoveResults.CTRL_TEXT,
+                TestMoveResults.TOKN_SWITCH,
+                TestMoveResults.TOKN_TEXT,
+                TestMoveResults.DELN_SWITCH,
+                TestMoveResults.SRVR_SWITCH,
+                TestMoveResults.SRVR_TEXT,
+            ],
+        )
+        assert (
+            result.exit_code == 0
+        ), f"Expected a successful operation, exit_code = {result.exit_code:d}, stderr: {result.stderr}, stdout: {result.stdout}"
+        assert (
+            result.stdout
+            == "Status: total # of result directories considered 1, successfully copied 1, encountered 0 failures\n"
+        )
+        # This should raise an unexpected exception if it was not created.
+        (pbrun / f"{name}.copied").unlink()
+
+    @staticmethod
+    @responses.activate
+    def test_results_move_relay(monkeypatch, caplog, setup):
+        monkeypatch.setenv("_pbench_full_hostname", "localhost")
+        monkeypatch.setattr(datetime, "datetime", MockDatetime)
+
+        # In order for a pbench tar ball to be moved/copied to a pbench-server
+        # the run directory has to have one file in it, a "metadata.log" file.
+        # We make a run directory and populate it with our test specific
+        # information.
+        pbrun = setup["tmp"] / "var" / "lib" / "pbench-agent"
+        script = "pbench-user-benchmark"
+        config = "test-results-move"
+        date = "YYYY.MM.DDTHH.MM.SS"
+        name = f"{script}_{config}_{date}"
+        res_dir = pbrun / name
+        res_dir.mkdir(parents=True, exist_ok=True)
+        mlog = res_dir / "metadata.log"
+        mlog.write_text(mdlog_tmpl.format(**locals()))
+
+        caplog.set_level(logging.DEBUG)
+
+        responses.add(
+            responses.PUT, re.compile(f"{TestMoveResults.RELAY_TEXT}/[a-z0-9]+")
+        )
+
+        runner = CliRunner(mix_stderr=False)
+
+        # Test --no-delete
+        result = runner.invoke(
+            main,
+            args=[
+                TestMoveResults.CTRL_SWITCH,
+                TestMoveResults.CTRL_TEXT,
+                TestMoveResults.DELN_SWITCH,
+                TestMoveResults.RELAY_SWITCH,
+                TestMoveResults.RELAY_TEXT,
+            ],
+        )
+
+        # We expect two PUT calls using the relay base URI: a JSON manifest
+        # object followed by the tarball. Responses stores "calls" in reverse
+        # order. While we can effect random access by searching for URIs, we
+        # can't easily know either SHA256 as the tarball and manifest are both
+        # generated internally. Instead, we traverse the list of calls in
+        # reversed order, expecting the first to resolve to a JSON file and the
+        # second to provide a URL corresponding to the tarball, which we assert
+        # must appear in the manifest "uri" field.
+        manifest = {}
+        uris = []
+        assert len(responses.calls) == 2
+        for c in reversed(responses.calls):
+            if not manifest:
+                manifest.update(json.load(c.request.body))
+            else:
+                uris.append(c.request.url)
+
+        assert manifest["uri"] == uris[0]
+        assert manifest["name"] == f"{script}_{config}_{date}.tar.xz"
+        assert (
+            result.exit_code == 0
+        ), f"Expected a successful operation, exit_code = {result.exit_code:d}, stderr: {result.stderr}, stdout: {result.stdout}"
+        assert re.match(
+            (
+                r"RELAY pbench-user-benchmark_test-results-move_YYYY.MM.DDTHH.MM.SS.tar.xz: http://relay.example.com/[a-z0-9]+\n"
+                "Status: total # of result directories considered 1, successfully copied 1, encountered 0 failures\n"
+            ),
+            result.stdout,
+        )
+        # This should raise an unexpected exception if it was not created.
+        (pbrun / f"{name}.copied").unlink()
diff --git a/lib/pbench/test/unit/agent/task/test_results_push.py b/lib/pbench/test/unit/agent/task/test_results_push.py
index ec8a06a9f7..636acbed4f 100644
--- a/lib/pbench/test/unit/agent/task/test_results_push.py
+++ b/lib/pbench/test/unit/agent/task/test_results_push.py
@@ -1,5 +1,6 @@
 from http import HTTPStatus
 import os
+import re
 from typing import Dict, Optional, Union
 
 from click.testing import CliRunner
@@ -21,10 +22,14 @@ class TestResultsPush:
     META_SWITCH = "--metadata"
     META_TEXT_FOO = "pbench.sat:FOO"
     META_TEXT_TEST = "pbench.test:TEST"
+    RELAY_SWITCH = "--relay"
+    SRVR_SWITCH = "--server"
+    RELAY_TEXT = "http://relay.example.com"
+    SRVR_TEXT = "http://pbench.test.example.com"
     URL = "http://pbench.example.com/api/v1"
 
     @staticmethod
-    def add_http_mock_response(
+    def add_server_mock_response(
         status_code: HTTPStatus = HTTPStatus.CREATED,
         message: Optional[Union[str, Dict, Exception]] = None,
     ):
@@ -43,6 +48,25 @@ def add_http_mock_response(
             **parms,
         )
 
+    @staticmethod
+    @pytest.fixture
+    def relay_mock(
+        status_code: HTTPStatus = HTTPStatus.CREATED,
+        error: Optional[Exception] = None,
+    ):
+        parms = {}
+        if status_code:
+            parms["status"] = status_code
+
+        if error:
+            parms["body"] = error
+
+        responses.add(
+            responses.PUT,
+            re.compile(f"{TestResultsPush.RELAY_TEXT}/[a-f0-9]+"),
+            **parms,
+        )
+
     @staticmethod
     @responses.activate
     def test_help():
@@ -84,6 +108,40 @@ def test_bad_arg():
             "File 'nothing.tar.xz' does not exist." in result.stderr
         )
 
+    @staticmethod
+    @responses.activate
+    def test_server_and_relay():
+        runner = CliRunner(mix_stderr=False)
+        result = runner.invoke(
+            main,
+            args=[
+                TestResultsPush.SRVR_SWITCH,
+                TestResultsPush.SRVR_TEXT,
+                TestResultsPush.TOKN_SWITCH,
+                TestResultsPush.TOKN_TEXT,
+                TestResultsPush.RELAY_SWITCH,
+                TestResultsPush.RELAY_TEXT,
+                tarball,
+            ],
+        )
+        assert result.exit_code == 2
+        assert "Cannot use both relay and Pbench Server destination." in result.stderr
+
+    @staticmethod
+    @responses.activate
+    def test_relay(relay_mock):
+        runner = CliRunner(mix_stderr=False)
+        result = runner.invoke(
+            main,
+            args=[
+                TestResultsPush.RELAY_SWITCH,
+                TestResultsPush.RELAY_TEXT,
+                tarball,
+            ],
+        )
+        assert result.exit_code == 0
+        assert "RELAY log.tar.xz: http://relay.example.com/" in result.stdout
+
     @staticmethod
     @responses.activate
     def test_meta_args():
@@ -130,7 +188,7 @@ def test_extra_arg():
     def test_multiple_meta_args_single_option():
         """Test normal operation when all arguments and options are specified"""
 
-        TestResultsPush.add_http_mock_response()
+        TestResultsPush.add_server_mock_response()
         runner = CliRunner(mix_stderr=False)
         result = runner.invoke(
             main,
@@ -152,7 +210,7 @@ def test_multiple_meta_args_single_option():
     def test_multiple_meta_args():
         """Test normal operation when all arguments and options are specified"""
 
-        TestResultsPush.add_http_mock_response()
+        TestResultsPush.add_server_mock_response()
         runner = CliRunner(mix_stderr=False)
         result = runner.invoke(
             main,
@@ -179,7 +237,7 @@ def test_token_omitted():
         runner = CliRunner(mix_stderr=False)
         result = runner.invoke(main, args=[tarball])
         assert result.exit_code == 2, result.stderr
-        assert "Missing option '--token'" in str(result.stderr)
+        assert "Pbench Server connection requires '--token'" in str(result.stderr)
 
     @staticmethod
     @responses.activate
@@ -187,7 +245,7 @@ def test_token_envar(monkeypatch):
         """Test normal operation with the token in an environment variable"""
 
         monkeypatch.setenv("PBENCH_ACCESS_TOKEN", TestResultsPush.TOKN_TEXT)
-        TestResultsPush.add_http_mock_response()
+        TestResultsPush.add_server_mock_response()
         runner = CliRunner(mix_stderr=False)
         result = runner.invoke(main, args=[tarball])
         assert result.exit_code == 0, result.stderr
@@ -237,7 +295,7 @@ def test_access_error(monkeypatch):
     def test_push_status(status_code, message, exit_code):
         """Test normal operation when all arguments and options are specified"""
 
-        TestResultsPush.add_http_mock_response(status_code, message)
+        TestResultsPush.add_server_mock_response(status_code, message)
         runner = CliRunner(mix_stderr=False)
         result = runner.invoke(
             main,