diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
index b7e30f3..143b0bc 100644
--- a/.github/workflows/go.yml
+++ b/.github/workflows/go.yml
@@ -42,24 +42,23 @@ jobs:
       run: |
         (
           set -e
-          ARCH=$(uname -m)
-          URL=https://storage.googleapis.com/gvisor/releases/release/latest/${ARCH}
-          wget --quiet ${URL}/runsc ${URL}/runsc.sha512 \
-            ${URL}/containerd-shim-runsc-v1 ${URL}/containerd-shim-runsc-v1.sha512
+          ARCH="$(uname -m)"
+          URL="https://storage.googleapis.com/gvisor/releases/release/latest/${ARCH}"
+          wget --quiet "${URL}/runsc" "${URL}/runsc.sha512" \
+            "${URL}/containerd-shim-runsc-v1" "${URL}/containerd-shim-runsc-v1.sha512"
           sha512sum -c runsc.sha512 \
             -c containerd-shim-runsc-v1.sha512
-          rm -f *.sha512
+          rm -f -- *.sha512
           chmod a+rx runsc containerd-shim-runsc-v1
           sudo mv runsc containerd-shim-runsc-v1 /usr/local/bin
         )
-        cat | sudo tee /etc/docker/daemon.json <<EOF
+        sudo tee /etc/docker/daemon.json <<EOF
         {
           "runtimes": {
             "runsc": {
               "path": "/usr/local/bin/runsc",
               "runtimeArgs": [
-                "--host-uds=all",
-                "--host-fifo=open"
+                "--host-uds=all"
               ]
             }
           }
@@ -68,6 +67,41 @@ jobs:
 
         sudo systemctl reload docker
 
+    - name: Install rootless docker
+      if: ${{ matrix.module == 'plugincontainer' }}
+      run: |
+        sudo apt-get install -y uidmap dbus-user-session
+        export FORCE_ROOTLESS_INSTALL=1
+        curl -fsSL https://get.docker.com/rootless | sh
+        mkdir -p ~/.config/docker/
+        tee ~/.config/docker/daemon.json  <<EOF
+        {
+          "runtimes": {
+            "runsc": {
+              "path": "/usr/local/bin/runsc",
+              "runtimeArgs": [
+                "--host-uds=all",
+                "--ignore-cgroups"
+              ]
+            }
+          }
+        }
+        EOF
+        systemctl --user restart docker
+    
+    - name: Install rootless podman
+      if: ${{ matrix.module == 'plugincontainer' }}
+      run: |
+        sudo apt-get install -y podman slirp4netns fuse-overlayfs
+        mkdir -p ~/local/bin
+        RUNSC_SCRIPT=~/local/bin/runsc.podman
+        tee "${RUNSC_SCRIPT}" <<EOF
+        #!/bin/bash
+        /usr/local/bin/runsc --host-uds=all --ignore-cgroups "\$@"
+        EOF
+        chmod u+x "${RUNSC_SCRIPT}"
+        podman --runtime "${RUNSC_SCRIPT}" system service -t 0 &
+    
     - name: Test
       run: cd ${{ matrix.module }} && go test ./...
 
diff --git a/plugincontainer/compatibility_matrix_test.go b/plugincontainer/compatibility_matrix_test.go
new file mode 100644
index 0000000..a4760ee
--- /dev/null
+++ b/plugincontainer/compatibility_matrix_test.go
@@ -0,0 +1,153 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package plugincontainer_test
+
+import (
+	"fmt"
+	"os"
+	"runtime"
+	"testing"
+
+	"github.com/hashicorp/go-secure-stdlib/plugincontainer"
+)
+
+const (
+	engineDocker = "docker"
+	enginePodman = "podman"
+	runtimeRunc  = "runc"
+	runtimeRunsc = "runsc"
+)
+
+type matrixInput struct {
+	containerEngine  string
+	containerRuntime string
+	rootlessEngine   bool
+	rootlessUser     bool
+	mlock            bool
+}
+
+func (m matrixInput) String() string {
+	var s string
+	if m.rootlessEngine {
+		s = "rootless "
+	}
+	s += m.containerEngine
+	// Podman does not support configuring the runtime from the SDK.
+	if m.containerEngine != enginePodman {
+		s += ":" + m.containerRuntime
+	}
+	if m.rootlessUser {
+		s += ":" + "nonroot"
+	}
+	if m.mlock {
+		s += ":" + "mlock"
+	}
+	return s
+}
+
+func TestCompatibilityMatrix(t *testing.T) {
+	if runtime.GOOS != "linux" {
+		t.Skip("Only linux is supported for now")
+	}
+
+	runCmd(t, "go", "build", "-o=examples/container/go-plugin-counter", "./examples/container/plugin-counter")
+
+	for _, engine := range []string{engineDocker, enginePodman} {
+		for _, runtime := range []string{runtimeRunc, runtimeRunsc} {
+			for _, rootlessEngine := range []bool{true, false} {
+				for _, rootlessUser := range []bool{true, false} {
+					for _, mlock := range []bool{true, false} {
+						if engine == enginePodman && runtime == runtimeRunsc {
+							// Podman does not support configuring the runtime from the SDK,
+							// so only run 1 of the set of runtime test cases against it.
+							// TODO: See if we can run two instances of podman to support one
+							// runtime each.
+							continue
+						}
+						i := matrixInput{
+							containerEngine:  engine,
+							containerRuntime: runtime,
+							rootlessEngine:   rootlessEngine,
+							rootlessUser:     rootlessUser,
+							mlock:            mlock,
+						}
+						t.Run(i.String(), func(t *testing.T) {
+							runExamplePlugin(t, i)
+						})
+					}
+				}
+			}
+		}
+	}
+}
+
+func skipIfUnsupported(t *testing.T, i matrixInput) {
+	switch {
+	case i.rootlessEngine && i.rootlessUser:
+		t.Skip("Unix socket permissions not yet working for rootless engine + nonroot container user")
+	case i.containerEngine == enginePodman && !i.rootlessEngine:
+		t.Skip("TODO: These tests would pass but CI doesn't have the environment set up yet")
+	case i.mlock && i.rootlessEngine:
+		if i.containerEngine == engineDocker && i.containerRuntime == runtimeRunsc {
+			// runsc works in rootless because it has its own implementation of mlockall(2)
+		} else {
+			t.Skip("TODO: These tests should work if the rootless engine is given the IPC_LOCK capability")
+		}
+	}
+}
+
+func setDockerHost(t *testing.T, containerEngine string, rootlessEngine bool) {
+	var socketFile string
+	switch {
+	case containerEngine == engineDocker && !rootlessEngine:
+		socketFile = "/var/run/docker.sock"
+	case containerEngine == engineDocker && rootlessEngine:
+		socketFile = fmt.Sprintf("/run/user/%d/docker.sock", os.Getuid())
+	case containerEngine == enginePodman && !rootlessEngine:
+		socketFile = "/var/run/podman/podman.sock"
+	case containerEngine == enginePodman && rootlessEngine:
+		socketFile = fmt.Sprintf("/run/user/%d/podman/podman.sock", os.Getuid())
+	default:
+		t.Fatalf("Unsupported combination: %s, %v", containerEngine, rootlessEngine)
+	}
+	if _, err := os.Stat(socketFile); err != nil {
+		t.Fatal("Did not find expected socket file:", err)
+	}
+	t.Setenv("DOCKER_HOST", "unix://"+socketFile)
+}
+
+func runExamplePlugin(t *testing.T, i matrixInput) {
+	skipIfUnsupported(t, i)
+	setDockerHost(t, i.containerEngine, i.rootlessEngine)
+
+	imageRef := goPluginCounterImage
+	target := "root"
+	if i.rootlessUser {
+		imageRef += ":nonroot"
+		if i.mlock {
+			target = "nonroot-mlock"
+		} else {
+			target = "nonroot"
+		}
+	}
+	runCmd(t, i.containerEngine, "build", "--tag="+imageRef, "--target="+target, "--file=examples/container/Dockerfile", "examples/container")
+
+	cfg := &plugincontainer.Config{
+		Image:    goPluginCounterImage,
+		GroupAdd: os.Getgid(),
+		Debug:    true,
+
+		CapIPCLock: i.mlock,
+	}
+	if i.mlock {
+		cfg.Env = append(cfg.Env, "MLOCK=true")
+	}
+	if i.rootlessUser {
+		cfg.Tag = "nonroot"
+	}
+	if i.containerEngine != enginePodman {
+		cfg.Runtime = i.containerRuntime
+	}
+	exerciseExamplePlugin(t, cfg)
+}
diff --git a/plugincontainer/config.go b/plugincontainer/config.go
index e755226..915ccb9 100644
--- a/plugincontainer/config.go
+++ b/plugincontainer/config.go
@@ -42,10 +42,11 @@ type Config struct {
 	Labels         map[string]string // Arbitrary metadata to facilitate querying containers.
 
 	// container.HostConfig options
-	Runtime      string // OCI runtime.
+	Runtime      string // OCI runtime. NOTE: Has no effect if using podman's system service API
 	CgroupParent string // Parent Cgroup for the container
 	NanoCpus     int64  // CPU quota in billionths of a CPU core
 	Memory       int64  // Memory quota in bytes
+	CapIPCLock   bool   // Whether to add the capability IPC_LOCK, to allow the mlockall(2) syscall
 
 	// network.NetworkConfig options
 	EndpointsConfig map[string]*network.EndpointSettings // Endpoint configs for each connecting network
diff --git a/plugincontainer/container_runner.go b/plugincontainer/container_runner.go
index f7f3c3a..004a3a9 100644
--- a/plugincontainer/container_runner.go
+++ b/plugincontainer/container_runner.go
@@ -30,8 +30,11 @@ import (
 var (
 	_ runner.Runner = (*containerRunner)(nil)
 
-	errUnsupportedOS  = errors.New("plugincontainer currently only supports Linux")
-	errSHA256Mismatch = errors.New("SHA256 mismatch")
+	errUnsupportedOS = errors.New("plugincontainer currently only supports Linux")
+
+	// ErrSHA256Mismatch is returned when starting a container without any
+	// images available where the provided sha256 matches the image and tag.
+	ErrSHA256Mismatch = errors.New("SHA256 mismatch")
 )
 
 const pluginSocketDir = "/tmp/go-plugin-container"
@@ -83,15 +86,18 @@ func (cfg *Config) NewContainerRunner(logger hclog.Logger, cmd *exec.Cmd, hostSo
 
 	// Default to using the SHA256 for secure pinning of images, but allow users
 	// to omit the SHA256 as well.
-	var imageArg string
+	var imageRef string
 	if sha256 != "" {
-		imageArg = "sha256:" + sha256
+		imageRef = "sha256:" + sha256
 	} else {
-		imageArg = cfg.Image
+		imageRef = cfg.Image
+		if cfg.Tag != "" {
+			imageRef += ":" + cfg.Tag
+		}
 	}
 	// Container config.
 	containerConfig := &container.Config{
-		Image:           imageArg,
+		Image:           imageRef,
 		Env:             cmd.Env,
 		NetworkDisabled: cfg.DisableNetwork,
 		Labels:          cfg.Labels,
@@ -142,6 +148,10 @@ func (cfg *Config) NewContainerRunner(logger hclog.Logger, cmd *exec.Cmd, hostSo
 		hostConfig.GroupAdd = append(hostConfig.GroupAdd, strconv.Itoa(cfg.GroupAdd))
 	}
 
+	if cfg.CapIPCLock {
+		hostConfig.CapAdd = append(hostConfig.CapAdd, "IPC_LOCK")
+	}
+
 	// Network config.
 	networkConfig := &network.NetworkingConfig{
 		EndpointsConfig: cfg.EndpointsConfig,
@@ -186,19 +196,19 @@ func (c *containerRunner) Start(ctx context.Context) error {
 			}
 		}
 		if !imageFound {
-			return fmt.Errorf("could not find any locally available images named %s that match with the provided SHA256 hash %s: %w", ref, c.sha256, errSHA256Mismatch)
+			return fmt.Errorf("could not find any locally available images named %s that match with the provided SHA256 hash %s: %w", ref, c.sha256, ErrSHA256Mismatch)
 		}
 	}
 
 	resp, err := c.dockerClient.ContainerCreate(ctx, c.containerConfig, c.hostConfig, c.networkConfig, nil, "")
 	if err != nil {
-		return err
+		return fmt.Errorf("error creating container: %w", err)
 	}
 	c.id = resp.ID
 	c.logger.Trace("created container", "image", c.image, "id", c.id)
 
 	if err := c.dockerClient.ContainerStart(ctx, c.id, types.ContainerStartOptions{}); err != nil {
-		return err
+		return fmt.Errorf("error starting container: %w", err)
 	}
 
 	// ContainerLogs combines stdout and stderr.
@@ -296,7 +306,7 @@ func (c *containerRunner) Stderr() io.ReadCloser {
 func (c *containerRunner) PluginToHost(pluginNet, pluginAddr string) (hostNet string, hostAddr string, err error) {
 	if path.Dir(pluginAddr) != pluginSocketDir {
 		return "", "", fmt.Errorf("expected address to be in directory %s, but was %s; "+
-			"the plugin may need to be recompiled with the latest go-plugin version", c.hostSocketDir, pluginAddr)
+			"the plugin may need to be recompiled with the latest go-plugin version", pluginSocketDir, pluginAddr)
 	}
 	return pluginNet, path.Join(c.hostSocketDir, path.Base(pluginAddr)), nil
 }
diff --git a/plugincontainer/container_runner_external_test.go b/plugincontainer/container_runner_external_test.go
new file mode 100644
index 0000000..b5ede47
--- /dev/null
+++ b/plugincontainer/container_runner_external_test.go
@@ -0,0 +1,268 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+
+package plugincontainer_test
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"testing"
+
+	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/api/types/filters"
+	"github.com/docker/docker/client"
+	"github.com/hashicorp/go-hclog"
+	"github.com/hashicorp/go-plugin"
+	"github.com/hashicorp/go-secure-stdlib/plugincontainer"
+	"github.com/hashicorp/go-secure-stdlib/plugincontainer/examples/container/shared"
+)
+
+const (
+	goPluginCounterImage = "go-plugin-counter"
+)
+
+func TestExamplePlugin(t *testing.T) {
+	// When both rootful and rootless docker are installed together, the CLI defaults
+	// to rootless and the SDK defaults to rootful, so set DOCKER_HOST to align them
+	// both on the same engine.
+	t.Setenv("DOCKER_HOST", "unix:///var/run/docker.sock")
+	runCmd(t, "go", "build", "-o=examples/container/go-plugin-counter", "./examples/container/plugin-counter")
+	runCmd(t, "docker", "build", "--tag="+goPluginCounterImage, "--target=root", "--file=examples/container/Dockerfile", "examples/container")
+	runCmd(t, "docker", "build", "--tag=broken", "testdata/")
+
+	dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Get the full sha256 of the image we just built so we can test pinning.
+	images, err := dockerClient.ImageList(context.Background(), types.ImageListOptions{
+		Filters: filters.NewArgs(filters.Arg("reference", "go-plugin-counter:latest")),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(images) != 1 {
+		t.Fatal(err)
+	}
+	id := images[0].ID
+	sha256 := strings.TrimPrefix(id, "sha256:")
+
+	// Default docker runtime.
+	t.Run("runc", func(t *testing.T) {
+		testExamplePlugin_WithRuntime(t, "runc", id, sha256)
+	})
+
+	// gVisor runtime.
+	t.Run("runsc", func(t *testing.T) {
+		testExamplePlugin_WithRuntime(t, "runsc", id, sha256)
+	})
+}
+
+func testExamplePlugin_WithRuntime(t *testing.T, ociRuntime, id, sha256 string) {
+	if runtime.GOOS != "linux" {
+		t.Skip("Only linux is supported for now")
+	}
+
+	for name, tc := range map[string]struct {
+		image, tag, sha256 string
+	}{
+		"image":                     {goPluginCounterImage, "", ""},
+		"image with tag":            {goPluginCounterImage, "latest", ""},
+		"image and sha256":          {goPluginCounterImage, "", sha256},
+		"image with tag and sha256": {goPluginCounterImage, "latest", sha256},
+		"image and id":              {goPluginCounterImage, "", id},
+		"image with tag and id":     {goPluginCounterImage, "latest", id},
+	} {
+		t.Run(name, func(t *testing.T) {
+			cfg := &plugincontainer.Config{
+				Image:    tc.image,
+				Tag:      tc.tag,
+				SHA256:   tc.sha256,
+				Runtime:  ociRuntime,
+				GroupAdd: os.Getgid(),
+			}
+			exerciseExamplePlugin(t, cfg)
+		})
+	}
+
+	// Failure cases.
+	for name, tc := range map[string]struct {
+		image               string
+		sha256              string
+		expectedErr         error
+		expectedErrContents []string
+	}{
+		"no image": {
+			"",
+			"",
+			nil,
+			nil,
+		},
+		"image given with tag": {
+			"broken:latest",
+			"",
+			nil,
+			[]string{"broken:latest"},
+		},
+		// Error should include container image, env, and logs as part of diagnostics.
+		"simulated plugin error": {
+			"broken",
+			"",
+			nil,
+			[]string{
+				"Image ref: broken",
+				fmt.Sprintf("%s=%s", shared.Handshake.MagicCookieKey, shared.Handshake.MagicCookieValue),
+				"bye from broken",
+			},
+		},
+		// The image and sha256 both got built in this test suite, but they
+		// mismatch so error should be SHA256 mismatch.
+		"SHA256 mismatch": {
+			"broken",
+			sha256,
+			plugincontainer.ErrSHA256Mismatch,
+			nil,
+		},
+	} {
+		t.Run(name, func(t *testing.T) {
+			cfg := &plugincontainer.Config{
+				Image:    tc.image,
+				SHA256:   tc.sha256,
+				Runtime:  ociRuntime,
+				GroupAdd: os.Getgid(),
+				Debug:    true,
+			}
+			pluginClient := plugin.NewClient(&plugin.ClientConfig{
+				HandshakeConfig: shared.Handshake,
+				Plugins:         shared.PluginMap,
+				SkipHostEnv:     true,
+				AutoMTLS:        true,
+				AllowedProtocols: []plugin.Protocol{
+					plugin.ProtocolGRPC,
+				},
+				Logger: hclog.New(&hclog.LoggerOptions{
+					Name:  t.Name(),
+					Level: hclog.Trace,
+				}),
+				UnixSocketConfig: &plugin.UnixSocketConfig{
+					Group: strconv.Itoa(cfg.GroupAdd),
+				},
+				RunnerFunc: cfg.NewContainerRunner,
+			})
+			defer pluginClient.Kill()
+
+			// Connect via RPC
+			_, err := pluginClient.Client()
+			if err == nil {
+				t.Fatal("Expected error starting fake plugin")
+			}
+			if tc.expectedErr != nil && !errors.Is(err, tc.expectedErr) {
+				t.Fatalf("Expected error %s, but got %s", tc.expectedErr, err)
+			}
+			for _, expected := range tc.expectedErrContents {
+				if !strings.Contains(err.Error(), expected) {
+					t.Fatalf("Expected %s in error, but got %s", expected, err)
+				}
+			}
+		})
+	}
+}
+
+func exerciseExamplePlugin(t *testing.T, cfg *plugincontainer.Config) {
+	client := plugin.NewClient(&plugin.ClientConfig{
+		HandshakeConfig: shared.Handshake,
+		Plugins:         shared.PluginMap,
+		SkipHostEnv:     true,
+		AutoMTLS:        true,
+		AllowedProtocols: []plugin.Protocol{
+			plugin.ProtocolGRPC,
+		},
+		Logger: hclog.New(&hclog.LoggerOptions{
+			Name:  t.Name(),
+			Level: hclog.Trace,
+		}),
+		UnixSocketConfig: &plugin.UnixSocketConfig{
+			Group: strconv.Itoa(cfg.GroupAdd),
+		},
+		RunnerFunc: cfg.NewContainerRunner,
+	})
+	defer client.Kill()
+
+	// Connect via RPC
+	rpcClient, err := client.Client()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Request the plugin
+	raw, err := rpcClient.Dispense("counter")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// We should have a Counter store running inside a container now! This feels
+	// like a normal interface implementation but is in fact over an RPC connection.
+	counter := raw.(shared.Counter)
+
+	storage := &inMemStorage{
+		data: make(map[string]int64),
+	}
+	v, err := counter.Increment("hello", 1, storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if v != 1 {
+		t.Fatal(v)
+	}
+
+	v, err = counter.Increment("hello", 2, storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if v != 3 {
+		t.Fatal(v)
+	}
+
+	v, err = counter.Increment("world", 2, storage)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if v != 2 {
+		t.Fatal(v)
+	}
+}
+
+func runCmd(t *testing.T, command string, args ...string) {
+	t.Helper()
+	cmd := exec.Command(command, args...)
+	// Disable cgo for 'go build' command, as we're running inside a static
+	// distroless container that doesn't have libc bindings available.
+	cmd.Env = append(os.Environ(), "CGO_ENABLED=0")
+	out, err := cmd.CombinedOutput()
+	t.Log(string(out))
+	if err != nil {
+		t.Fatalf("cmd failed: %s, err: %s", strings.Join(append([]string{cmd.Path}, cmd.Args...), " "), err)
+	}
+}
+
+var _ shared.Storage = (*inMemStorage)(nil)
+
+type inMemStorage struct {
+	data map[string]int64
+}
+
+func (s *inMemStorage) Put(key string, value int64) error {
+	s.data[key] = value
+	return nil
+}
+
+func (s *inMemStorage) Get(key string) (int64, error) {
+	return s.data[key], nil
+}
diff --git a/plugincontainer/container_runner_test.go b/plugincontainer/container_runner_test.go
index 4f60850..eb864f0 100644
--- a/plugincontainer/container_runner_test.go
+++ b/plugincontainer/container_runner_test.go
@@ -4,11 +4,7 @@
 package plugincontainer
 
 import (
-	"context"
-	"errors"
 	"fmt"
-	"io"
-	"os"
 	"os/exec"
 	"reflect"
 	"runtime"
@@ -16,13 +12,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/client"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-plugin"
-	"github.com/hashicorp/go-secure-stdlib/plugincontainer/examples/container/shared"
 )
 
 // TestNewContainerRunner_config ensures all the config options passed in have
@@ -144,250 +136,3 @@ func TestNewContainerRunner_config(t *testing.T) {
 		t.Error(runner.networkConfig.EndpointsConfig)
 	}
 }
-
-func TestExamplePlugin(t *testing.T) {
-	// Default docker runtime.
-	t.Run("runc", func(t *testing.T) {
-		testExamplePlugin_WithRuntime(t, "runc")
-	})
-
-	// gVisor runtime.
-	t.Run("runsc", func(t *testing.T) {
-		testExamplePlugin_WithRuntime(t, "runsc")
-	})
-}
-
-func testExamplePlugin_WithRuntime(t *testing.T, ociRuntime string) {
-	if runtime.GOOS != "linux" {
-		t.Skip("Only linux is supported for now")
-	}
-
-	runCmd(t, "go", "build", "-o=examples/container/go-plugin-counter", "./examples/container/plugin-counter")
-	runCmd(t, "docker", "build", "-t=go-plugin-counter", "-f=examples/container/Dockerfile", "examples/container")
-
-	dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Get the full sha256 of the image we just built so we can test pinning.
-	images, err := dockerClient.ImageList(context.Background(), types.ImageListOptions{
-		Filters: filters.NewArgs(filters.Arg("reference", "go-plugin-counter:latest")),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(images) != 1 {
-		t.Fatal(images)
-	}
-	id := images[0].ID
-	sha256 := strings.TrimPrefix(id, "sha256:")
-
-	for name, tc := range map[string]struct {
-		image, tag, sha256 string
-	}{
-		"image":                     {"go-plugin-counter", "", ""},
-		"image with tag":            {"go-plugin-counter", "latest", ""},
-		"image and sha256":          {"go-plugin-counter", "", sha256},
-		"image with tag and sha256": {"go-plugin-counter", "latest", sha256},
-		"image and id":              {"go-plugin-counter", "", id},
-		"image with tag and id":     {"go-plugin-counter", "latest", id},
-	} {
-		t.Run(name, func(t *testing.T) {
-			cfg := &Config{
-				Image:    tc.image,
-				Tag:      tc.tag,
-				SHA256:   tc.sha256,
-				Runtime:  ociRuntime,
-				GroupAdd: os.Getgid(),
-			}
-			client := plugin.NewClient(&plugin.ClientConfig{
-				HandshakeConfig: shared.Handshake,
-				Plugins:         shared.PluginMap,
-				SkipHostEnv:     true,
-				AutoMTLS:        true,
-				AllowedProtocols: []plugin.Protocol{
-					plugin.ProtocolGRPC,
-				},
-				Logger: hclog.New(&hclog.LoggerOptions{
-					Name:  t.Name(),
-					Level: hclog.Trace,
-				}),
-				UnixSocketConfig: &plugin.UnixSocketConfig{
-					Group: strconv.Itoa(cfg.GroupAdd),
-				},
-				RunnerFunc: cfg.NewContainerRunner,
-			})
-			defer client.Kill()
-
-			// Connect via RPC
-			rpcClient, err := client.Client()
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// Request the plugin
-			raw, err := rpcClient.Dispense("counter")
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			// We should have a Counter store running inside a container now! This feels
-			// like a normal interface implementation but is in fact over an RPC connection.
-			counter := raw.(shared.Counter)
-
-			storage := &inMemStorage{
-				data: make(map[string]int64),
-			}
-			v, err := counter.Increment("hello", 1, storage)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if v != 1 {
-				t.Fatal(v)
-			}
-
-			v, err = counter.Increment("hello", 2, storage)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if v != 3 {
-				t.Fatal(v)
-			}
-
-			v, err = counter.Increment("world", 2, storage)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if v != 2 {
-				t.Fatal(v)
-			}
-		})
-	}
-
-	// Failure cases.
-	runCmd(t, "docker", "build", "-t=broken", "-f=testdata/Dockerfile", "testdata/")
-	for name, tc := range map[string]struct {
-		image               string
-		sha256              string
-		expectedErr         error
-		expectedErrContents []string
-	}{
-		"no image": {
-			"",
-			"",
-			nil,
-			nil,
-		},
-		"image given with tag": {
-			"broken:latest",
-			"",
-			nil,
-			[]string{"broken:latest"},
-		},
-		// Error should include container image, env, and logs as part of diagnostics.
-		"simulated plugin error": {
-			"broken",
-			"",
-			nil,
-			[]string{
-				"Image ref: broken",
-				fmt.Sprintf("%s=%s", shared.Handshake.MagicCookieKey, shared.Handshake.MagicCookieValue),
-				"bye from broken",
-			},
-		},
-		// The image and sha256 both got built in this test suite, but they
-		// mismatch so error should be SHA256 mismatch.
-		"SHA256 mismatch": {
-			"broken",
-			sha256,
-			errSHA256Mismatch,
-			nil,
-		},
-	} {
-		t.Run(name, func(t *testing.T) {
-			cfg := &Config{
-				Image:    tc.image,
-				SHA256:   tc.sha256,
-				Runtime:  ociRuntime,
-				GroupAdd: os.Getgid(),
-				Debug:    true,
-			}
-			client := plugin.NewClient(&plugin.ClientConfig{
-				HandshakeConfig: shared.Handshake,
-				Plugins:         shared.PluginMap,
-				SkipHostEnv:     true,
-				AutoMTLS:        true,
-				AllowedProtocols: []plugin.Protocol{
-					plugin.ProtocolGRPC,
-				},
-				Logger: hclog.New(&hclog.LoggerOptions{
-					Name:  t.Name(),
-					Level: hclog.Trace,
-				}),
-				UnixSocketConfig: &plugin.UnixSocketConfig{
-					Group: strconv.Itoa(cfg.GroupAdd),
-				},
-				RunnerFunc: cfg.NewContainerRunner,
-			})
-			defer client.Kill()
-
-			// Connect via RPC
-			_, err = client.Client()
-			if err == nil {
-				t.Fatal("Expected error starting fake plugin")
-			}
-			if tc.expectedErr != nil && !errors.Is(err, tc.expectedErr) {
-				t.Fatalf("Expected error %s, but got %s", tc.expectedErr, err)
-			}
-			for _, expected := range tc.expectedErrContents {
-				if !strings.Contains(err.Error(), expected) {
-					t.Fatalf("Expected %s in error, but got %s", expected, err)
-				}
-			}
-		})
-	}
-}
-
-func runCmd(t *testing.T, name string, arg ...string) {
-	t.Helper()
-	cmd := exec.Command(name, arg...)
-	// Disable cgo for 'go build' command, as we're running inside a static
-	// distroless container that doesn't have libc bindings available.
-	cmd.Env = append(os.Environ(), "CGO_ENABLED=0")
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		stdout.Close()
-	})
-	go io.Copy(os.Stdout, stdout)
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Cleanup(func() {
-		stderr.Close()
-	})
-	go io.Copy(os.Stderr, stderr)
-	err = cmd.Run()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-var _ shared.Storage = (*inMemStorage)(nil)
-
-type inMemStorage struct {
-	data map[string]int64
-}
-
-func (s *inMemStorage) Put(key string, value int64) error {
-	s.data[key] = value
-	return nil
-}
-
-func (s *inMemStorage) Get(key string) (int64, error) {
-	return s.data[key], nil
-}
diff --git a/plugincontainer/examples/container/Dockerfile b/plugincontainer/examples/container/Dockerfile
index 6f9eb94..91225fb 100644
--- a/plugincontainer/examples/container/Dockerfile
+++ b/plugincontainer/examples/container/Dockerfile
@@ -1,8 +1,36 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-FROM gcr.io/distroless/static-debian11
+FROM gcr.io/distroless/static-debian12 as root
 
 COPY go-plugin-counter /bin/go-plugin-counter
 
-ENTRYPOINT [ "/bin/go-plugin-counter" ]
\ No newline at end of file
+ENTRYPOINT [ "/bin/go-plugin-counter" ]
+
+FROM docker.mirror.hashicorp.services/alpine as nonroot
+
+COPY go-plugin-counter /bin/go-plugin-counter
+
+RUN addgroup -S nonroot && \
+    adduser -S -G nonroot nonroot && \
+    chown -R nonroot:nonroot /bin/go-plugin-counter
+
+USER nonroot
+
+ENTRYPOINT [ "/bin/go-plugin-counter" ]
+
+FROM docker.mirror.hashicorp.services/alpine as nonroot-mlock
+
+COPY go-plugin-counter /bin/go-plugin-counter
+
+RUN apk add libcap && \
+    addgroup -S nonroot && \
+    adduser -S -G nonroot nonroot && \
+    chown -R nonroot:nonroot /bin/go-plugin-counter && \
+    setcap cap_ipc_lock=+ep /bin/go-plugin-counter
+
+USER nonroot
+
+ENTRYPOINT [ "/bin/go-plugin-counter" ]
+
+FROM root
\ No newline at end of file
diff --git a/plugincontainer/examples/container/plugin-counter/main.go b/plugincontainer/examples/container/plugin-counter/main.go
index e1e7d9a..d72f066 100644
--- a/plugincontainer/examples/container/plugin-counter/main.go
+++ b/plugincontainer/examples/container/plugin-counter/main.go
@@ -4,8 +4,13 @@
 package main
 
 import (
+	"log"
+	"os"
+	"syscall"
+
 	"github.com/hashicorp/go-plugin"
 	"github.com/hashicorp/go-secure-stdlib/plugincontainer/examples/container/shared"
+	"golang.org/x/sys/unix"
 )
 
 type Counter struct {
@@ -27,6 +32,12 @@ func (c *Counter) Increment(key string, value int64, storage shared.Storage) (in
 }
 
 func main() {
+	if mlock := os.Getenv("MLOCK"); mlock == "true" || mlock == "1" {
+		err := unix.Mlockall(syscall.MCL_CURRENT | syscall.MCL_FUTURE)
+		if err != nil {
+			log.Fatalf("failed to call unix.Mlockall: %s", err)
+		}
+	}
 	plugin.Serve(&plugin.ServeConfig{
 		HandshakeConfig: shared.Handshake,
 		Plugins: map[string]plugin.Plugin{
diff --git a/plugincontainer/go.mod b/plugincontainer/go.mod
index 19ece45..34e0860 100644
--- a/plugincontainer/go.mod
+++ b/plugincontainer/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/docker/docker v24.0.5+incompatible
 	github.com/hashicorp/go-hclog v1.5.0
 	github.com/hashicorp/go-plugin v1.5.1
+	golang.org/x/sys v0.7.0
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
 )
@@ -31,7 +32,6 @@ require (
 	github.com/stretchr/testify v1.8.3 // indirect
 	golang.org/x/mod v0.9.0 // indirect
 	golang.org/x/net v0.9.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
 	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.7.0 // indirect