diff --git a/releasenotes/notes/deprecate-overcloud-container-prepare-45b61e76072b2736.yaml b/releasenotes/notes/deprecate-overcloud-container-prepare-45b61e76072b2736.yaml
new file mode 100644
index 000000000..06eaa519e
--- /dev/null
+++ b/releasenotes/notes/deprecate-overcloud-container-prepare-45b61e76072b2736.yaml
@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    `openstack overcloud container image prepare` has been
+    deprecated and replaced by `openstack tripleo container image prepare`
+  - |
+    `openstack overcloud container image tag discover` has been
+    deprecated and replaced by `openstack tripleo container image prepare`
diff --git a/tripleoclient/v1/container_image.py b/tripleoclient/v1/container_image.py
index c791e9596..47d4ec1fa 100644
--- a/tripleoclient/v1/container_image.py
+++ b/tripleoclient/v1/container_image.py
@@ -405,6 +405,9 @@ class PrepareImageFiles(command.Command):
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
+        self.log.warning("[DEPRECATED] This command has been deprecated and "
+                         "replaced by the 'openstack tripleo container image "
+                         "prepare' command.")
 
         roles_data = utils.fetch_roles_file(parsed_args.roles_file) or set()
 
@@ -501,6 +504,9 @@ class DiscoverImageTag(command.Command):
 
     def take_action(self, parsed_args):
         self.log.debug("take_action(%s)" % parsed_args)
+        self.log.warning("[DEPRECATED] This command has been deprecated and "
+                         "replaced by the 'openstack tripleo container image "
+                         "prepare' command.")
 
         uploader = image_uploader.ImageUploadManager([])
         print(uploader.discover_image_tag(