diff --git a/debian/control b/debian/control
index ea86ada3c65..7f363fc941e 100644
--- a/debian/control
+++ b/debian/control
@@ -248,7 +248,7 @@ Description: Display server for Ubuntu - shared library
  Contains the shared libraries required for the Mir server and client.
 
 # Longer-term these drivers should move out-of-tree
-Package: mir-platform-graphics-x20
+Package: mir-platform-graphics-x21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -262,7 +262,7 @@ Description: Display server for Ubuntu - platform library for X11
  Contains the shared libraries required for the Mir server to interact with
  the X11 platform.
 
-Package: mir-platform-graphics-gbm-kms20
+Package: mir-platform-graphics-gbm-kms21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -276,7 +276,7 @@ Description: Display server for Ubuntu - platform library for GBM KMS
  Contains the shared libraries required for the Mir server to interact with
  the hardware platform using the Mesa drivers.
 
-Package: mir-platform-graphics-eglstream-kms20
+Package: mir-platform-graphics-eglstream-kms21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -291,7 +291,7 @@ Description: Display server for Ubuntu - platform library for NVIDIA
  the hardware platform using the EGLStream EGL extensions, such as the
  NVIDIA binary driver.
 
-Package: mir-platform-graphics-wayland20
+Package: mir-platform-graphics-wayland21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -305,7 +305,7 @@ Description: Display server for Ubuntu - platform library for Wayland
  Contains the shared libraries required for the Mir server to interact with
  a "host" Wayland display server.
 
-Package: mir-platform-rendering-egl-generic20
+Package: mir-platform-rendering-egl-generic21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -319,7 +319,7 @@ Description: Display server for Ubuntu - generic EGL rendering platform
  Contains the shared libraries required for the Mir server to provide accelerated
  client rendering via standard EGL interfaces.
 
-Package: mir-platform-graphics-virtual20
+Package: mir-platform-graphics-virtual21
 Section: libs
 Architecture: linux-any
 Multi-Arch: same
@@ -387,7 +387,7 @@ Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-gbm-kms20,
+         mir-platform-graphics-gbm-kms21,
          mir-platform-input-evdev8,
          mir-platform-rendering-egl-generic,
 Description: Display server for Ubuntu - gbm-kms driver metapackage
@@ -403,7 +403,7 @@ Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-eglstream-kms20,
+         mir-platform-graphics-eglstream-kms21,
          mir-platform-input-evdev8,
 Description: Display server for Ubuntu - eglstream-kms driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -418,7 +418,7 @@ Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-wayland20,
+         mir-platform-graphics-wayland21,
          mir-platform-rendering-egl-generic,
 Description: Display server for Ubuntu - wayland driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
@@ -432,7 +432,7 @@ Section: libs
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: mir-platform-rendering-egl-generic20
+Depends: mir-platform-rendering-egl-generic21
 Description: Display server for Ubuntu - EGL rendering provider metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -445,7 +445,7 @@ Section: libs
 Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: mir-platform-graphics-virtual20
+Depends: mir-platform-graphics-virtual21
 Description: Display server for Ubuntu - virtual display provider metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
  robust operation and a well-defined driver model.
@@ -458,7 +458,7 @@ Architecture: linux-any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
-         mir-platform-graphics-x20,
+         mir-platform-graphics-x21,
          mir-platform-rendering-egl-generic,
 Description: Display server for Ubuntu - x driver metapackage
  Mir is a display server running on linux systems, with a focus on efficiency,
diff --git a/debian/mir-platform-graphics-eglstream-kms20.install b/debian/mir-platform-graphics-eglstream-kms20.install
deleted file mode 100644
index c583242f7d8..00000000000
--- a/debian/mir-platform-graphics-eglstream-kms20.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/mir/server-platform/graphics-eglstream-kms.so.20
diff --git a/debian/mir-platform-graphics-eglstream-kms21.install b/debian/mir-platform-graphics-eglstream-kms21.install
new file mode 100644
index 00000000000..fac12dd25d2
--- /dev/null
+++ b/debian/mir-platform-graphics-eglstream-kms21.install
@@ -0,0 +1 @@
+usr/lib/*/mir/server-platform/graphics-eglstream-kms.so.21
diff --git a/debian/mir-platform-graphics-gbm-kms20.install b/debian/mir-platform-graphics-gbm-kms20.install
deleted file mode 100644
index 7edaadc3a9b..00000000000
--- a/debian/mir-platform-graphics-gbm-kms20.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/mir/server-platform/graphics-gbm-kms.so.20
diff --git a/debian/mir-platform-graphics-gbm-kms21.install b/debian/mir-platform-graphics-gbm-kms21.install
new file mode 100644
index 00000000000..3a916117780
--- /dev/null
+++ b/debian/mir-platform-graphics-gbm-kms21.install
@@ -0,0 +1 @@
+usr/lib/*/mir/server-platform/graphics-gbm-kms.so.21
diff --git a/debian/mir-platform-graphics-virtual20.install b/debian/mir-platform-graphics-virtual20.install
deleted file mode 100644
index 9e091404a06..00000000000
--- a/debian/mir-platform-graphics-virtual20.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/mir/server-platform/server-virtual.so.20
-
diff --git a/debian/mir-platform-graphics-virtual21.install b/debian/mir-platform-graphics-virtual21.install
new file mode 100644
index 00000000000..979ed3a151e
--- /dev/null
+++ b/debian/mir-platform-graphics-virtual21.install
@@ -0,0 +1,2 @@
+usr/lib/*/mir/server-platform/server-virtual.so.21
+
diff --git a/debian/mir-platform-graphics-wayland20.install b/debian/mir-platform-graphics-wayland20.install
deleted file mode 100644
index 8a723789ba7..00000000000
--- a/debian/mir-platform-graphics-wayland20.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/mir/server-platform/graphics-wayland.so.20
diff --git a/debian/mir-platform-graphics-wayland21.install b/debian/mir-platform-graphics-wayland21.install
new file mode 100644
index 00000000000..75bff0cdfa4
--- /dev/null
+++ b/debian/mir-platform-graphics-wayland21.install
@@ -0,0 +1 @@
+usr/lib/*/mir/server-platform/graphics-wayland.so.21
diff --git a/debian/mir-platform-graphics-x20.install b/debian/mir-platform-graphics-x20.install
deleted file mode 100644
index 2b78a5cef17..00000000000
--- a/debian/mir-platform-graphics-x20.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/mir/server-platform/server-x11.so.20
diff --git a/debian/mir-platform-graphics-x21.install b/debian/mir-platform-graphics-x21.install
new file mode 100644
index 00000000000..9c104f5cb40
--- /dev/null
+++ b/debian/mir-platform-graphics-x21.install
@@ -0,0 +1 @@
+usr/lib/*/mir/server-platform/server-x11.so.21
diff --git a/debian/mir-platform-rendering-egl-generic20.install b/debian/mir-platform-rendering-egl-generic20.install
deleted file mode 100644
index c856508178e..00000000000
--- a/debian/mir-platform-rendering-egl-generic20.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/mir/server-platform/renderer-egl-generic.so.20
-
diff --git a/debian/mir-platform-rendering-egl-generic21.install b/debian/mir-platform-rendering-egl-generic21.install
new file mode 100644
index 00000000000..55e7da00f0d
--- /dev/null
+++ b/debian/mir-platform-rendering-egl-generic21.install
@@ -0,0 +1,2 @@
+usr/lib/*/mir/server-platform/renderer-egl-generic.so.21
+
diff --git a/src/platforms/CMakeLists.txt b/src/platforms/CMakeLists.txt
index 2097d9bec94..c94a2d5394d 100644
--- a/src/platforms/CMakeLists.txt
+++ b/src/platforms/CMakeLists.txt
@@ -8,8 +8,8 @@ set(MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION 0.27)
 set(MIR_SERVER_INPUT_PLATFORM_ABI ${MIR_SERVER_INPUT_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_INPUT_PLATFORM_VERSION "MIR_INPUT_PLATFORM_${MIR_SERVER_INPUT_PLATFORM_STANZA_VERSION}")
 set(MIR_SERVER_INPUT_PLATFORM_VERSION ${MIR_SERVER_INPUT_PLATFORM_VERSION} PARENT_SCOPE)
-set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 20)
-set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 2.8)
+set(MIR_SERVER_GRAPHICS_PLATFORM_ABI 21)
+set(MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION 2.16)
 set(MIR_SERVER_GRAPHICS_PLATFORM_ABI ${MIR_SERVER_GRAPHICS_PLATFORM_ABI} PARENT_SCOPE)
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION "MIR_GRAPHICS_PLATFORM_${MIR_SERVER_GRAPHICS_PLATFORM_STANZA_VERSION}")
 set(MIR_SERVER_GRAPHICS_PLATFORM_VERSION ${MIR_SERVER_GRAPHICS_PLATFORM_VERSION} PARENT_SCOPE)