diff --git a/src/gallium/drivers/panfrost/pan_device.h b/src/gallium/drivers/panfrost/pan_device.h
index 9c0a86b0915..16cec91a88f 100644
--- a/src/gallium/drivers/panfrost/pan_device.h
+++ b/src/gallium/drivers/panfrost/pan_device.h
@@ -251,7 +251,7 @@ pan_get_max_texel_buffer_elements(unsigned arch)
       /* TODO 1<<27 can be made larger for v11+ with a refactor of the buffer
        * path away from using image logic. */
       return 1 << 27;
-   else if (arch >= 9)
+   else if (arch >= 6)
       return 1 << 27;
    else
       return 65536;
diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c
index 53c865ba3a2..41bc892eb02 100644
--- a/src/panfrost/vulkan/panvk_vX_physical_device.c
+++ b/src/panfrost/vulkan/panvk_vX_physical_device.c
@@ -641,12 +641,10 @@ panvk_per_arch(get_physical_device_properties)(
       .maxImageDimension3D = PAN_ARCH <= 10 ? (1 << 9) : (1 << 14),
       .maxImageDimensionCube = PAN_ARCH <= 10 ? (1 << 14) - 1 : (1 << 16),
       .maxImageArrayLayers = (1 << 16),
-      /* Currently Bifrost is limited by the 1D texture size, which is 2^16,
-         while pre-v11 is limited to 2^27 elements of 16 byte formats due to
+      /* Pre-v11 is limited to 2^27 elements of 16 byte formats due to
          size fields of 32 bits. */
-      .maxTexelBufferElements = PAN_ARCH >= 11  ? PANVK_MAX_BUFFER_SIZE
-                                : PAN_ARCH >= 9 ? (1 << 27)
-                                                : (1 << 16),
+      .maxTexelBufferElements =
+         PAN_ARCH >= 11 ? PANVK_MAX_BUFFER_SIZE : (1 << 27),
       /* Each uniform entry is 16-byte and the number of entries is encoded in a
        * 12-bit field, with the minus(1) modifier, which gives 2^20.
        */
@@ -986,8 +984,8 @@ panvk_per_arch(get_physical_device_properties)(
       .integerDotProductAccumulatingSaturating64BitMixedSignednessAccelerated = false,
       .storageTexelBufferOffsetAlignmentBytes = 64,
       .storageTexelBufferOffsetSingleTexelAlignment = false,
-      .uniformTexelBufferOffsetAlignmentBytes = PAN_ARCH >= 9 ? 4 : 64,
-      .uniformTexelBufferOffsetSingleTexelAlignment = PAN_ARCH >= 9,
+      .uniformTexelBufferOffsetAlignmentBytes = 4,
+      .uniformTexelBufferOffsetSingleTexelAlignment = true,
       .maxBufferSize = PANVK_MAX_BUFFER_SIZE,
 
       /* Vulkan 1.4 properties */