diff --git a/pkg/specgenutil/specgen.go b/pkg/specgenutil/specgen.go
index c9dc0775d5..6cb1f154d5 100644
--- a/pkg/specgenutil/specgen.go
+++ b/pkg/specgenutil/specgen.go
@@ -516,6 +516,10 @@ func FillOutSpecGen(s *specgen.SpecGenerator, c *entities.ContainerCreateOptions
 	if len(s.Annotations) == 0 {
 		s.Annotations = annotations
 	}
+	// Add the user namespace configuration to the annotations
+	if c.UserNS != "" {
+		s.Annotations[define.UserNsAnnotation] = c.UserNS
+	}
 
 	if len(c.StorageOpts) > 0 {
 		opts := make(map[string]string, len(c.StorageOpts))
diff --git a/pkg/specgenutil/specgenutil_test.go b/pkg/specgenutil/specgenutil_test.go
index c0e93316f8..c714dc446b 100644
--- a/pkg/specgenutil/specgenutil_test.go
+++ b/pkg/specgenutil/specgenutil_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	"github.com/containers/common/pkg/machine"
+	"github.com/containers/podman/v5/libpod/define"
 	"github.com/containers/podman/v5/pkg/domain/entities"
 	"github.com/containers/podman/v5/pkg/specgen"
 	"github.com/stretchr/testify/assert"
@@ -216,3 +217,16 @@ func TestGenRlimits(t *testing.T) {
 	_, err = GenRlimits([]string{"nofile=bar:buzz"})
 	assert.Error(t, err, "err is not nil")
 }
+
+func TestFillOutSpecGenRecorsUserNs(t *testing.T) {
+	sg := specgen.NewSpecGenerator("nothing", false)
+	err := FillOutSpecGen(sg, &entities.ContainerCreateOptions{
+		ImageVolume: "ignore",
+		UserNS:      "keep-id",
+	}, []string{})
+	assert.NoError(t, err)
+
+	v, ok := sg.Annotations[define.UserNsAnnotation]
+	assert.True(t, ok, "UserNsAnnotation is set")
+	assert.Equal(t, "keep-id", v, "UserNsAnnotation is keep-id")
+}