diff --git a/client/src/pages/servapps/containers/docker-compose.jsx b/client/src/pages/servapps/containers/docker-compose.jsx
index 8c8b862..d79efb3 100644
--- a/client/src/pages/servapps/containers/docker-compose.jsx
+++ b/client/src/pages/servapps/containers/docker-compose.jsx
@@ -225,7 +225,7 @@ const DockerComposeImport = ({ refresh, dockerComposeInit, installerInit, defaul
               if (Array.isArray(doc.services[key].labels)) {
                 let labels = {};
                 doc.services[key].labels.forEach((label) => {
-                  const [key, value] = label.split('=');
+                  const [key, value] = label.split(/=(.*)/s);
                   labels['' + key] = '' + value;
                 });
                 doc.services[key].labels = labels;
diff --git a/client/src/pages/servapps/containers/setup.jsx b/client/src/pages/servapps/containers/setup.jsx
index 6830889..0321e1a 100644
--- a/client/src/pages/servapps/containers/setup.jsx
+++ b/client/src/pages/servapps/containers/setup.jsx
@@ -56,7 +56,7 @@ const DockerContainerSetup = ({noCard, containerInfo, installer, OnChange, refre
           image: containerInfo.Config.Image,
           restartPolicy: containerInfo.HostConfig.RestartPolicy.Name,
           envVars: containerInfo.Config.Env.map((envVar) => {
-            const [key, value] = envVar.split('=');
+            const [key, value] = envVar.split(/=(.*)/s);
             return { key, value }; 
           }),
           labels: Object.keys(containerInfo.Config.Labels).map((key) => {