diff --git a/.pick_status.json b/.pick_status.json
index 4212b1c1f55..9e1b3f4ad4d 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -994,7 +994,7 @@
         "description": "pan/format: Disable image storage on A8_UNORM",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "d95423686fda6c8a96702b1535a967132f8887f8",
         "notes": null
diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index c9d79d6839a..e86b61f82e3 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -512,7 +512,7 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
    FMT(X24S8_UINT,              RGBA8UI,         AAAA, L, _T_Z_),
    FMT(S8_UINT,                 R8UI,            RRRR, L, _T_Z_),
 
-   FMT(A8_UNORM,                R8_UNORM,        000R, L, VTR_I),
+   FMT(A8_UNORM,                R8_UNORM,        000R, L, VTR__),
    FMT(L8A8_UNORM,              RG8_UNORM,       RRRG, L, VTR_I),
    FMT(L8A8_SRGB,               RG8_UNORM,       RRRG, S, VTR_I),
 
@@ -549,7 +549,7 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
 
    /* similarly, the interchange format is RGBA8, but we only
       actually store 1 component in memory here */
-   FMT(A8_UNORM,                RGBA8_UNORM,     000A, L, VTR_I),
+   FMT(A8_UNORM,                RGBA8_UNORM,     000A, L, VTR__),
 #else
    /* Specify real formats on Bifrost */
    FMT(Z32_FLOAT_S8X24_UINT,    Z32_X32,         RGBA, L, _T_Z_),
@@ -558,7 +558,7 @@ const struct panfrost_format GENX(panfrost_pipe_format)[PIPE_FORMAT_COUNT] = {
    FMT(S8_UINT,                 S8,              GRBA, L, _T_Z_),
 
    /* Obsolete formats removed in Valhall */
-   FMT(A8_UNORM,                A8_UNORM,        000A, L, VTR_I),
+   FMT(A8_UNORM,                A8_UNORM,        000A, L, VTR__),
    FMT(L8A8_UNORM,              R8A8_UNORM,      RRRA, L, VTR_I),
    FMT(L8A8_SRGB,               R8A8_UNORM,      RRRA, S, VTR_I),
 #endif