diff --git a/packages/api/src/main.js b/packages/api/src/main.js
index 7356e4dcd..4061899fe 100644
--- a/packages/api/src/main.js
+++ b/packages/api/src/main.js
@@ -73,6 +73,8 @@ function start() {
   if (platformInfo.isDocker) {
     // server static files inside docker container
     app.use(getExpressPath('/'), express.static('/home/dbgate-docker/public'));
+  } else if (platformInfo.isAwsUbuntuLayout) {
+    app.use(getExpressPath('/'), express.static('/home/ubuntu/build/public'));
   } else if (platformInfo.isNpmDist) {
     app.use(getExpressPath('/'), express.static(path.join(__dirname, '../../dbgate-web/public')));
   } else if (process.env.DEVWEB) {
diff --git a/packages/api/src/utility/hardwareFingerprint.js b/packages/api/src/utility/hardwareFingerprint.js
index 167bbf115..08f42bc86 100644
--- a/packages/api/src/utility/hardwareFingerprint.js
+++ b/packages/api/src/utility/hardwareFingerprint.js
@@ -72,6 +72,7 @@ async function getPublicHardwareFingerprint() {
       country: fingerprint.country,
       region: fingerprint.region,
       isDocker: platformInfo.isDocker,
+      isAwsUbuntuLayout: platformInfo.isAwsUbuntuLayout,
       isElectron: platformInfo.isElectron,
     },
   };