diff --git a/docs/configuration.md b/docs/configuration.md
index 59a4173debe..8814a24f38d 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -133,6 +133,9 @@ storage:
   swift:
     username: username
     password: password
+    applicationcredentialid: myid
+    applicationcredentialname: mycred
+    applicationcredentialsecret: mysecret
     authurl: https://storage.myprovider.com/auth/v1.0 or https://storage.myprovider.com/v2.0 or https://storage.myprovider.com/v3/auth
     tenant: tenantname
     tenantid: tenantid
diff --git a/registry/storage/driver/swift/swift.go b/registry/storage/driver/swift/swift.go
index 46201ee702f..52b12e5eba8 100644
--- a/registry/storage/driver/swift/swift.go
+++ b/registry/storage/driver/swift/swift.go
@@ -60,27 +60,30 @@ var readAfterWriteWait = 200 * time.Millisecond
 
 // Parameters A struct that encapsulates all of the driver parameters after all values have been set
 type Parameters struct {
-	Username            string
-	Password            string
-	AuthURL             string
-	Tenant              string
-	TenantID            string
-	Domain              string
-	DomainID            string
-	TenantDomain        string
-	TenantDomainID      string
-	TrustID             string
-	Region              string
-	AuthVersion         int
-	Container           string
-	Prefix              string
-	EndpointType        string
-	InsecureSkipVerify  bool
-	ChunkSize           int
-	SecretKey           string
-	AccessKey           string
-	TempURLContainerKey bool
-	TempURLMethods      []string
+	Username                    string
+	Password                    string
+	ApplicationCredentialID     string
+	ApplicationCredentialName   string
+	ApplicationCredentialSecret string
+	AuthURL                     string
+	Tenant                      string
+	TenantID                    string
+	Domain                      string
+	DomainID                    string
+	TenantDomain                string
+	TenantDomainID              string
+	TrustID                     string
+	Region                      string
+	AuthVersion                 int
+	Container                   string
+	Prefix                      string
+	EndpointType                string
+	InsecureSkipVerify          bool
+	ChunkSize                   int
+	SecretKey                   string
+	AccessKey                   string
+	TempURLContainerKey         bool
+	TempURLMethods              []string
 }
 
 // swiftInfo maps the JSON structure returned by Swift /info endpoint
@@ -160,11 +163,15 @@ func FromParameters(parameters map[string]interface{}) (*Driver, error) {
 	}
 
 	if params.Username == "" {
-		return nil, fmt.Errorf("No username parameter provided")
+		if params.ApplicationCredentialID == "" && params.ApplicationCredentialName == "" {
+			return nil, fmt.Errorf("no username or application-credential provided")
+		}
 	}
 
 	if params.Password == "" {
-		return nil, fmt.Errorf("No password parameter provided")
+		if params.ApplicationCredentialID == "" {
+			return nil, fmt.Errorf("no password or application-credential-secret parameter provided")
+		}
 	}
 
 	if params.AuthURL == "" {
@@ -191,23 +198,26 @@ func New(params Parameters) (*Driver, error) {
 	}
 
 	ct := &swift.Connection{
-		UserName:       params.Username,
-		ApiKey:         params.Password,
-		AuthUrl:        params.AuthURL,
-		Region:         params.Region,
-		AuthVersion:    params.AuthVersion,
-		UserAgent:      "distribution/" + version.Version,
-		Tenant:         params.Tenant,
-		TenantId:       params.TenantID,
-		Domain:         params.Domain,
-		DomainId:       params.DomainID,
-		TenantDomain:   params.TenantDomain,
-		TenantDomainId: params.TenantDomainID,
-		TrustId:        params.TrustID,
-		EndpointType:   swift.EndpointType(params.EndpointType),
-		Transport:      transport,
-		ConnectTimeout: 60 * time.Second,
-		Timeout:        15 * 60 * time.Second,
+		UserName:                    params.Username,
+		ApiKey:                      params.Password,
+		ApplicationCredentialId:     params.ApplicationCredentialID,
+		ApplicationCredentialName:   params.ApplicationCredentialName,
+		ApplicationCredentialSecret: params.ApplicationCredentialSecret,
+		AuthUrl:                     params.AuthURL,
+		Region:                      params.Region,
+		AuthVersion:                 params.AuthVersion,
+		UserAgent:                   "distribution/" + version.Version,
+		Tenant:                      params.Tenant,
+		TenantId:                    params.TenantID,
+		Domain:                      params.Domain,
+		DomainId:                    params.DomainID,
+		TenantDomain:                params.TenantDomain,
+		TenantDomainId:              params.TenantDomainID,
+		TrustId:                     params.TrustID,
+		EndpointType:                swift.EndpointType(params.EndpointType),
+		Transport:                   transport,
+		ConnectTimeout:              60 * time.Second,
+		Timeout:                     15 * 60 * time.Second,
 	}
 	err := ct.Authenticate()
 	if err != nil {
diff --git a/registry/storage/driver/swift/swift_test.go b/registry/storage/driver/swift/swift_test.go
index 00288cbac89..57e5526c92f 100644
--- a/registry/storage/driver/swift/swift_test.go
+++ b/registry/storage/driver/swift/swift_test.go
@@ -24,31 +24,37 @@ var swiftDriverConstructor func(prefix string) (*Driver, error)
 
 func init() {
 	var (
-		username           string
-		password           string
-		authURL            string
-		tenant             string
-		tenantID           string
-		domain             string
-		domainID           string
-		tenantDomain       string
-		tenantDomainID     string
-		trustID            string
-		container          string
-		region             string
-		AuthVersion        int
-		endpointType       string
-		insecureSkipVerify bool
-		secretKey          string
-		accessKey          string
-		containerKey       bool
-		tempURLMethods     []string
+		username                    string
+		password                    string
+		applicationCredentialID     string
+		applicationCredentialName   string
+		applicationCredentialSecret string
+		authURL                     string
+		tenant                      string
+		tenantID                    string
+		domain                      string
+		domainID                    string
+		tenantDomain                string
+		tenantDomainID              string
+		trustID                     string
+		container                   string
+		region                      string
+		AuthVersion                 int
+		endpointType                string
+		insecureSkipVerify          bool
+		secretKey                   string
+		accessKey                   string
+		containerKey                bool
+		tempURLMethods              []string
 
 		swiftServer *swifttest.SwiftServer
 		err         error
 	)
 	username = os.Getenv("SWIFT_USERNAME")
 	password = os.Getenv("SWIFT_PASSWORD")
+	applicationCredentialID = os.Getenv("SWIFT_APPLICATIONCREDENTIALID")
+	applicationCredentialName = os.Getenv("SWIFT_APPLICATIONCREDENTIALNAME")
+	applicationCredentialSecret = os.Getenv("SWIFT_APPLICATIONCREDENTIALSECRET")
 	authURL = os.Getenv("SWIFT_AUTH_URL")
 	tenant = os.Getenv("SWIFT_TENANT_NAME")
 	tenantID = os.Getenv("SWIFT_TENANT_ID")
@@ -87,6 +93,9 @@ func init() {
 		parameters := Parameters{
 			username,
 			password,
+			applicationCredentialID,
+			applicationCredentialName,
+			applicationCredentialSecret,
 			authURL,
 			tenant,
 			tenantID,