diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index e95159a6..3b33df19 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -60,14 +60,14 @@ export async function servicesFromDocker() {
           let constructedService = null;
 
           Object.keys(container.Labels).forEach((label) => {
-            if (label.startsWith("homepage.")) {
+            if (label.startsWith(`${process.env.INSTANCE}-homepage.`) || label.startsWith('homepage.')) {
               if (!constructedService) {
                 constructedService = {
                   container: container.Names[0].replace(/^\//, ""),
                   server: serverName,
                 };
               }
-              shvl.set(constructedService, label.replace("homepage.", ""), container.Labels[label]);
+              shvl.set(constructedService, label.replace(RegExp(`(${process.env.INSTANCE}-)?homepage\\.`), ""), container.Labels[label]);
             }
           });