diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 66e716088..baee58cf0 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -14,9 +14,9 @@ jobs:
       - name: Unshallow repo
         run: git fetch --prune --unshallow
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Run goreleaser
         uses: goreleaser/goreleaser-action@v1
         with:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 988b8dbc9..309b2486f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,7 @@
 name: Continuous Integration
 
 env:
-  GO_VERSION: 1.21
+  GO_VERSION: 1.24
 
 on:
   push:
@@ -25,9 +25,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Cache build
         uses: actions/cache@v4
         with:
@@ -47,9 +47,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Cache build
         uses: actions/cache@v4
         with:
@@ -75,9 +75,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Cache build
         uses: actions/cache@v4
         with:
@@ -102,9 +102,9 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@v6
         with:
-          go-version: 1.21.x
+          go-version: 1.24.x
       - name: Cache build
         uses: actions/cache@v4
         with:
diff --git a/pkg/commands/docker.go b/pkg/commands/docker.go
index 9885d3058..35afef2fa 100644
--- a/pkg/commands/docker.go
+++ b/pkg/commands/docker.go
@@ -256,7 +256,11 @@ func (c *DockerCommand) GetContainers(existingContainers []*Container) ([]*Conta
 		if name, ok := ctr.Labels["name"]; ok {
 			newContainer.Name = name
 		} else {
-			newContainer.Name = strings.TrimLeft(ctr.Names[0], "/")
+			if len(ctr.Names) > 0 {
+				newContainer.Name = strings.TrimLeft(ctr.Names[0], "/")
+			} else {
+				newContainer.Name = ctr.ID
+			}
 		}
 		newContainer.ServiceName = ctr.Labels["com.docker.compose.service"]
 		newContainer.ProjectName = ctr.Labels["com.docker.compose.project"]