diff --git a/ecs_deploy/ecs.py b/ecs_deploy/ecs.py
index 2fb4824..b12e888 100644
--- a/ecs_deploy/ecs.py
+++ b/ecs_deploy/ecs.py
@@ -464,8 +464,12 @@ def set_images(self, tag=None, **images):
                 self._diff.append(diff)
                 container[u'image'] = new_image
             elif tag:
-                image_definition = container[u'image'].rsplit(u':', 1)
-                new_image = u'%s:%s' % (image_definition[0], tag.strip())
+                image = container[u'image']
+                if u"@sha256:" in image:
+                    image = image.rsplit(u'@', 1)[0]
+                if u":" in image:
+                    image = image.rsplit(u':', 1)[0]
+                new_image = u'%s:%s' % (image, tag.strip())
                 diff = EcsTaskDefinitionDiff(
                     container=container[u'name'],
                     field=u'image',