diff --git a/endpoints/api/tag.py b/endpoints/api/tag.py
index 8c3516399..7b1f8c8cc 100644
--- a/endpoints/api/tag.py
+++ b/endpoints/api/tag.py
@@ -160,15 +160,30 @@ class RepositoryTag(RepositoryParamResource):
       else:
         raise InvalidRequest('Could not update tag expiration; Tag has probably changed')
 
-    if 'image' in request.get_json():
+    if 'image' in request.get_json() or 'manifest_digest' in request.get_json():
       existing_tag = registry_model.get_repo_tag(repo_ref, tag, include_legacy_image=True)
 
-      image_id = request.get_json()['image']
-      image = registry_model.get_legacy_image(repo_ref, image_id)
-      if image is None:
+      manifest_or_image = None
+      image_id = None
+      manifest_digest = None
+
+      if 'image' in request.get_json():
+        image_id = request.get_json()['image']
+        manifest_or_image = registry_model.get_legacy_image(repo_ref, image_id)
+      else:
+        manifest_digest = request.get_json()['manifest_digest']
+        manifest_or_image = registry_model.lookup_manifest_by_digest(repo_ref, manifest_digest)
+
+      if manifest_or_image is None:
         raise NotFound()
 
-      if not registry_model.retarget_tag(repo_ref, tag, image, storage):
+      # TODO(jschorr): Remove this check once fully on V22
+      existing_manifest_digest = None
+      if existing_tag:
+        existing_manifest = registry_model.get_manifest_for_tag(existing_tag)
+        existing_manifest_digest = existing_manifest.digest if existing_manifest else None
+
+      if not registry_model.retarget_tag(repo_ref, tag, manifest_or_image, storage):
         raise InvalidRequest('Could not move tag')
 
       username = get_authenticated_user().username
@@ -179,7 +194,11 @@ class RepositoryTag(RepositoryParamResource):
         'tag': tag,
         'namespace': namespace,
         'image': image_id,
-        'original_image': existing_tag.legacy_image.docker_image_id if existing_tag else None,
+        'manifest_digest': manifest_digest,
+        'original_image': (existing_tag.legacy_image.docker_image_id
+                           if existing_tag and existing_tag.legacy_image_if_present
+                           else None),
+        'original_manifest_digest': existing_manifest_digest,
       }, repo_name=repository)
 
     return 'Updated', 201
diff --git a/static/directives/tag-operations-dialog.html b/static/directives/tag-operations-dialog.html
index ba17c3c6f..f9a2562e8 100644
--- a/static/directives/tag-operations-dialog.html
+++ b/static/directives/tag-operations-dialog.html
@@ -47,9 +47,9 @@
         <div class="modal-header">
           <button type="button" class="close" data-dismiss="modal"
                   aria-hidden="true" ng-show="!addingTag">&times;</button>
-          <h4 class="modal-title">{{ isAnotherImageTag(toTagImage, tagToCreate) ? 'Move' : 'Add' }} Tag to Image {{ toTagImage.substr(0, 12) }}</h4>
+          <h4 class="modal-title">{{ isAnotherImageTag(toTagImage, tagToCreate) ? 'Move' : 'Add' }} Tag to {{ toTagManifestDigest ? ('Manifest ' + toTagManifestDigest.substr(0, 19)) : ('Image ' + toTagImage.substr(0, 12)) }}</h4>
         </div>
-        <form name="addTagForm" ng-submit="createOrMoveTag(toTagImage, tagToCreate);">
+        <form name="addTagForm" ng-submit="createOrMoveTag(toTagImage, tagToCreate, toTagManifestDigest);">
           <div class="modal-body">
             <div class="cor-loader" ng-show="addingTag"></div>
             <div ng-show="!addingTag">
diff --git a/static/js/directives/repo-view/repo-panel-tags.js b/static/js/directives/repo-view/repo-panel-tags.js
index bada3dc2e..80b817ffa 100644
--- a/static/js/directives/repo-view/repo-panel-tags.js
+++ b/static/js/directives/repo-view/repo-panel-tags.js
@@ -92,6 +92,10 @@ angular.module('quay').directive('repoPanelTags', function () {
         var imageIndexMap = {};
         for (var i = 0; i < ordered.length; ++i) {
           var tagInfo = ordered[i];
+          if (!tagInfo.image_id) {
+            continue;
+          }
+
           if (!imageMap[tagInfo.image_id]) {
             imageMap[tagInfo.image_id] = [];
             imageIDs.push(tagInfo.image_id)
@@ -360,7 +364,7 @@ angular.module('quay').directive('repoPanelTags', function () {
       };
 
       $scope.askAddTag = function(tag) {
-        $scope.tagActionHandler.askAddTag(tag.image_id);
+        $scope.tagActionHandler.askAddTag(tag.image_id, tag.manifest_digest);
       };
 
       $scope.showLabelEditor = function(tag) {
diff --git a/static/js/directives/ui/tag-operations-dialog.js b/static/js/directives/ui/tag-operations-dialog.js
index e437297ae..dfd51289e 100644
--- a/static/js/directives/ui/tag-operations-dialog.js
+++ b/static/js/directives/ui/tag-operations-dialog.js
@@ -84,7 +84,7 @@ angular.module('quay').directive('tagOperationsDialog', function () {
         return found.image_id == image;
       };
 
-      $scope.createOrMoveTag = function(image, tag) {
+      $scope.createOrMoveTag = function(image, tag, opt_manifest_digest) {
         if (!$scope.repository.can_write) { return; }
         if ($scope.alertOnTagOpsDisabled()) {
           return;
@@ -97,9 +97,14 @@ angular.module('quay').directive('tagOperationsDialog', function () {
           'tag': tag
         };
 
-        var data = {
-          'image': image
-        };
+        var data = {};
+        if (image) {
+          data['image'] = image;
+        }
+
+        if (opt_manifest_digest) {
+          data['manifest_digest'] = opt_manifest_digest;
+        }
 
         var errorHandler = ApiService.errorDisplay('Cannot create or move tag', function(resp) {
           $element.find('#createOrMoveTagModal').modal('hide');
@@ -330,13 +335,14 @@ angular.module('quay').directive('tagOperationsDialog', function () {
           };
         },
 
-        'askAddTag': function(image) {
+        'askAddTag': function(image, opt_manifest_digest) {
           if ($scope.alertOnTagOpsDisabled()) {
             return;
           }
 
           $scope.tagToCreate = '';
           $scope.toTagImage = image;
+          $scope.toTagManifestDigest = opt_manifest_digest;
           $scope.addingTag = false;
           $scope.addTagForm.$setPristine();
           $element.find('#createOrMoveTagModal').modal('show');