Planning for end of non-CDB

We know that non-CDB architecture is deprecated and "may be desupported and unavailable in a release after Oracle Database 12c

Release 2."  (italics mine)

So, here's my situation.  We are running all of our databases (5 production and somewhat more than that test) on Std. Ed. 2.  So with that we can run multi-tenant architecture, but with only 1 PDB.  Most of my servers are running multiple databases, which would normally be exactly what multi-tenant was designed for.  But with the limit of one PDB per CDB, it looks like my only option is to create multiple CDBs per server.  I've never seen this discussed and I presume that is because it flies in the face of the very purpose of multi-tenant.