diff --git a/internal/artifact/artifact.go b/internal/artifact/artifact.go
new file mode 100644
index 000000000..81451728a
--- /dev/null
+++ b/internal/artifact/artifact.go
@@ -0,0 +1,94 @@
+// Package artifact provides the core artifact storage for goreleaser
+package artifact
+
+import "sync"
+
+// Type defines the type of an artifact
+type Type int
+
+const (
+	// Archive is a tar.gz or zip archive
+	Archive Type = iota
+	// Binary is a binary (output of a gobuild)
+	Binary
+	// DockerImage is a docker image
+	DockerImage
+	// Checksum is a checksum file
+	Checksum
+)
+
+// Artifact represents an artifact and its relevant info
+type Artifact struct {
+	Name   string
+	Folder string
+	Goos   string
+	Goarch string
+	Goarm  string
+	Type   Type
+}
+
+// Artifacts is a list of artifacts
+type Artifacts struct {
+	items []Artifact
+	lock  *sync.Mutex
+}
+
+// New return a new list of artifacts
+func New() Artifacts {
+	return Artifacts{
+		items: []Artifact{},
+		lock:  &sync.Mutex{},
+	}
+}
+
+// Add safely adds a new artifact to an artifact list
+func (artifacts *Artifacts) Add(a Artifact) {
+	artifacts.lock.Lock()
+	defer artifacts.lock.Unlock()
+	artifacts.items = append(artifacts.items, a)
+}
+
+// Filter defines an artifact filter which can be used within the Filter
+// function
+type Filter func(a Artifact) bool
+
+// ByGoos is a predefined filter that filters by the given goos
+func ByGoos(s string) Filter {
+	return func(a Artifact) bool {
+		return a.Goos == s
+	}
+}
+
+// ByGoarch is a predefined filter that filters by the given goarch
+func ByGoarch(s string) Filter {
+	return func(a Artifact) bool {
+		return a.Goarch == s
+	}
+}
+
+// ByGoarm is a predefined filter that filters by the given goarm
+func ByGoarm(s string) Filter {
+	return func(a Artifact) bool {
+		return a.Goarm == s
+	}
+}
+
+// ByType is a predefined filter that filters by the given type
+func ByType(t Type) Filter {
+	return func(a Artifact) bool {
+		return a.Type == t
+	}
+}
+
+// Filter filters the artifact list, returning a new instance.
+// There are some pre-defined filters but anything of the Type Filter
+// is accepted.
+func (artifacts *Artifacts) Filter(filter Filter) Artifacts {
+	var result = New()
+	for _, a := range artifacts.items {
+		if filter(a) {
+			result.Add(a)
+		}
+	}
+	return result
+}
diff --git a/internal/artifact/artifact_test.go b/internal/artifact/artifact_test.go
new file mode 100644
index 000000000..bdff0ff1c
--- /dev/null
+++ b/internal/artifact/artifact_test.go
@@ -0,0 +1,75 @@
+package artifact
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/sync/errgroup"
+)
+
+func TestAdd(t *testing.T) {
+	var g errgroup.Group
+	var artifacts = New()
+	for _, a := range []Artifact{
+		{
+			Name: "foo",
+			Type: Archive,
+		},
+		{
+			Name: "bar",
+			Type: Binary,
+		},
+		{
+			Name: "foobar",
+			Type: DockerImage,
+		},
+		{
+			Name: "check",
+			Type: Checksum,
+		},
+	} {
+		a := a
+		g.Go(func() error {
+			artifacts.Add(a)
+			return nil
+		})
+	}
+	assert.NoError(t, g.Wait())
+	assert.Len(t, artifacts.items, 4)
+}
+
+func TestFilter(t *testing.T) {
+	var data = []Artifact{
+		{
+			Name: "foo",
+			Goos: "linux",
+		},
+		{
+			Name:   "bar",
+			Goarch: "amd64",
+		},
+		{
+			Name:  "foobar",
+			Goarm: "6",
+		},
+		{
+			Name: "check",
+			Type: Checksum,
+		},
+	}
+	var artifacts = New()
+	for _, a := range data {
+		artifacts.Add(a)
+	}
+	assert.Len(t, artifacts.Filter(ByGoos("linux")).items, 1)
+	assert.Len(t, artifacts.Filter(ByGoos("darwin")).items, 0)
+
+	assert.Len(t, artifacts.Filter(ByGoarch("amd64")).items, 1)
+	assert.Len(t, artifacts.Filter(ByGoarch("386")).items, 0)
+
+	assert.Len(t, artifacts.Filter(ByGoarm("6")).items, 1)
+	assert.Len(t, artifacts.Filter(ByGoarm("7")).items, 0)
+
+	assert.Len(t, artifacts.Filter(ByType(Checksum)).items, 1)
+	assert.Len(t, artifacts.Filter(ByType(Binary)).items, 0)
+}