diff --git a/server_manager/web_app/gallery_app/main.ts b/server_manager/web_app/gallery_app/main.ts
index 030dbdf913..300523f9d8 100644
--- a/server_manager/web_app/gallery_app/main.ts
+++ b/server_manager/web_app/gallery_app/main.ts
@@ -26,7 +26,8 @@ import '@polymer/paper-checkbox/paper-checkbox';
 
 import {PaperCheckboxElement} from '@polymer/paper-checkbox/paper-checkbox';
 import IntlMessageFormat from 'intl-messageformat';
-import {css, customElement, html, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property} from 'lit/decorators.js';
 
 import * as gcp from '../../model/gcp';
 import {FakeManagedServer, FakeGcpAccount} from '../testing/models';
diff --git a/server_manager/web_app/outline-gcp-create-server-app.ts b/server_manager/web_app/outline-gcp-create-server-app.ts
index 246af84370..bfdfb88dd4 100644
--- a/server_manager/web_app/outline-gcp-create-server-app.ts
+++ b/server_manager/web_app/outline-gcp-create-server-app.ts
@@ -20,7 +20,8 @@ import '@polymer/paper-item/paper-item';
 import './ui_components/outline-step-view';
 import './ui_components/outline-region-picker-step';
 
-import {css, customElement, html, state, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property, state} from 'lit/decorators.js';
 import {unsafeHTML} from 'lit/directives/unsafe-html.js';
 
 import {AppRoot} from './ui_components/app-root';
diff --git a/server_manager/web_app/ui_components/cloud-install-styles.ts b/server_manager/web_app/ui_components/cloud-install-styles.ts
index d335e6e277..ffd284dad9 100644
--- a/server_manager/web_app/ui_components/cloud-install-styles.ts
+++ b/server_manager/web_app/ui_components/cloud-install-styles.ts
@@ -15,7 +15,7 @@
 */
 
 import {html} from '@polymer/polymer/lib/utils/html-tag';
-import {unsafeCSS} from 'lit-element';
+import {unsafeCSS} from 'lit';
 
 // Polymer style module to share styles between steps
 // https://polymer-library.polymer-project.org/3.0/docs/devguide/style-shadow-dom#share-styles-between-elements
diff --git a/server_manager/web_app/ui_components/outline-gcp-oauth-step.ts b/server_manager/web_app/ui_components/outline-gcp-oauth-step.ts
index 5f47c676d5..7541191342 100644
--- a/server_manager/web_app/ui_components/outline-gcp-oauth-step.ts
+++ b/server_manager/web_app/ui_components/outline-gcp-oauth-step.ts
@@ -16,7 +16,8 @@ import '@polymer/polymer/polymer-legacy';
 import '@polymer/iron-pages/iron-pages';
 import './outline-step-view';
 
-import {css, customElement, html, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property} from 'lit/decorators.js';
 import {COMMON_STYLES} from '../ui_components/cloud-install-styles';
 
 @customElement('outline-gcp-oauth-step')
diff --git a/server_manager/web_app/ui_components/outline-per-key-data-limit-dialog.ts b/server_manager/web_app/ui_components/outline-per-key-data-limit-dialog.ts
index b78bad09fd..23c5b899c1 100644
--- a/server_manager/web_app/ui_components/outline-per-key-data-limit-dialog.ts
+++ b/server_manager/web_app/ui_components/outline-per-key-data-limit-dialog.ts
@@ -25,7 +25,8 @@ import '@polymer/paper-listbox/paper-listbox';
 import {PaperDialogElement} from '@polymer/paper-dialog/paper-dialog';
 import {PaperInputElement} from '@polymer/paper-input/paper-input';
 import {PaperListboxElement} from '@polymer/paper-listbox/paper-listbox';
-import {css, customElement, html, state, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property, state} from 'lit/decorators.js';
 
 import {
   bytesToDisplayDataAmount,
diff --git a/server_manager/web_app/ui_components/outline-region-picker-step.ts b/server_manager/web_app/ui_components/outline-region-picker-step.ts
index 1d349efe66..4941a2ea3d 100644
--- a/server_manager/web_app/ui_components/outline-region-picker-step.ts
+++ b/server_manager/web_app/ui_components/outline-region-picker-step.ts
@@ -17,7 +17,8 @@ import '@polymer/paper-button/paper-button';
 import '@polymer/paper-progress/paper-progress';
 import './outline-step-view';
 
-import {css, customElement, html, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property} from 'lit/decorators.js';
 
 import {COMMON_STYLES} from './cloud-install-styles';
 import {CloudLocationOption} from '../../model/location';
diff --git a/server_manager/web_app/ui_components/outline-server-list.ts b/server_manager/web_app/ui_components/outline-server-list.ts
index b801835e0b..dd45c3fcf1 100644
--- a/server_manager/web_app/ui_components/outline-server-list.ts
+++ b/server_manager/web_app/ui_components/outline-server-list.ts
@@ -14,7 +14,8 @@
 
 import './outline-server-view';
 
-import {customElement, html, LitElement, property} from 'lit-element';
+import {html, LitElement} from 'lit';
+import {customElement, property} from 'lit/decorators.js';
 import {repeat} from 'lit/directives/repeat.js';
 
 import type {DisplayCloudId} from './cloud-assets';
diff --git a/server_manager/web_app/ui_components/outline-server-progress-step.ts b/server_manager/web_app/ui_components/outline-server-progress-step.ts
index 20ba0cf208..e097a9c2a5 100644
--- a/server_manager/web_app/ui_components/outline-server-progress-step.ts
+++ b/server_manager/web_app/ui_components/outline-server-progress-step.ts
@@ -17,7 +17,8 @@ import '@polymer/paper-progress/paper-progress';
 import '@polymer/paper-button/paper-button';
 import './outline-progress-spinner';
 import './outline-step-view';
-import {css, customElement, html, LitElement, property} from 'lit-element';
+import {css, html, LitElement} from 'lit';
+import {customElement, property} from 'lit/decorators.js';
 import {COMMON_STYLES} from './cloud-install-styles';
 
 @customElement('outline-server-progress-step')
diff --git a/server_manager/web_app/ui_components/outline-sort-span.ts b/server_manager/web_app/ui_components/outline-sort-span.ts
index 46ef01bcae..cc4bdf4e50 100644
--- a/server_manager/web_app/ui_components/outline-sort-span.ts
+++ b/server_manager/web_app/ui_components/outline-sort-span.ts
@@ -15,7 +15,7 @@
 import '@polymer/iron-icon/iron-icon';
 import '@polymer/iron-icons/iron-icons';
 
-import {css, html, LitElement, PropertyDeclarations} from 'lit-element';
+import {css, html, LitElement, PropertyDeclarations} from 'lit';
 
 export class SortSpan extends LitElement {
   static get styles() {