diff --git a/src/apps/schema/src/app/components/CreateModelDialogue.tsx b/src/apps/schema/src/app/components/CreateModelDialogue.tsx
index 2f8a2d4f1..709d6abed 100644
--- a/src/apps/schema/src/app/components/CreateModelDialogue.tsx
+++ b/src/apps/schema/src/app/components/CreateModelDialogue.tsx
@@ -42,6 +42,7 @@ import { formatPathPart } from "../../../../../utility/formatPathPart";
 import { AppState } from "../../../../../shell/store/types";
 import { SelectModelParentInput } from "./SelectModelParentInput";
 import { SelectBlockGroupInput } from "./SelectBlockGroupInput";
+import { isZestyEmail } from "../../../../../utility/isZestyEmail";
 
 interface Props {
   onClose: () => void;
@@ -256,7 +257,7 @@ export const CreateModelDialogue = ({ onClose, modelType = "" }: Props) => {
               {modelTypes
                 ?.filter((modelType) => {
                   if (modelType.key === "block") {
-                    return user?.staff;
+                    return isZestyEmail(user.email);
                   }
                   return true;
                 })
diff --git a/src/apps/schema/src/app/components/Sidebar/index.tsx b/src/apps/schema/src/app/components/Sidebar/index.tsx
index 419cc51a9..9845d3ba6 100644
--- a/src/apps/schema/src/app/components/Sidebar/index.tsx
+++ b/src/apps/schema/src/app/components/Sidebar/index.tsx
@@ -14,6 +14,7 @@ import { CreateModelDialogue } from "../CreateModelDialogue";
 import { ModelList } from "./ModelList";
 import { useSelector } from "react-redux";
 import { AppState } from "../../../../../../shell/store/types";
+import { isZestyEmail } from "../../../../../../utility/isZestyEmail";
 
 export const Sidebar = () => {
   const { data: models, isLoading } = useGetContentModelsQuery();
@@ -81,7 +82,7 @@ export const Sidebar = () => {
                 }
               />
             </Box>
-            {user?.staff && (
+            {isZestyEmail(user.email) && (
               <Box pt={1.5}>
                 <ModelList
                   title="blocks"
diff --git a/src/shell/store/products.js b/src/shell/store/products.js
index c67340d62..3fc235634 100644
--- a/src/shell/store/products.js
+++ b/src/shell/store/products.js
@@ -1,3 +1,5 @@
+import { isZestyEmail } from "../../utility/isZestyEmail";
+
 export function products(state = ["content", "media"], action) {
   switch (action.type) {
     case "FETCH_PRODUCTS_SUCCESS":
@@ -87,7 +89,6 @@ export function fetchProducts() {
       data = [
         "launchpad",
         "content",
-        "blocks",
         "schema",
         "media",
         "code",
@@ -100,6 +101,11 @@ export function fetchProducts() {
       ];
     }
 
+    if (isZestyEmail(getState().user.email)) {
+      const contentIndex = data.indexOf("content");
+      data.splice(contentIndex + 1, 0, "blocks");
+    }
+
     dispatch({
       type: "FETCH_PRODUCTS_SUCCESS",
       payload: {
diff --git a/src/utility/isZestyEmail.ts b/src/utility/isZestyEmail.ts
new file mode 100644
index 000000000..cf83ad465
--- /dev/null
+++ b/src/utility/isZestyEmail.ts
@@ -0,0 +1,3 @@
+export function isZestyEmail(email: string): boolean {
+  return email.endsWith("@zesty.io");
+}