diff --git a/packages/amplify-graphql-model-transformer/API.md b/packages/amplify-graphql-model-transformer/API.md
index 6e2bcc17ae..145f6248ca 100644
--- a/packages/amplify-graphql-model-transformer/API.md
+++ b/packages/amplify-graphql-model-transformer/API.md
@@ -168,6 +168,13 @@ export const getSsmEndpoint: (scope: Construct, resourceNames: SQLLambdaResource
 // @public (undocumented)
 export const getSubscriptionFilterInputName: (name: string) => string;
 
+// @public (undocumented)
+export const isSandboxDeployment: (context: TransformerContextProvider) => context is TransformerContextProvider & {
+    deploymentIdentifier: {
+        deploymentType: 'sandbox';
+    };
+};
+
 // @public (undocumented)
 export function makeAttributeTypeEnum(): EnumTypeDefinitionNode;
 
diff --git a/packages/amplify-graphql-model-transformer/src/__tests__/custom-resources.test.ts b/packages/amplify-graphql-model-transformer/src/__tests__/custom-resources.test.ts
index 59e0909d79..f35925a626 100644
--- a/packages/amplify-graphql-model-transformer/src/__tests__/custom-resources.test.ts
+++ b/packages/amplify-graphql-model-transformer/src/__tests__/custom-resources.test.ts
@@ -45,7 +45,7 @@ describe('CustomResources', () => {
     const createProperties = JSON.parse(customResource.Properties.Create['Fn::Join'][1].join(''));
     const updateProperties = JSON.parse(customResource.Properties.Update['Fn::Join'][1].join(''));
 
-    const expectedPhysicalId = `TestLayerVersionCustomResource-${new Date().toISOString().substring(0, 10)}`;
+    const expectedPhysicalId = 'TestLayerVersionCustomResource';
     expect(createProperties.physicalResourceId.id).toEqual(expectedPhysicalId);
     expect(updateProperties.physicalResourceId.id).toEqual(expectedPhysicalId);
   });
@@ -67,7 +67,7 @@ describe('CustomResources', () => {
     const createProperties = JSON.parse(customResource.Properties.Create['Fn::Join'][1].join(''));
     const updateProperties = JSON.parse(customResource.Properties.Update['Fn::Join'][1].join(''));
 
-    const expectedPhysicalId = `TestSNSTopicARNCustomResource-${new Date().toISOString().substring(0, 10)}`;
+    const expectedPhysicalId = 'TestSNSTopicARNCustomResource';
     expect(createProperties.physicalResourceId.id).toEqual(expectedPhysicalId);
     expect(updateProperties.physicalResourceId.id).toEqual(expectedPhysicalId);
   });
diff --git a/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts b/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts
index 404eff5531..a4eaf9bec6 100644
--- a/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts
+++ b/packages/amplify-graphql-model-transformer/src/resolvers/rds/resolver.ts
@@ -292,7 +292,7 @@ export const createSNSTopicARNCustomResource = (
 
 // Type predicate to check if the deployment type is 'sandbox'
 export const isSandboxDeployment = (
-  context: TransformerContextProvider
+  context: TransformerContextProvider,
 ): context is TransformerContextProvider & { deploymentIdentifier: { deploymentType: 'sandbox' } } => {
   return context?.synthParameters?.deploymentIdentifier?.deploymentType === 'sandbox';
 };