diff --git a/commands/package.go b/commands/package.go
index 4b12815a..f97d2b7f 100644
--- a/commands/package.go
+++ b/commands/package.go
@@ -8,6 +8,7 @@ import (
 	"io"
 	"path/filepath"
 
+	"github.com/docker/model-cli/commands/completion"
 	"github.com/docker/model-cli/desktop"
 	"github.com/docker/model-distribution/builder"
 	"github.com/docker/model-distribution/registry"
@@ -67,6 +68,7 @@ func newPackagedCmd() *cobra.Command {
 			}
 			return nil
 		},
+		ValidArgsFunction: completion.NoComplete,
 	}
 
 	c.Flags().StringVar(&opts.ggufPath, "gguf", "", "absolute path to gguf file (required)")
diff --git a/commands/tag.go b/commands/tag.go
index a5529024..78fada59 100644
--- a/commands/tag.go
+++ b/commands/tag.go
@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 
+	"github.com/docker/model-cli/commands/completion"
 	"github.com/docker/model-cli/desktop"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/spf13/cobra"
@@ -28,6 +29,7 @@ func newTagCmd() *cobra.Command {
 			}
 			return tagModel(cmd, desktopClient, args[0], args[1])
 		},
+		ValidArgsFunction: completion.ModelNames(getDesktopClient, 1),
 	}
 	return c
 }