diff --git a/Makefile b/Makefile
index ef333cd5..b82884af 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ static: $(SOURCES)
 	CGO_ENABLED=1 go build -i -tags "$(BUILDTAGS) cgo static_build" -ldflags "-w -extldflags -static -X main.gitCommit=${COMMIT} -X main.version=${VERSION}" -o contrib/cmd/recvtty/recvtty ./contrib/cmd/recvtty
 
 release:
-	@flag_list=(seccomp selinux apparmor static ambient); \
+	@flag_list=(seccomp selinux apparmor static); \
 	unset expression; \
 	for flag in "$${flag_list[@]}"; do \
 		expression+="' '{'',$${flag}}"; \
diff --git a/libcontainer/capabilities_ambient.go b/libcontainer/capabilities_ambient.go
deleted file mode 100644
index 50da2832..00000000
--- a/libcontainer/capabilities_ambient.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build linux,ambient
-
-package libcontainer
-
-import "github.com/syndtr/gocapability/capability"
-
-const allCapabilityTypes = capability.CAPS | capability.BOUNDS | capability.AMBS
diff --git a/libcontainer/capabilities_linux.go b/libcontainer/capabilities_linux.go
index c43de459..8981b2a2 100644
--- a/libcontainer/capabilities_linux.go
+++ b/libcontainer/capabilities_linux.go
@@ -11,6 +11,8 @@ import (
 	"github.com/syndtr/gocapability/capability"
 )
 
+const allCapabilityTypes = capability.CAPS | capability.BOUNDS | capability.AMBS
+
 var capabilityMap map[string]capability.Cap
 
 func init() {
diff --git a/libcontainer/capabilities_noambient.go b/libcontainer/capabilities_noambient.go
deleted file mode 100644
index 752c4e51..00000000
--- a/libcontainer/capabilities_noambient.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !ambient,linux
-
-package libcontainer
-
-import "github.com/syndtr/gocapability/capability"
-
-const allCapabilityTypes = capability.CAPS | capability.BOUNDS