diff --git a/dist/go-compose-exporter_darwin_amd64 b/dist/go-compose-exporter_darwin_amd64
index 10e6d02..da60916 100755
Binary files a/dist/go-compose-exporter_darwin_amd64 and b/dist/go-compose-exporter_darwin_amd64 differ
diff --git a/dist/go-compose-exporter_darwin_arm64 b/dist/go-compose-exporter_darwin_arm64
index 1eb66ac..52ee23f 100755
Binary files a/dist/go-compose-exporter_darwin_arm64 and b/dist/go-compose-exporter_darwin_arm64 differ
diff --git a/dist/go-compose-exporter_linux_amd64 b/dist/go-compose-exporter_linux_amd64
index a0c5745..7804179 100755
Binary files a/dist/go-compose-exporter_linux_amd64 and b/dist/go-compose-exporter_linux_amd64 differ
diff --git a/dist/go-compose-exporter_linux_amd64_static b/dist/go-compose-exporter_linux_amd64_static
index b995423..6403bce 100755
Binary files a/dist/go-compose-exporter_linux_amd64_static and b/dist/go-compose-exporter_linux_amd64_static differ
diff --git a/dist/go-compose-exporter_linux_arm64 b/dist/go-compose-exporter_linux_arm64
index b78b9c6..c679b84 100755
Binary files a/dist/go-compose-exporter_linux_arm64 and b/dist/go-compose-exporter_linux_arm64 differ
diff --git a/dist/go-compose-exporter_linux_arm64_static b/dist/go-compose-exporter_linux_arm64_static
index 61c99d4..fbd38b8 100755
Binary files a/dist/go-compose-exporter_linux_arm64_static and b/dist/go-compose-exporter_linux_arm64_static differ
diff --git a/dist/go-compose-exporter_windows_amd64 b/dist/go-compose-exporter_windows_amd64
index fdb33fe..b08e000 100755
Binary files a/dist/go-compose-exporter_windows_amd64 and b/dist/go-compose-exporter_windows_amd64 differ
diff --git a/main.go b/main.go
index 99a28cf..8a7fc8d 100644
--- a/main.go
+++ b/main.go
@@ -199,9 +199,11 @@ func parseJSONVolumeMounts(jsonStr string) []string {
     var volumeMounts []string
     volumeData := strings.Split(jsonStr, "},{")
     for _, data := range volumeData {
-        if strings.Contains(data, "\"Destination\"") {
+        if strings.Contains(data, "\"Source\"") && strings.Contains(data, "\"Destination\"") {
             parts := strings.Split(data, "\"")
-            volumeMounts = append(volumeMounts, parts[3]+":"+parts[7])
+            source := parts[3]
+            destination := parts[7]
+            volumeMounts = append(volumeMounts, source+":"+destination)
         }
     }
     return volumeMounts
@@ -212,8 +214,9 @@ func parseJSONPorts(jsonStr string) []string {
     portData := strings.Split(jsonStr, "},{")
     for _, data := range portData {
         if strings.Contains(data, "\"HostPort\"") {
-            hostPort := strings.Split(data, "\"")[3]
-            containerPort := strings.Split(data, "\"")[7]
+            parts := strings.Split(data, "\"")
+            hostPort := parts[3]
+            containerPort := strings.Split(parts[1], "/")[0]
             ports = append(ports, hostPort+":"+containerPort)
         }
     }