diff --git a/ogscm/cli_args.py b/ogscm/cli_args.py
index 5d70bd4e93dcf7e00253dcf53a212f64627d9cba..54e99fb4f07c5b34ba54b0e4ee4de72fc0e02160 100644
--- a/ogscm/cli_args.py
+++ b/ogscm/cli_args.py
@@ -92,6 +92,11 @@ class Cli_Args(argparse.ArgumentParser):
             default='registry.opengeosys.org/ogs/ogs',
             help='The docker registry the image is tagged and '
             'uploaded to.')
+        build_g.add_argument(
+            '--tag',
+            type=str,
+            default='',
+            help='The full docker image tag. Overwrites --registry.')
         build_g.add_argument('--convert',
                              '-C',
                              dest='convert',
diff --git a/ogscm/container_info.py b/ogscm/container_info.py
index ae0db9eed685af644cac6b8ef8705ffd3ca8b49c..f9e865b72155a0f56938e18abc346d28f588a93f 100644
--- a/ogscm/container_info.py
+++ b/ogscm/container_info.py
@@ -101,13 +101,13 @@ class container_info():
             self.img_file += f'-cmake-{cmake_args_hash_short}'
         if args.gui:
             self.img_file += '-gui'
-        if args.docs:
-            self.img_file += '-docs'
         if ogs_version != 'off' and not args.runtime_only:
             self.img_file += '-dev'
-        docker_repo = self.img_file
 
-        self.tag = f"{args.registry}/{docker_repo}:latest"
+        if args.tag != '':
+            self.tag = args.tag
+        else:
+            self.tag = f"{args.registry}/{self.img_file}:latest"
 
         if os.path.isdir(ogs_version):
             self.ogsdir = True