diff --git a/homeassistant/components/version/sensor.py b/homeassistant/components/version/sensor.py
index 1cd42cce9b3..925e9111c1a 100644
--- a/homeassistant/components/version/sensor.py
+++ b/homeassistant/components/version/sensor.py
@@ -87,7 +87,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
         source = HaVersionSource.CONTAINER
 
     if (
-        source in (HaVersionSource.SUPERVISOR, HaVersionSource.CONTAINER)
+        source == HaVersionSource.CONTAINER
         and image is not None
         and image != DEFAULT_IMAGE
     ):
diff --git a/tests/components/version/test_sensor.py b/tests/components/version/test_sensor.py
index c8883e72389..cd56223a1e6 100644
--- a/tests/components/version/test_sensor.py
+++ b/tests/components/version/test_sensor.py
@@ -98,3 +98,33 @@ async def test_update(hass):
     state = hass.states.get("sensor.current_version")
     assert state
     assert state.state == "1234"
+
+
+async def test_image_name_container(hass):
+    """Test the Version sensor with image name for container."""
+    config = {
+        "sensor": {"platform": "version", "source": "docker", "image": "qemux86-64"}
+    }
+
+    with patch("homeassistant.components.version.sensor.HaVersion") as haversion:
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+    constructor = haversion.call_args[1]
+    assert constructor["source"] == "container"
+    assert constructor["image"] == "qemux86-64-homeassistant"
+
+
+async def test_image_name_supervisor(hass):
+    """Test the Version sensor with image name for supervisor."""
+    config = {
+        "sensor": {"platform": "version", "source": "hassio", "image": "qemux86-64"}
+    }
+
+    with patch("homeassistant.components.version.sensor.HaVersion") as haversion:
+        assert await async_setup_component(hass, "sensor", config)
+        await hass.async_block_till_done()
+
+    constructor = haversion.call_args[1]
+    assert constructor["source"] == "supervisor"
+    assert constructor["image"] == "qemux86-64"