diff --git a/.circleci/config.yml b/.circleci/config.yml
index b8ec2de1cc1..62649973ada 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -150,10 +150,6 @@ jobs:
     steps:
       - checkout
 
-      # login docker hub
-      - run: |
-          echo "$DOCKER_PASS" | docker login --username $DOCKER_USER --password-stdin
-
       # build the application image
       - run: |
           docker build \
@@ -186,6 +182,10 @@ jobs:
           condition:
             equal: [master, << pipeline.git.branch >>]
           steps:
+            # login docker hub
+            - run: |
+                echo "$DOCKER_PASS" | docker login --username $DOCKER_USER --password-stdin
+
             - run: |
                 docker push muicom/toolpad:$CIRCLE_SHA1
                 docker tag muicom/toolpad:$CIRCLE_SHA1 muicom/toolpad:alpha
diff --git a/.eslintrc.js b/.eslintrc.js
index 973705456c5..260b678ef9a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -65,7 +65,6 @@ module.exports = {
         '@next/next/no-html-link-for-pages': ['error', 'packages/toolpad-app/pages/'],
       },
     },
-    ...baseline.overrides,
     {
       // Disabling this rule for now:
       // https://github.com/mui/material-ui/blob/9737bc85bb6960adb742e7709e9c3710c4b6cedd/.eslintrc.js#L359
diff --git a/packages/toolpad-app/src/utils/react.tsx b/packages/toolpad-app/src/utils/react.tsx
index 0b6495623ce..d3bb2b3930b 100644
--- a/packages/toolpad-app/src/utils/react.tsx
+++ b/packages/toolpad-app/src/utils/react.tsx
@@ -13,11 +13,7 @@ export function createProvidedContext<T>(
     return maybeContext;
   };
 
-  const Provider = ({ value, ...props }: React.ProviderProps<T>) => {
-    return <context.Provider value={value} {...props} />;
-  };
-
-  return [useContext, Provider];
+  return [useContext, context.Provider as React.ComponentType<React.ProviderProps<T>>];
 }
 
 export function suspendPromise<T>(promise: Promise<T>): () => T {