diff --git a/packages/catalog-model/package.json b/packages/catalog-model/package.json
index 0810479f0c..60208aeebb 100644
--- a/packages/catalog-model/package.json
+++ b/packages/catalog-model/package.json
@@ -22,14 +22,15 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
+    "@types/yup": "^0.28.2",
     "lodash": "^4.17.15",
     "yup": "^0.28.5"
   },
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.9",
+    "@types/express": "^4.17.6",
     "@types/jest": "^25.2.2",
     "@types/lodash": "^4.14.151",
-    "@types/yup": "^0.28.2",
     "yaml": "^1.9.2"
   },
   "files": [
diff --git a/plugins/auth-backend/package.json b/plugins/auth-backend/package.json
index 5055e09a2c..e0f9252773 100644
--- a/plugins/auth-backend/package.json
+++ b/plugins/auth-backend/package.json
@@ -21,11 +21,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
-    "@types/cookie-parser": "^1.4.2",
-    "@types/jwt-decode": "2.2.1",
-    "@types/passport": "^1.0.3",
-    "@types/passport-github2": "^1.2.4",
-    "@types/passport-google-oauth20": "^2.0.3",
+    "@types/express": "^4.17.6",
     "body-parser": "^1.19.0",
     "compression": "^1.7.4",
     "cookie-parser": "^1.4.5",
@@ -46,7 +42,12 @@
   "devDependencies": {
     "@backstage/cli": "^0.1.1-alpha.9",
     "@types/body-parser": "^1.19.0",
+    "@types/cookie-parser": "^1.4.2",
+    "@types/jwt-decode": "2.2.1",
+    "@types/passport-github2": "^1.2.4",
+    "@types/passport-google-oauth20": "^2.0.3",
     "@types/passport-saml": "^1.1.2",
+    "@types/passport": "^1.0.3",
     "jest-fetch-mock": "^3.0.3"
   },
   "files": [
diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json
index 58e1006e24..a12aa4e21d 100644
--- a/plugins/catalog-backend/package.json
+++ b/plugins/catalog-backend/package.json
@@ -23,6 +23,7 @@
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
     "@backstage/catalog-model": "^0.1.1-alpha.9",
+    "@types/express": "^4.17.6",
     "express": "^4.17.1",
     "express-promise-router": "^3.0.3",
     "fs-extra": "^9.0.0",
diff --git a/plugins/circleci/package.json b/plugins/circleci/package.json
index 45a21da798..0104c5cc7b 100644
--- a/plugins/circleci/package.json
+++ b/plugins/circleci/package.json
@@ -36,7 +36,6 @@
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
-    "@types/react-lazylog": "^4.5.0",
     "circleci-api": "^4.0.0",
     "moment": "^2.25.3",
     "react": "^16.13.1",
@@ -54,6 +53,7 @@
     "@testing-library/user-event": "^10.2.4",
     "@types/jest": "^25.2.2",
     "@types/node": "^12.0.0",
+    "@types/react-lazylog": "^4.5.0",
     "@types/testing-library__jest-dom": "^5.0.4",
     "jest-fetch-mock": "^3.0.3"
   },
diff --git a/plugins/gitops-profiles/src/api.ts b/plugins/gitops-profiles/src/api.ts
index ad95b1cd52..20e4dc4307 100644
--- a/plugins/gitops-profiles/src/api.ts
+++ b/plugins/gitops-profiles/src/api.ts
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { createApiRef } from '@backstage/core-api';
+import { createApiRef } from '@backstage/core';
 
 export interface CloneFromTemplateRequest {
   templateRepository: string;
diff --git a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
index d7e65c2a26..463e493afc 100644
--- a/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
+++ b/plugins/gitops-profiles/src/components/ProfileCatalog/ProfileCatalog.test.tsx
@@ -20,7 +20,7 @@ import mockFetch from 'jest-fetch-mock';
 import ProfileCatalog from './ProfileCatalog';
 import { ThemeProvider } from '@material-ui/core';
 import { lightTheme } from '@backstage/theme';
-import { ApiProvider, ApiRegistry } from '@backstage/core-api';
+import { ApiProvider, ApiRegistry } from '@backstage/core';
 import { gitOpsApiRef, GitOpsRestApi } from '../../api';
 
 describe('ProfileCatalog', () => {
diff --git a/plugins/identity-backend/package.json b/plugins/identity-backend/package.json
index 7f3ad341a3..9c2ca5341f 100644
--- a/plugins/identity-backend/package.json
+++ b/plugins/identity-backend/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
+    "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "express": "^4.17.1",
diff --git a/plugins/scaffolder-backend/package.json b/plugins/scaffolder-backend/package.json
index a4003db28b..d74c8ffdb6 100644
--- a/plugins/scaffolder-backend/package.json
+++ b/plugins/scaffolder-backend/package.json
@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
+    "@types/express": "^4.17.6",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "dockerode": "^3.2.0",
diff --git a/plugins/sentry-backend/package.json b/plugins/sentry-backend/package.json
index a1a93c6710..a23cc1ab09 100644
--- a/plugins/sentry-backend/package.json
+++ b/plugins/sentry-backend/package.json
@@ -21,6 +21,7 @@
   },
   "dependencies": {
     "@backstage/backend-common": "^0.1.1-alpha.9",
+    "@types/express": "^4.17.6",
     "axios": "^0.19.2",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
diff --git a/plugins/sentry/package.json b/plugins/sentry/package.json
index cea86234b0..7a8197ab87 100644
--- a/plugins/sentry/package.json
+++ b/plugins/sentry/package.json
@@ -27,6 +27,7 @@
     "@material-ui/core": "^4.9.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "4.0.0-alpha.45",
+    "@types/react": "^16.9",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-sparklines": "^1.7.0",