diff --git a/plugins/core/ui/src/components/Drawer.vue b/plugins/core/ui/src/components/Drawer.vue
index dafb2b17b8..bb43105294 100644
--- a/plugins/core/ui/src/components/Drawer.vue
+++ b/plugins/core/ui/src/components/Drawer.vue
@@ -87,7 +87,7 @@
 
 <script>
 import { getComponentViewPath } from "./helpers";
-import { checkUpdate } from "./plugin/plugin";
+import { checkServerUpdate } from "./plugin/plugin";
 
 export default {
   props: {
@@ -160,11 +160,9 @@ export default {
         // in which case fall back and determine what the install type is.
         const info = await this.$scrypted.systemManager.getComponent("info");
         const version = await info.getVersion();
+        const scryptedEnv = await info.getScryptedEnv();
         this.currentVersion = version;
-        const { updateAvailable } = await checkUpdate(
-          "@scrypted/server",
-          version
-        );
+        const { updateAvailable } = await checkServerUpdate(version, scryptedEnv.SCRYPTED_INSTALL_ENVIRONMENT);
         this.updateAvailable = updateAvailable;
       }
 
diff --git a/plugins/core/ui/src/components/builtin/SettingsComponent.vue b/plugins/core/ui/src/components/builtin/SettingsComponent.vue
index 0c101aa778..ea1f09e525 100644
--- a/plugins/core/ui/src/components/builtin/SettingsComponent.vue
+++ b/plugins/core/ui/src/components/builtin/SettingsComponent.vue
@@ -101,7 +101,7 @@
   </v-layout>
 </template>
 <script>
-import { checkUpdate } from "../plugin/plugin";
+import { checkServerUpdate } from "../plugin/plugin";
 import Settings from "../../interfaces/Settings.vue"
 import {createSystemSettingsDevice} from './system-settings';
 
@@ -140,10 +140,8 @@ export default {
       catch (e) {
         // old scrypted servers dont support this call, or it may be unimplemented
         // in which case fall back and determine what the install type is.
-        const { updateAvailable } = await checkUpdate(
-          "@scrypted/server",
-          version
-        );
+        const scryptedEnv = await info.getScryptedEnv();
+        const { updateAvailable } = await checkServerUpdate(version, scryptedEnv.SCRYPTED_INSTALL_ENVIRONMENT);
         this.updateAvailable = updateAvailable;
       }
     },
diff --git a/plugins/core/ui/src/components/plugin/plugin.ts b/plugins/core/ui/src/components/plugin/plugin.ts
index fa1c482834..5b4047fccc 100644
--- a/plugins/core/ui/src/components/plugin/plugin.ts
+++ b/plugins/core/ui/src/components/plugin/plugin.ts
@@ -12,6 +12,7 @@ const pluginSnapshot = require("!!raw-loader!./plugin-snapshot.ts").default.spli
 
 export interface PluginUpdateCheck {
     updateAvailable?: string;
+    updatePublished?: Date;
     versions: any;
 }
 
@@ -29,11 +30,17 @@ export async function checkUpdate(npmPackage: string, npmPackageVersion: string)
     const { data } = response;
     const versions = Object.values(data.versions).sort((a: any, b: any) => semver.compare(a.version, b.version)).reverse();
     let updateAvailable: any;
+    let updatePublished: any;
     let latest: any;
     if (data["dist-tags"]) {
         latest = data["dist-tags"].latest;
         if (npmPackageVersion && semver.gt(latest, npmPackageVersion)) {
             updateAvailable = latest;
+            try {
+                updatePublished = new Date(data["time"][latest]);
+            } catch {
+                updatePublished = null;
+            }
         }
     }
     for (const [k, v] of Object.entries(data['dist-tags'])) {
@@ -54,10 +61,36 @@ export async function checkUpdate(npmPackage: string, npmPackageVersion: string)
     }
     return {
         updateAvailable,
+        updatePublished,
         versions,
     };
 }
 
+export async function checkServerUpdate(version: string, installEnvironment: string): Promise<PluginUpdateCheck> {
+    const { updateAvailable, updatePublished, versions } = await checkUpdate(
+        "@scrypted/server",
+        version
+    );
+
+    if (installEnvironment == "docker" && updatePublished) {
+        console.log(`New scrypted server version published ${updatePublished}`);
+
+        // check if there is a new docker image available, using 'latest' tag
+        // this is done so newer server versions in npm are not immediately
+        // displayed until a docker image has been published
+        let response: AxiosResponse<any> = await axios.get("https://corsproxy.io?https://hub.docker.com/v2/namespaces/koush/repositories/scrypted/tags/latest");
+        const { data } = response;
+        const imagePublished = new Date(data.last_updated);
+        console.log(`Latest docker image published ${imagePublished}`);
+
+        if (imagePublished < updatePublished) {
+            // docker image is not yet published
+            return { updateAvailable: null, updatePublished: null, versions: null }
+        }
+    }
+    return { updateAvailable, updatePublished, versions };
+}
+
 export async function installNpm(systemManager: SystemManager, npmPackage: string, version?: string): Promise<string> {
     const plugins = await systemManager.getComponent('plugins');
     await plugins.installNpm(npmPackage, version);